mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3858 from owncloud/more_ssl_error_messages 

add openssl_error_string() output to the owncloud.log
This commit is contained in:
Björn Schießle 2013-07-02 07:58:22 -07:00
parent 4d4484fac1 5a20c8b66f
commit 4c1820a2a1
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
apps/files_encryption/lib/crypt.php
View File

@ -57,10 +57,11 @@ class Crypt {
if ($res === false) { 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', 'couldn\'t generate users key-pair for ' . \OCP\User::getUser(), \OCP\Util::ERROR);
\OCP\Util::writeLog('Encryption library', openssl_error_string(), \OCP\Util::ERROR);
} elseif (openssl_pkey_export($res, $privateKey)) { } elseif (openssl_pkey_export($res, $privateKey)) {
// Get public key // Get public key
$publicKey = openssl_pkey_get_details($res); $keyDetails = openssl_pkey_get_details($res);
$publicKey = $publicKey['key']; $publicKey = $keyDetails['key'];
$return = array( $return = array(
'publicKey' => $publicKey, 'publicKey' => $publicKey,
@ -68,6 +69,7 @@ class Crypt {
); );
} else { } else {
\OCP\Util::writeLog('Encryption library', 'couldn\'t export users private key, please check your servers openSSL configuration.' . \OCP\User::getUser(), \OCP\Util::ERROR); \OCP\Util::writeLog('Encryption library', 'couldn\'t export users private key, please check your servers openSSL configuration.' . \OCP\User::getUser(), \OCP\Util::ERROR);
\OCP\Util::writeLog('Encryption library', openssl_error_string(), \OCP\Util::ERROR);
} }
return $return; return $return;
@ -206,13 +208,10 @@ class Crypt {
public static function encrypt($plainContent, $iv, $passphrase = '') { public static function encrypt($plainContent, $iv, $passphrase = '') {
if ($encryptedContent = openssl_encrypt($plainContent, 'AES-128-CFB', $passphrase, false, $iv)) { if ($encryptedContent = openssl_encrypt($plainContent, 'AES-128-CFB', $passphrase, false, $iv)) {
return $encryptedContent; return $encryptedContent;
} else { } else {
\OCP\Util::writeLog('Encryption library', 'Encryption (symmetric) of content failed', \OCP\Util::ERROR); \OCP\Util::writeLog('Encryption library', 'Encryption (symmetric) of content failed', \OCP\Util::ERROR);
\OCP\Util::writeLog('Encryption library', openssl_error_string(), \OCP\Util::ERROR);
return false; return false;
} }