more error messages which might be useful for the user to debug his server config

2 files changed, 6 insertions, 2 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);

diff --git a/apps/files_encryption/lib/helper.php b/apps/files_encryption/lib/helper.php
index cbc5de41c6b..b09c584c0b8 100755
--- a/apps/files_encryption/lib/helper.php
+++ b/apps/files_encryption/lib/helper.php
@@ -241,7 +241,9 @@ class Helper {
 		if(openssl_pkey_new(array('private_key_bits' => 4096))) {
 			return true;
 		} else {
-			\OCP\Util::writeLog('Encryption library', 'openssl_pkey_new()fails:  ' . openssl_error_string(), \OCP\Util::ERROR);
+			while ($msg = openssl_error_string()) {
+				\OCP\Util::writeLog('Encryption library', 'openssl_pkey_new() fails:  ' . $msg, \OCP\Util::ERROR);
+			}
 			return false;
 		}
 	}