Added log messages - there is progress, see SN2

Author: thsc42

src/net/sharksystem/crypto/ASAPCryptoAlgorithms.java

@@ -23,7 +23,7 @@ public class ASAPCryptoAlgorithms {
      * @throws ASAPSecurityException
      */
     public static void writeEncryptedMessagePackage(byte[] unencryptedBytes, CharSequence recipient,
-                                                    BasicKeyStore basicKeyStore, OutputStream os) throws ASAPSecurityException {
+                                    BasicKeyStore basicKeyStore, OutputStream os) throws ASAPSecurityException {
 
         PublicKey publicKey = basicKeyStore.getPublicKey(recipient);
         // there should be an exception - but better safe than sorry
@@ -40,7 +40,7 @@ public static void writeEncryptedMessagePackage(byte[] unencryptedBytes, CharSeq
             byte[] encodedSymmetricKey = encryptionKey.getEncoded();
 
             // encrypt symmetric key
-            Cipher cipher = Cipher.getInstance(basicKeyStore.getRSAEncryptionAlgorithm());
+            Cipher cipher = Cipher.getInstance(basicKeyStore.getAsymmetricEncryptionAlgorithm());
             cipher.init(Cipher.ENCRYPT_MODE, publicKey);
             byte[] encryptedSymmetricKeyBytes = cipher.doFinal(encodedSymmetricKey);
 
@@ -94,6 +94,7 @@ public static SecretKey generateSymmetricKey(String keyType, int size) throws AS
             SecretKey secretKey = gen.generateKey();
             return secretKey;
         } catch (NoSuchAlgorithmException e) {
+            e.printStackTrace();
             throw new ASAPSecurityException(ASAPCryptoAlgorithms.class.getSimpleName(), e);
         }
     }
@@ -173,7 +174,9 @@ public static byte[] encryptSymmetric(byte[] unencryptedBytes, SecretKey encrypt
             return symmetricCipher.doFinal(unencryptedBytes);
         } catch (NoSuchAlgorithmException | InvalidKeyException | NoSuchPaddingException
                     | IllegalBlockSizeException | BadPaddingException e) {
-            throw new ASAPSecurityException("problems when encrypting with symmetric key", e);
+            e.printStackTrace();
+            throw new ASAPSecurityException("symmetric encryption failed: "
+                    + basicKeyStore.getSymmetricEncryptionAlgorithm(), e);
         }
     }
 
@@ -186,32 +189,37 @@ public static byte[] decryptSymmetric(byte[] encryptedContent, SecretKey symmetr
             return symmetricCipher.doFinal(encryptedContent);
         } catch (NoSuchAlgorithmException | InvalidKeyException | NoSuchPaddingException
                 | IllegalBlockSizeException | BadPaddingException e) {
-            throw new ASAPSecurityException("problems when decrypting with symmetric key", e);
+            e.printStackTrace();
+            throw new ASAPSecurityException("symmetric decryption failed: "
+                    + basicKeyStore.getSymmetricEncryptionAlgorithm(), e);
         }
     }
 
     public static byte[] decryptAsymmetric(byte[] encryptedBytes, BasicKeyStore basicKeyStore)
             throws ASAPSecurityException {
         try {
-            Cipher cipher = Cipher.getInstance(basicKeyStore.getRSAEncryptionAlgorithm());
+            Cipher cipher = Cipher.getInstance(basicKeyStore.getAsymmetricEncryptionAlgorithm());
             cipher.init(Cipher.DECRYPT_MODE, basicKeyStore.getPrivateKey());
             return cipher.doFinal(encryptedBytes);
         } catch (NoSuchAlgorithmException | InvalidKeyException | NoSuchPaddingException
                 | IllegalBlockSizeException | BadPaddingException e) {
-            throw new ASAPSecurityException("problems when encrypting with symmetric key", e);
+            e.printStackTrace();
+            throw new ASAPSecurityException("asymmetric decryption failed: "
+                    + basicKeyStore.getAsymmetricEncryptionAlgorithm(), e);
         }
     }
 
     public static byte[] sign(byte[] bytes2Sign, BasicKeyStore basicKeyStore)
             throws ASAPSecurityException {
 
         try {
-            Signature signature = Signature.getInstance(basicKeyStore.getRSASigningAlgorithm());
+            Signature signature = Signature.getInstance(basicKeyStore.getAsymmetricSigningAlgorithm());
             signature.initSign(basicKeyStore.getPrivateKey());
             signature.update(bytes2Sign);
             return signature.sign();
         } catch (InvalidKeyException | SignatureException | NoSuchAlgorithmException e) {
-            throw new ASAPSecurityException("problem when signing", e);
+            e.printStackTrace();
+            throw new ASAPSecurityException("signing failed: " + basicKeyStore.getAsymmetricSigningAlgorithm(), e);
         }
     }
 
