Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-07-13 03:27:39 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

S/MIME import from signature use BEGIN PKCS7

Browse source
This commit is contained in:
the-djmaze 2024-02-26 22:34:15 +01:00
parent 20daa1ce13
commit 97b65465e2
2 changed files with 15 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
snappymail/v/0.0.0/app/libraries/RainLoop/Actions/SMime.php
View file

@ -142,7 +142,7 @@ trait SMime
$sBody = \trim($sBody); $sBody = \trim($sBody);
$certificates = []; $certificates = [];
\openssl_pkcs7_read( \openssl_pkcs7_read(
"-----BEGIN CERTIFICATE-----\n\n{$sBody}\n-----END CERTIFICATE-----", "-----BEGIN PKCS7-----\n\n{$sBody}\n-----END PKCS7-----",
$certificates $certificates
) || \error_log("OpenSSL openssl_pkcs7_read: " . \openssl_error_string()); ) || \error_log("OpenSSL openssl_pkcs7_read: " . \openssl_error_string());
foreach ($certificates as $certificate) { foreach ($certificates as $certificate) {
@ -179,7 +179,7 @@ trait SMime
$sBody = \trim($sBody); $sBody = \trim($sBody);
$certificates = []; $certificates = [];
\openssl_pkcs7_read( \openssl_pkcs7_read(
"-----BEGIN CERTIFICATE-----\n\n{$sBody}\n-----END CERTIFICATE-----", "-----BEGIN PKCS7-----\n\n{$sBody}\n-----END PKCS7-----",
$certificates $certificates
); );

13
snappymail/v/0.0.0/app/libraries/snappymail/smime/openssl.php
View file

@ -142,6 +142,19 @@ class OpenSSL
} }
} }
/*
public function asn1parse(/*string|Temporary* / $input) : ?string
{
if (\is_string($input)) {
$tmp = new Temporary('smimein-');
if (!$tmp->putContents($input)) {
return null;
}
$input = $tmp;
}
`openssl asn1parse -in $input->filename()`
}
*/
public function decrypt(/*string|Temporary*/ $input) : ?string public function decrypt(/*string|Temporary*/ $input) : ?string
{ {
if (\is_string($input)) { if (\is_string($input)) {