Skip to content

Introduced protections against predictable RNG abuse #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
pixeebot wants to merge 1 commit into from
Closed

Introduced protections against predictable RNG abuse #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion app/src/androidTest/java/com/owncloud/android/datamodel/UploadStorageManagerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import com.owncloud.android.files.services.NameCollisionPolicy;
import com.owncloud.android.lib.common.accounts.AccountUtils;
import com.owncloud.android.operations.UploadFileOperation;
import java.security.SecureRandom;

import org.junit.After;
import org.junit.Before;
Expand Down Expand Up @@ -200,7 +201,7 @@ private OCUpload createUpload(Account account) {
generateUniqueNumber(),
account.name);

upload.setFileSize(new Random().nextInt(20000) * 10000);
upload.setFileSize(new SecureRandom().nextInt(20000) * 10000);
upload.setUploadStatus(UploadsStorageManager.UploadStatus.UPLOAD_IN_PROGRESS);
upload.setLocalAction(2);
upload.setNameCollisionPolicy(NameCollisionPolicy.ASK_USER);
Expand Down
4 changes: 2 additions & 2 deletions app/src/androidTest/java/com/owncloud/android/util/EncryptionTestIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ public void encryptStringSymmetricRandom() throws Exception {
byte[] key = generateKey();

String encryptedString;
if (new Random().nextBoolean()) {
if (new SecureRandom().nextBoolean()) {
encryptedString = EncryptionUtils.encryptStringSymmetricAsString(privateKey, key);
} else {
encryptedString = EncryptionUtils.encryptStringSymmetricAsStringOld(privateKey, key);
Expand Down Expand Up @@ -262,7 +262,7 @@ public void encryptPrivateKey() throws Exception {
String privateKeyString = encodeBytesToBase64String(privateKeyBytes);

String encryptedString;
if (new Random().nextBoolean()) {
if (new SecureRandom().nextBoolean()) {
encryptedString = EncryptionUtils.encryptPrivateKey(privateKeyString, keyPhrase);
} else {
encryptedString = EncryptionUtils.encryptPrivateKeyOld(privateKeyString, keyPhrase);
Expand Down
Loading