holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Mail/SMime: fix not working storage of public key in mail account

Browse Source 
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.
This commit is contained in:
Ralf Becker 2018-02-15 14:44:25 +01:00
parent 69e83c5aaf
commit ed68be0cdf
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
admin/inc/class.admin_mail.inc.php
View File

@ -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))