Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions apps/encryption/tests/Crypto/EncryptAllTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,6 @@ function setUp() {
$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');


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,6 @@ public function testGetSharedSecret($isTrustedServer, $isValidToken, $ok) {
$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');
}
Expand Down
28 changes: 0 additions & 28 deletions lib/private/Security/SecureRandom.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,34 +36,6 @@
* @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
Expand Down
26 changes: 0 additions & 26 deletions lib/public/Security/ISecureRandom.php
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Used in here:

bildschirmfoto 2018-12-07 um 13 37 07

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Spreedme is dead

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


/**
* Generate a random string of specified length.
* @param int $length The length of the generated string
Expand Down
4 changes: 0 additions & 4 deletions tests/lib/Share20/ManagerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -1707,8 +1707,6 @@ public function testCreateShareLink() {
->with('password')
->willReturn('hashed');

$this->secureRandom->method('getMediumStrengthGenerator')
->will($this->returnSelf());
$this->secureRandom->method('generate')
->willReturn('token');

Expand Down Expand Up @@ -1818,8 +1816,6 @@ public function testCreateShareMail() {
$manager->expects($this->never())
->method('setLinkParent');

$this->secureRandom->method('getMediumStrengthGenerator')
->will($this->returnSelf());
$this->secureRandom->method('generate')
->willReturn('token');

Expand Down