Encryption and signing works in three simple tests. Need some test with larger data. Largest message length was 299 byte so far.

Author: thsc42

src/net/sharksystem/asap/protocol/CryptoSession.java

@@ -155,11 +155,9 @@ public void finish() throws ASAPSecurityException {
             }
         }
 
+        // must be after signing
         if(this.cipher != null) {
             try {
-                // encrypted asap message
-                byte[] asapMessageAsBytes = this.asapMessageOS.toByteArray();
-
                 // get symmetric key
                 SecretKey encryptionKey = this.keyStorage.generateSymmetricKey();
                 byte[] encodedSymmetricKey = encryptionKey.getEncoded();
@@ -170,21 +168,28 @@ public void finish() throws ASAPSecurityException {
                 // send encrypted key
                 this.writeByteArray(encryptedSymmetricKeyBytes, this.realOS);
 
+                // get maybe signed asap message
+                byte[] asapMessageAsBytes = this.asapMessageOS.toByteArray();
+
                 // encrypt message with symmetric key
                 try {
-                    this.cipher = Cipher.getInstance(keyStorage.getSymmetricEncryptionAlgorithm());
-                    this.cipher.init(Cipher.ENCRYPT_MODE, encryptionKey);
+                    Cipher symmetricCipher = Cipher.getInstance(keyStorage.getSymmetricEncryptionAlgorithm());
+                    symmetricCipher.init(Cipher.ENCRYPT_MODE, encryptionKey);
 
+                    /*
                     // block by block
                     int i = 0;
                     while(i +  MAX_ENCRYPTION_BLOCK_SIZE < asapMessageAsBytes.length) {
-                        this.cipher.update(asapMessageAsBytes, i, MAX_ENCRYPTION_BLOCK_SIZE);
+                        symmetricCipher.update(asapMessageAsBytes, i, MAX_ENCRYPTION_BLOCK_SIZE);
                         i += MAX_ENCRYPTION_BLOCK_SIZE;
                     }
 
                     int lastStepLen = asapMessageAsBytes.length - i;
-                    byte[] encryptedContent = this.cipher.doFinal(asapMessageAsBytes, i, lastStepLen);
+                    symmetricCipher.update(asapMessageAsBytes, i, lastStepLen);
+                    byte[] encryptedContent = symmetricCipher.doFinal();
+                     */
 
+                    byte[] encryptedContent = symmetricCipher.doFinal(asapMessageAsBytes);
                     this.writeByteArray(encryptedContent, this.realOS);
                 } catch (NoSuchAlgorithmException | InvalidKeyException | NoSuchPaddingException e) {
                     throw new ASAPSecurityException(this.getLogStart(), e);

test/net/sharksystem/asap/protocol/PDUTests.java

@@ -181,6 +181,43 @@ public void sendAndReceiveInterestSigned() throws IOException, ASAPException {
         Assert.assertTrue(interestPDU.verified());
     }
 
+    @Test
+    public void sendAndReceiveInterestSignedAndEncrypted() throws IOException, ASAPException {
+        TestASAPKeyStorage keyStorageAlice = new TestASAPKeyStorage(ALICE_ID);
+
+        // add Bob
+        KeyPair bobKeyPair = keyStorageAlice.createTestPeer(BOB_ID);
+        TestASAPKeyStorage keyStorageBob = new TestASAPKeyStorage(BOB_ID,bobKeyPair);
+        keyStorageBob.addKeyPair(ALICE_ID, keyStorageAlice.getKeyPair());
+
+        ASAP_1_0 asapModemAlice = new ASAP_Modem_Impl(keyStorageAlice);
+        ASAP_1_0 asapModemBob = new ASAP_Modem_Impl(keyStorageBob);
+
+        String sender = ALICE_ID;
+        String recipient = BOB_ID;
+        String channel = "AliceURI";
+        String format = "format";
+
+        ByteArrayOutputStream os = new ByteArrayOutputStream();
+
+        /////////////////////// encrypted
+        asapModemAlice.interest(sender, recipient, format, channel, os,true, true);
+
+        // try t read output
+        InputStream is = new ByteArrayInputStream(os.toByteArray());
+
+        ASAP_PDU_1_0 asap_pdu_1_0 = asapModemBob.readPDU(is);
+
+        ASAP_Interest_PDU_1_0 interestPDU = (ASAP_Interest_PDU_1_0) asap_pdu_1_0;
+
+        Assert.assertTrue(interestPDU.getChannelUri().equalsIgnoreCase(channel));
+        Assert.assertTrue(interestPDU.getFormat().equalsIgnoreCase(format));
+        Assert.assertTrue(interestPDU.getSender().equalsIgnoreCase(sender));
+        Assert.assertTrue(interestPDU.getRecipient().equalsIgnoreCase(recipient));
+        Assert.assertTrue(interestPDU.encrypted());
+        Assert.assertTrue(interestPDU.verified());
+    }
+
     ////////////////////           assimilate          /////////////////////////////////////////
     @Test
     public void sendAndReceiveAssimilate() throws IOException, ASAPException {

test/net/sharksystem/asap/protocol/Workbench.java

@@ -15,41 +15,4 @@ public class Workbench {
     public static final String ALICE_ID = "Alice";
     public static final String BOB_ID = "Bob";
 
-
-    @Test
-    public void sendAndReceiveInterestSignedAndEncrypted() throws IOException, ASAPException {
-        TestASAPKeyStorage keyStorageAlice = new TestASAPKeyStorage(ALICE_ID);
-
-        // add Bob
-        KeyPair bobKeyPair = keyStorageAlice.createTestPeer(BOB_ID);
-        TestASAPKeyStorage keyStorageBob = new TestASAPKeyStorage(BOB_ID,bobKeyPair);
-        keyStorageBob.addKeyPair(ALICE_ID, keyStorageAlice.getKeyPair());
-
-        ASAP_1_0 asapModemAlice = new ASAP_Modem_Impl(keyStorageAlice);
-        ASAP_1_0 asapModemBob = new ASAP_Modem_Impl(keyStorageBob);
-
-        String sender = ALICE_ID;
-        String recipient = BOB_ID;
-        String channel = "AliceURI";
-        String format = "format";
-
-        ByteArrayOutputStream os = new ByteArrayOutputStream();
-
-        /////////////////////// encrypted
-        asapModemAlice.interest(sender, recipient, format, channel, os,true, true);
-
-        // try t read output
-        InputStream is = new ByteArrayInputStream(os.toByteArray());
-
-        ASAP_PDU_1_0 asap_pdu_1_0 = asapModemBob.readPDU(is);
-
-        ASAP_Interest_PDU_1_0 interestPDU = (ASAP_Interest_PDU_1_0) asap_pdu_1_0;
-
-        Assert.assertTrue(interestPDU.getChannelUri().equalsIgnoreCase(channel));
-        Assert.assertTrue(interestPDU.getFormat().equalsIgnoreCase(format));
-        Assert.assertTrue(interestPDU.getSender().equalsIgnoreCase(sender));
-        Assert.assertTrue(interestPDU.getRecipient().equalsIgnoreCase(recipient));
-        Assert.assertTrue(interestPDU.encrypted());
-        Assert.assertTrue(interestPDU.verified());
-    }
 }