@@ -222,12 +230,13 @@ public static boolean verify(byte[] signedData, byte[] signatureBytes, String se
         if(publicKey == null) return false;
 
         try {
-            Signature signature = Signature.getInstance(basicKeyStore.getRSASigningAlgorithm());
+            Signature signature = Signature.getInstance(basicKeyStore.getAsymmetricSigningAlgorithm());
             signature.initVerify(publicKey); // init with private key
             signature.update(signedData); // feed with signed data
             return signature.verify(signatureBytes); // check against signature
         } catch (NoSuchAlgorithmException | SignatureException | InvalidKeyException e) {
-            throw new ASAPSecurityException("problems when verifying", e);
+            e.printStackTrace();
+            throw new ASAPSecurityException("verifying failed: " + basicKeyStore.getAsymmetricSigningAlgorithm(), e);
         }
     }
 }

src/net/sharksystem/crypto/BasicCryptoKeyStorage.java

@@ -34,11 +34,11 @@ public BasicCryptoKeyStorage(CharSequence ownerID, KeyPair ownerKeyPair) {
 
     public SecretKey generateSymmetricKey() throws ASAPSecurityException {
         return ASAPCryptoAlgorithms.generateSymmetricKey(
-                DEFAULT_SYMMETRIC_KEY_TYPE, DEFAULT_AES_KEY_SIZE);
+                DEFAULT_SYMMETRIC_KEY_TYPE, DEFAULT_SYMMETRIC_KEY_SIZE);
     }
 
     public int getSymmetricKeyLen() {
-        return BasicKeyStore.DEFAULT_AES_KEY_SIZE;
+        return BasicKeyStore.DEFAULT_SYMMETRIC_KEY_SIZE;
     }
 
     private String getLogStart() {
@@ -123,8 +123,8 @@ public PrivateKey getPrivateKey(CharSequence subjectID) throws ASAPSecurityExcep
     }
 
     @Override
-    public String getRSAEncryptionAlgorithm() {
-        return DEFAULT_RSA_ENCRYPTION_ALGORITHM;
+    public String getAsymmetricEncryptionAlgorithm() {
+        return DEFAULT_ASYMMETRIC_ENCRYPTION_ALGORITHM;
     }
 
     @Override
@@ -148,8 +148,8 @@ public CharSequence getOwner() {
     }
 
     @Override
-    public String getRSASigningAlgorithm() {
-        return DEFAULT_SIGNATURE_ALGORITHM;
+    public String getAsymmetricSigningAlgorithm() {
+        return DEFAULT_ASYMMETRIC_SIGNATURE_ALGORITHM;
     }
 
     public void addKeyPair(String peerID, KeyPair keyPair) {

src/net/sharksystem/crypto/BasicCryptoSettings.java

@@ -7,12 +7,12 @@
 import java.security.PublicKey;
 
 public interface BasicCryptoSettings {
-    String DEFAULT_RSA_ENCRYPTION_ALGORITHM = "RSA/ECB/PKCS1Padding";
+    String DEFAULT_ASYMMETRIC_ENCRYPTION_ALGORITHM = "RSA/ECB/PKCS1Padding";
     String DEFAULT_SYMMETRIC_KEY_TYPE = "AES";
     String DEFAULT_SYMMETRIC_ENCRYPTION_ALGORITHM = "AES/ECB/PKCS5Padding";
     //    public static int DEFAULT_AES_KEY_SIZE = 256;
-    int DEFAULT_AES_KEY_SIZE = 128; // TODO we can do better
-    String DEFAULT_SIGNATURE_ALGORITHM = "SHA256withRSA";
+    int DEFAULT_SYMMETRIC_KEY_SIZE = 128; // TODO we can do better
+    String DEFAULT_ASYMMETRIC_SIGNATURE_ALGORITHM = "SHA256withRSA";
 
     /**
      *
@@ -30,9 +30,9 @@ public interface BasicCryptoSettings {
      */
     PublicKey getPublicKey() throws ASAPSecurityException;
 
-    String getRSAEncryptionAlgorithm();
+    String getAsymmetricEncryptionAlgorithm();
 
-    String getRSASigningAlgorithm();
+    String getAsymmetricSigningAlgorithm();
 
     SecretKey generateSymmetricKey() throws ASAPSecurityException;