Prepare SharkNetMessage to be used in SN2 Android App

Author: thsc42

src/net/sharksystem/crypto/ASAPCryptoAlgorithms.java

@@ -87,6 +87,24 @@ public static byte[] decryptPackage(EncryptedMessagePackage encryptedMessagePack
         return decryptSymmetric(encryptedMessagePackage.getEncryptedContent(), symmetricKey, basicKeyStore);
     }
 
+    public static SecretKey generateSymmetricKey(String keyType, int size) throws ASAPSecurityException {
+        try {
+            KeyGenerator gen = KeyGenerator.getInstance(keyType);
+            gen.init(size);
+            SecretKey secretKey = gen.generateKey();
+            return secretKey;
+        } catch (NoSuchAlgorithmException e) {
+            throw new ASAPSecurityException(ASAPCryptoAlgorithms.class.getSimpleName(), e);
+        }
+    }
+
+    public static boolean sameID(CharSequence peerA, CharSequence peerB) {
+        String peerAString = peerA.toString();
+        String peerBString = peerB.toString();
+
+        return peerAString.equalsIgnoreCase(peerBString);
+    }
+
     public interface EncryptedMessagePackage {
         CharSequence getRecipient();
         byte[] getEncryptedSymmetricKey();

src/net/sharksystem/crypto/BasicCryptoKeyStorage.java

@@ -3,7 +3,6 @@
 import net.sharksystem.asap.ASAPSecurityException;
 import net.sharksystem.asap.util.Log;
 
-import javax.crypto.KeyGenerator;
 import javax.crypto.SecretKey;
 import java.io.*;
 import java.security.*;
@@ -34,21 +33,10 @@ public BasicCryptoKeyStorage(CharSequence ownerID, KeyPair ownerKeyPair) {
     }
 
     public SecretKey generateSymmetricKey() throws ASAPSecurityException {
-        return BasicCryptoKeyStorage.generateSymmetricKey(
+        return ASAPCryptoAlgorithms.generateSymmetricKey(
                 DEFAULT_SYMMETRIC_KEY_TYPE, DEFAULT_AES_KEY_SIZE);
     }
 
-    public static SecretKey generateSymmetricKey(String keyType, int size) throws ASAPSecurityException {
-        try {
-            KeyGenerator gen = KeyGenerator.getInstance(keyType);
-            gen.init(size);
-            SecretKey secretKey = gen.generateKey();
-            return secretKey;
-        } catch (NoSuchAlgorithmException e) {
-            throw new ASAPSecurityException("BasicCryptoKeyStorage", e);
-        }
-    }
-
     private String getLogStart() {
         return this.getClass().getSimpleName() + ": ";
     }
@@ -147,10 +135,7 @@ public String getSymmetricKeyType() {
 
     @Override
     public boolean isOwner(CharSequence peerID) {
-        String ownerString = this.getOwner().toString();
-        String peerIDString = peerID.toString();
-
-        return ownerString.equalsIgnoreCase(peerIDString);
+        return ASAPCryptoAlgorithms.sameID(this.getOwner(), peerID);
     }
 
     @Override