From: Björn Schießle <schiessle@owncloud.com>
Date: Wed, 26 Jun 2013 13:51:22 +0000 (+0200)
Subject: add openssl_error_string() output to the owncloud.log
X-Git-Tag: v6.0.0alpha2~539^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=5a20c8b66fdf7e33de5874920e82b5caef449bea;p=nextcloud-server.git

add openssl_error_string() output to the owncloud.log
---

diff --git a/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php
index 927064012b6..6543a0de5f3 100755
--- a/apps/files_encryption/lib/crypt.php
+++ b/apps/files_encryption/lib/crypt.php
@@ -57,10 +57,11 @@ 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);
 		} elseif (openssl_pkey_export($res, $privateKey)) {
 			// Get public key
-			$publicKey = openssl_pkey_get_details($res);
-			$publicKey = $publicKey['key'];
+			$keyDetails = openssl_pkey_get_details($res);
+			$publicKey = $keyDetails['key'];
 
 			$return = array(
 				'publicKey' => $publicKey,
@@ -68,6 +69,7 @@ class Crypt {
 			);
 		} 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', openssl_error_string(), \OCP\Util::ERROR);
 		}
 
 		return $return;
@@ -206,13 +208,10 @@ class Crypt {
 	public static function encrypt($plainContent, $iv, $passphrase = '') {
 
 		if ($encryptedContent = openssl_encrypt($plainContent, 'AES-128-CFB', $passphrase, false, $iv)) {
-
 			return $encryptedContent;
-
 		} else {
-
 			\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;
 
 		}