Add nextInt to SecureRandomProvider interface.

signalapp · Feb 10, 2015 · 43bb26c · 43bb26c
1 parent 98860d4
commit 43bb26c
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 0 deletions.
diff --git a/common/src/main/java/org/whispersystems/curve25519/SecureRandomProvider.java b/common/src/main/java/org/whispersystems/curve25519/SecureRandomProvider.java
@@ -2,4 +2,5 @@
 
 public interface SecureRandomProvider {
   public void nextBytes(byte[] output);
+  public int nextInt(int maxValue);
 }
diff --git a/j2me/src/main/java/org/whispersystems/curve25519/NullSecureRandomProvider.java b/j2me/src/main/java/org/whispersystems/curve25519/NullSecureRandomProvider.java
@@ -5,4 +5,9 @@ public class NullSecureRandomProvider implements SecureRandomProvider {
   public void nextBytes(byte[] output) {
     throw new IllegalArgumentException("No default J2ME Secure Random provider available!");
   }
+
+//  @Override
+  public int nextInt(int maxValue) {
+    throw new IllegalArgumentException("No default J2ME Secure Random provider available!");
+  }
 }
diff --git a/java/src/main/java/org/whispersystems/curve25519/JCESecureRandomProvider.java b/java/src/main/java/org/whispersystems/curve25519/JCESecureRandomProvider.java
@@ -14,4 +14,14 @@ public void nextBytes(byte[] output) {
       throw new AssertionError(e);
     }
   }
+
+  @Override
+  public int nextInt(int maxValue) {
+    try {
+      SecureRandom secureRandom = SecureRandom.getInstance("SHA1PRNG");
+      return secureRandom.nextInt(maxValue);
+    } catch (NoSuchAlgorithmException e) {
+      throw new AssertionError(e);
+    }
+  }
 }