From 0f728b4cd1bb42787eb6b41dce48ace4d38b53e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= <schiessle@owncloud.com>
Date: Wed, 25 May 2016 11:39:44 +0200
Subject: [PATCH] don't fail on "bad signature" during login. Most likely this
 happens because the login password changed at the user back-end (e.g ldap).
 Such failures will be handled after login correctly by allowing the user to
 adjust the passwords

---
 apps/encryption/lib/KeyManager.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/apps/encryption/lib/KeyManager.php b/apps/encryption/lib/KeyManager.php
index 4f22c3def6..a9ba8d9dba 100644
--- a/apps/encryption/lib/KeyManager.php
+++ b/apps/encryption/lib/KeyManager.php
@@ -360,6 +360,13 @@ class KeyManager {
 			return false;
 		} catch (DecryptionFailedException $e) {
 			return false;
+		} catch (\Exception $e) {
+			$this->log->warning(
+				'Could not decrypt the private key from user "' . $uid . '"" during login. ' .
+				'Assume password change on the user back-end. Error message: '
+				. $e->getMessage()
+			);
+			return false;
 		}
 
 		if ($privateKey) {