Updating aerogear-crypto to version 0.1.5.

common/pom.xml

@@ -38,6 +38,10 @@
             <groupId>org.jboss.aerogear</groupId>
             <artifactId>aerogear-crypto</artifactId>
         </dependency>
+        <dependency>
+            <groupId>bouncycastle</groupId>
+            <artifactId>bcprov-jdk16</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.easytesting</groupId>
             <artifactId>fest-assert</artifactId>

common/src/main/java/org/jboss/aerogear/simplepush/util/CryptoUtil.java

@@ -12,10 +12,10 @@
  */
 package org.jboss.aerogear.simplepush.util;
 
-import org.bouncycastle.util.encoders.UrlBase64;
 import org.jboss.aerogear.AeroGearCrypto;
 import org.jboss.aerogear.crypto.BlockCipher;
 import org.jboss.aerogear.crypto.CryptoBox;
+import org.jboss.aerogear.crypto.encoders.UrlBase64;
 
 import java.net.URLDecoder;
 import java.net.URLEncoder;
@@ -45,7 +45,7 @@ private CryptoUtil() {
     public static String encrypt(final byte[] key, final String content) throws Exception {
         final byte[] iv = BlockCipher.getIV();
         final byte[] encrypted = new CryptoBox(key).encrypt(iv, content.getBytes(ASCII));
-        final String base64 = new String(UrlBase64.encode(prependIV(encrypted, iv)));
+        final String base64 = new UrlBase64().encode(prependIV(encrypted, iv));
         return URLEncoder.encode(base64, ASCII.displayName());
     }
 
@@ -67,7 +67,7 @@ private static byte[] prependIV(final byte[] target, final byte[] iv) {
      * @throws Exception
      */
     public static String decrypt(final byte[] key, final String content) throws Exception {
-        final byte[] decodedContent = UrlBase64.decode(URLDecoder.decode(content, ASCII.displayName()));
+        final byte[] decodedContent = new UrlBase64().decode(URLDecoder.decode(content, ASCII.displayName()));
         final byte[] iv = extractIV(decodedContent);
         final byte[] decrypted = new CryptoBox(key).decrypt(iv, extractContent(decodedContent));
         return new String(decrypted, ASCII);

common/src/test/java/org/jboss/aerogear/simplepush/util/CryptoUtilTest.java

@@ -27,7 +27,7 @@ public class CryptoUtilTest {
     public void encrypt() throws Exception {
         final byte[] salt = "some salt for the server private".getBytes();
         final byte[] key = CryptoUtil.secretKey("key", salt);
-        final String encrypted = CryptoUtil.encrypt(key, "some string to endrypt");
+        final String encrypted = CryptoUtil.encrypt(key, "some string to encrypt");
         assertThat(encrypted, is(notNullValue()));
     }
 

pom.xml

@@ -60,7 +60,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-        <aerogear.crypto.version>0.1.2</aerogear.crypto.version>
+        <aerogear.crypto.version>0.1.5</aerogear.crypto.version>
         <bouncycastle.version>140</bouncycastle.version>
         <h2database.version>1.3.172</h2database.version>
         <commons.http.core.version>4.2.4</commons.http.core.version>

server-core/src/main/java/org/jboss/aerogear/simplepush/server/DefaultSimplePushServer.java

@@ -20,7 +20,7 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import org.jboss.aerogear.crypto.Random;
+import org.jboss.aerogear.crypto.RandomUtils;
 import org.jboss.aerogear.simplepush.protocol.Ack;
 import org.jboss.aerogear.simplepush.protocol.AckMessage;
 import org.jboss.aerogear.simplepush.protocol.HelloMessage;
@@ -171,7 +171,7 @@ public SimplePushServerConfig config() {
     public static byte[] generateAndStorePrivateKey(final DataStore store, final SimplePushServerConfig config) {
         byte[] keySalt = store.getPrivateKeySalt();
         if (keySalt.length == 0) {
-            keySalt = new Random().randomBytes();
+            keySalt = RandomUtils.randomBytes();
             store.savePrivateKeySalt(keySalt);
         }
         return CryptoUtil.secretKey(config.password(), keySalt);