extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-13 17:38:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Addressbook: fix SMime/PGP public key import not containing a newline after the key

Browse Source
This commit is contained in:
Ralf Becker 2018-06-25 14:21:50 +02:00
parent ec59013349
commit a11b9a266b
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addressbook/inc/class.addressbook_bo.inc.php
View File

@ -23,7 +23,7 @@ use EGroupware\Api\Acl;
*/ */
class addressbook_bo extends Api\Contacts class addressbook_bo extends Api\Contacts
{ {
static public $pgp_key_regexp = '/-----BEGIN PGP PUBLIC KEY BLOCK-----.*-----END PGP PUBLIC KEY BLOCK-----\r?\n/s'; static public $pgp_key_regexp = '/-----BEGIN PGP PUBLIC KEY BLOCK-----.*-----END PGP PUBLIC KEY BLOCK-----\r?\n?/s';
/** /**
* Search addressbook for PGP public keys of given recipients * Search addressbook for PGP public keys of given recipients

8
api/src/Mail/Smime.php
View File

@ -45,22 +45,22 @@ class Smime extends Horde_Crypt_Smime
/** /**
* SMIME public key regular expression * SMIME public key regular expression
*/ */
static public $pubkey_regexp = '/-----BEGIN PUBLIC KEY-----.*-----END PUBLIC KEY-----\r?\n/s'; static public $pubkey_regexp = '/-----BEGIN PUBLIC KEY-----.*-----END PUBLIC KEY-----\r?\n?/s';
/** /**
* SMIME encrypted private key regular expresion * SMIME encrypted private key regular expresion
*/ */
static public $privkey_encrypted_regexp = '/-----BEGIN ENCRYPTED PRIVATE KEY-----.*-----END ENCRYPTED PRIVATE KEY-----\r?\n/s'; static public $privkey_encrypted_regexp = '/-----BEGIN ENCRYPTED PRIVATE KEY-----.*-----END ENCRYPTED PRIVATE KEY-----\r?\n?/s';
/** /**
* SMIME private key regular expression * SMIME private key regular expression
*/ */
static public $privkey_regexp = '/-----BEGIN PRIVATE KEY-----.*-----END PRIVATE KEY-----\r?\n/s'; static public $privkey_regexp = '/-----BEGIN PRIVATE KEY-----.*-----END PRIVATE KEY-----\r?\n?/s';
/** /**
* SMIME certificate regular expression * SMIME certificate regular expression
*/ */
static public $certificate_regexp = '/-----BEGIN CERTIFICATE-----.*-----END CERTIFICATE-----\r?\n/s'; static public $certificate_regexp = '/-----BEGIN CERTIFICATE-----.*-----END CERTIFICATE-----\r?\n?/s';
/** /**
* Encryption type of sign * Encryption type of sign