diff options
| author | Georg Ehrke <developer@georgehrke.com> | 2013-08-14 20:56:44 +0200 |
|---|---|---|
| committer | Georg Ehrke <developer@georgehrke.com> | 2013-08-14 20:56:44 +0200 |
| commit | 4b5fb08c2cda4a13a1b81699f308d21b89f1723b (patch) | |
| tree | a1f40bb6c6bcaf4e9093c2153d0a32fefecf2b79 /apps/files_encryption/lib/crypt.php | |
| parent | e5761d90ef223a04205ad93eea7706439ef0b60e (diff) | |
| parent | 994537a5b94826294e61231768f27964bc736ced (diff) | |
| download | nextcloud-server-4b5fb08c2cda4a13a1b81699f308d21b89f1723b.tar.gz nextcloud-server-4b5fb08c2cda4a13a1b81699f308d21b89f1723b.zip | |
Merge master into oc_preview
Diffstat (limited to 'apps/files_encryption/lib/crypt.php')
| -rwxr-xr-x | apps/files_encryption/lib/crypt.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php index 6543a0de5f3..c3e88e5944e 100755 --- a/apps/files_encryption/lib/crypt.php +++ b/apps/files_encryption/lib/crypt.php @@ -57,7 +57,9 @@ class Crypt { if ($res === false) {
\OCP\Util::writeLog('Encryption library', 'couldn\'t generate users key-pair for ' . \OCP\User::getUser(), \OCP\Util::ERROR);
- \OCP\Util::writeLog('Encryption library', openssl_error_string(), \OCP\Util::ERROR);
+ while ($msg = openssl_error_string()) {
+ \OCP\Util::writeLog('Encryption library', 'openssl_pkey_new() fails: ' . $msg, \OCP\Util::ERROR);
+ }
} elseif (openssl_pkey_export($res, $privateKey)) {
// Get public key
$keyDetails = openssl_pkey_get_details($res);
|