Controllers/api/v2/messenger/keys.php

@@ -39,9 +39,14 @@ class keys implements Interfaces\Api
         //  $priv = helpers\openssl::temporaryPrivateKey($priv, $unlock_password, $unlock_password);
         //  \elgg_set_plugin_user_setting('privatekey', $priv, elgg_get_logged_in_user_guid(), 'gatherings');
         //}
-
-        $keystore->unlockPrivateKey($unlock_password, null);
-        $tmp = $keystore->getUnlockedPrivateKey();
+        try {
+            $keystore->unlockPrivateKey($unlock_password, null);
+            $tmp = $keystore->getUnlockedPrivateKey();
+        } catch (\Exception $e) {
+            $response['status'] = 'error';
+            $response['message'] = $e->getMessage();
+            return Factory::response($response);
+        }
 
         if (!$tmp || !$unlock_password) {
             $response['status'] = 'error';

Core/Messenger/Encryption/OpenSSL.php

@@ -110,7 +110,7 @@ class OpenSSL implements EncryptionInterface
     {
         $private_key = openssl_get_privatekey($private_key, $password);
         if (!$private_key) {
-            throw new \Exception('Could not decrypt private key');
+            throw new \Exception('Failed to unlock private key.');
         }
         openssl_pkey_export($private_key, $pkeyout, $newpass);
         return $pkeyout;