From ed68be0cdf4edbce924eecdc0afacdd131d48163 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Thu, 15 Feb 2018 14:44:25 +0100 Subject: [PATCH] * Mail/SMime: fix not working storage of public key in mail account We failed silently, when browser reported something different then "application/x-pkcs12" eg. "application/octet-stream". Now we let OpenSSL decide if file contains a valid SMime key. --- admin/inc/class.admin_mail.inc.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/admin/inc/class.admin_mail.inc.php b/admin/inc/class.admin_mail.inc.php index 4f47d7d9bd..db183ed356 100644 --- a/admin/inc/class.admin_mail.inc.php +++ b/admin/inc/class.admin_mail.inc.php @@ -1034,8 +1034,7 @@ class admin_mail $smime = new Mail\Smime; $content['acc_smime_username'] = $smime->getEmailFromKey($content['smime_cert']); $AB_bo = new addressbook_bo(); - if (($pkcs12 = file_get_contents($content['smimeKeyUpload']['tmp_name'])) && - $content['smimeKeyUpload']['type'] == 'application/x-pkcs12') + if (($pkcs12 = file_get_contents($content['smimeKeyUpload']['tmp_name']))) { $cert_info = Mail\Smime::extractCertPKCS12($pkcs12, $content['smime_pkcs12_password']); if (is_array($cert_info))