Merge pull request #10642 from owncloud/securityutils

Add some security utilities

1 files changed, 26 insertions, 0 deletions

diff --git a/lib/private/server.php b/lib/private/server.php
index 5d40f1327f6..71a098f9074 100644
--- a/lib/private/server.php
+++ b/lib/private/server.php
@@ -10,6 +10,8 @@ use OC\Security\CertificateManager;
 use OC\DB\ConnectionWrapper;
 use OC\Files\Node\Root;
 use OC\Files\View;
+use OC\Security\Crypto;
+use OC\Security\SecureRandom;
 use OCP\IServerContainer;
 use OCP\ISession;
 
@@ -201,6 +203,12 @@ class Server extends SimpleContainer implements IServerContainer {
 		$this->registerService('Search', function ($c) {
 			return new Search();
 		});
+		$this->registerService('SecureRandom', function($c) {
+			return new SecureRandom();
+		});
+		$this->registerService('Crypto', function($c) {
+			return new Crypto(\OC::$server->getConfig(), \OC::$server->getSecureRandom());
+		});
 		$this->registerService('Db', function ($c) {
 			return new Db();
 		});
@@ -468,6 +476,24 @@ class Server extends SimpleContainer implements IServerContainer {
 	}
 
 	/**
+	 * Returns a SecureRandom instance
+	 *
+	 * @return \OCP\Security\ISecureRandom
+	 */
+	function getSecureRandom() {
+		return $this->query('SecureRandom');
+	}
+
+	/**
+	 * Returns a Crypto instance
+	 *
+	 * @return \OCP\Security\ICrypto
+	 */
+	function getCrypto() {
+		return $this->query('Crypto');
+	}
+
+	/**
 	 * Returns an instance of the db facade
 	 *
 	 * @return \OCP\IDb