From bae5be3dc14085a5061cd38e74c07453ed19b66b Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <bjoern@schiessle.org>
Date: Thu, 27 Jul 2017 16:52:28 +0200
Subject: add prefix to user and system keys to avoid name collisions

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
---
 lib/private/Security/IdentityProof/Manager.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'lib/private/Security')

diff --git a/lib/private/Security/IdentityProof/Manager.php b/lib/private/Security/IdentityProof/Manager.php
index a8c204c84b9..c5134e12b8d 100644
--- a/lib/private/Security/IdentityProof/Manager.php
+++ b/lib/private/Security/IdentityProof/Manager.php
@@ -121,7 +121,8 @@ class Manager {
 	 * @return Key
 	 */
 	public function getKey(IUser $user) {
-		return $this->retrieveKey($user->getUID());
+		$uid = $user->getUID();
+		return $this->retrieveKey('user-' . $uid);
 	}
 
 	/**
@@ -135,7 +136,7 @@ class Manager {
 		if ($instanceId === null) {
 			throw new \RuntimeException('no instance id!');
 		}
-		return $this->retrieveKey($instanceId);
+		return $this->retrieveKey('system-' . $instanceId);
 	}
 
 
-- 
cgit v1.2.3