From 372f3d2a60dee056b2012f320d9bf220a8758c58 Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Fri, 7 Dec 2018 13:32:08 +0100 Subject: [PATCH] Remove deprecated functions from SecureRandom Signed-off-by: Roeland Jago Douma --- .../tests/Crypto/EncryptAllTest.php | 2 -- .../Controller/OCSAuthAPIControllerTest.php | 1 - lib/private/Security/SecureRandom.php | 28 ------------------- lib/public/Security/ISecureRandom.php | 26 ----------------- tests/lib/Share20/ManagerTest.php | 4 --- 5 files changed, 61 deletions(-) diff --git a/apps/encryption/tests/Crypto/EncryptAllTest.php b/apps/encryption/tests/Crypto/EncryptAllTest.php index 647b951a0a..af9b2eae30 100644 --- a/apps/encryption/tests/Crypto/EncryptAllTest.php +++ b/apps/encryption/tests/Crypto/EncryptAllTest.php @@ -126,8 +126,6 @@ class EncryptAllTest extends TestCase { $this->userInterface->expects($this->any())->method('getUsers')->willReturn(['user1', 'user2']); $this->secureRandom = $this->getMockBuilder(ISecureRandom::class)->disableOriginalConstructor()->getMock(); - $this->secureRandom->expects($this->any())->method('getMediumStrengthGenerator')->willReturn($this->secureRandom); - $this->secureRandom->expects($this->any())->method('getLowStrengthGenerator')->willReturn($this->secureRandom); $this->secureRandom->expects($this->any())->method('generate')->willReturn('12345678'); diff --git a/apps/federation/tests/Controller/OCSAuthAPIControllerTest.php b/apps/federation/tests/Controller/OCSAuthAPIControllerTest.php index 7fb84c8bad..26c0235fa7 100644 --- a/apps/federation/tests/Controller/OCSAuthAPIControllerTest.php +++ b/apps/federation/tests/Controller/OCSAuthAPIControllerTest.php @@ -177,7 +177,6 @@ class OCSAuthAPIControllerTest extends TestCase { $this->trustedServers->expects($this->once()) ->method('addSharedSecret')->willReturn($url, 'secret'); } else { - $this->secureRandom->expects($this->never())->method('getMediumStrengthGenerator'); $this->secureRandom->expects($this->never())->method('generate'); $this->trustedServers->expects($this->never())->method('addSharedSecret'); } diff --git a/lib/private/Security/SecureRandom.php b/lib/private/Security/SecureRandom.php index 75d9d02a1d..faab91e726 100644 --- a/lib/private/Security/SecureRandom.php +++ b/lib/private/Security/SecureRandom.php @@ -36,34 +36,6 @@ use OCP\Security\ISecureRandom; * @package OC\Security */ class SecureRandom implements ISecureRandom { - /** - * Convenience method to get a low strength random number generator. - * - * Low Strength should be used anywhere that random strings are needed - * in a non-cryptographical setting. They are not strong enough to be - * used as keys or salts. They are however useful for one-time use tokens. - * - * @deprecated 9.0.0 Use \OC\Security\SecureRandom::generate directly or random_bytes() / random_int() - * @return $this - */ - public function getLowStrengthGenerator() { - return $this; - } - - /** - * Convenience method to get a medium strength random number generator. - * - * Medium Strength should be used for most needs of a cryptographic nature. - * They are strong enough to be used as keys and salts. However, they do - * take some time and resources to generate, so they should not be over-used - * - * @deprecated 9.0.0 Use \OC\Security\SecureRandom::generate directly or random_bytes() / random_int() - * @return $this - */ - public function getMediumStrengthGenerator() { - return $this; - } - /** * Generate a random string of specified length. * @param int $length The length of the generated string diff --git a/lib/public/Security/ISecureRandom.php b/lib/public/Security/ISecureRandom.php index 235b3033c4..d2ccae67eb 100644 --- a/lib/public/Security/ISecureRandom.php +++ b/lib/public/Security/ISecureRandom.php @@ -54,32 +54,6 @@ interface ISecureRandom { */ const CHAR_HUMAN_READABLE = 'abcdefgijkmnopqrstwxyzABCDEFGHJKLMNPQRSTWXYZ23456789'; - /** - * Convenience method to get a low strength random number generator. - * - * Low Strength should be used anywhere that random strings are needed - * in a non-cryptographical setting. They are not strong enough to be - * used as keys or salts. They are however useful for one-time use tokens. - * - * @return $this - * @since 8.0.0 - * @deprecated 9.0.0 Use \OC\Security\SecureRandom::generate directly or random_bytes() / random_int() - */ - public function getLowStrengthGenerator(); - - /** - * Convenience method to get a medium strength random number generator. - * - * Medium Strength should be used for most needs of a cryptographic nature. - * They are strong enough to be used as keys and salts. However, they do - * take some time and resources to generate, so they should not be over-used - * - * @return $this - * @since 8.0.0 - * @deprecated 9.0.0 Use \OC\Security\SecureRandom::generate directly or random_bytes() / random_int() - */ - public function getMediumStrengthGenerator(); - /** * Generate a random string of specified length. * @param int $length The length of the generated string diff --git a/tests/lib/Share20/ManagerTest.php b/tests/lib/Share20/ManagerTest.php index 0a81073058..80747e1a15 100644 --- a/tests/lib/Share20/ManagerTest.php +++ b/tests/lib/Share20/ManagerTest.php @@ -1707,8 +1707,6 @@ class ManagerTest extends \Test\TestCase { ->with('password') ->willReturn('hashed'); - $this->secureRandom->method('getMediumStrengthGenerator') - ->will($this->returnSelf()); $this->secureRandom->method('generate') ->willReturn('token'); @@ -1818,8 +1816,6 @@ class ManagerTest extends \Test\TestCase { $manager->expects($this->never()) ->method('setLinkParent'); - $this->secureRandom->method('getMediumStrengthGenerator') - ->will($this->returnSelf()); $this->secureRandom->method('generate') ->willReturn('token');