We have a working routing, certs are delivered and verification works with a few E2E test. Promising.

Author: thsc42

libs/ASAPJava.jar

@@ -20,7 +20,7 @@ public String getIAString(CharSequence peerID) {
 
         int ia = 0;
         try {
-            ia = pki.getPersonValuesByID(peerID).getIdentityAssurance();
+            ia = pki.getIdentityAssurance(peerID);
         } catch (ASAPSecurityException e) {
             // nothing found
             // is it you

libs/SharkPKI.jar

@@ -18,8 +18,10 @@ class SharkMessageComparison implements ASAPMessageCompare {
     @Override
     public boolean earlier(byte[] msgA, byte[] msgB) {
         try {
-            InMemoSharkMessage sharkMsgA = InMemoSharkMessage.parseMessage(msgA, new ArrayList<ASAPHop>(), this.pki);
-            InMemoSharkMessage sharkMsgB = InMemoSharkMessage.parseMessage(msgB, new ArrayList<ASAPHop>(), this.pki);
+            InMemoSharkMessage sharkMsgA =
+                    InMemoSharkMessage.parseMessage(msgA, new ArrayList<ASAPHop>(), this.pki.getASAPKeyStore());
+            InMemoSharkMessage sharkMsgB =
+                    InMemoSharkMessage.parseMessage(msgB, new ArrayList<ASAPHop>(), this.pki.getASAPKeyStore());
 
             long creationTimeA = -1;
             long creationTimeB = -1;

libs/SharkPeer.jar

@@ -30,7 +30,7 @@ public SharkMessage getSharkMessage(int position, boolean chronologically) throw
         try {
             List<ASAPHop> hopsList = this.asapMessages.getChunk(position, chronologically).getASAPHopList();
             byte[] content = this.asapMessages.getMessage(position, chronologically);
-            return InMemoSharkMessage.parseMessage(content, hopsList, this.pkiComponent);
+            return InMemoSharkMessage.parseMessage(content, hopsList, this.pkiComponent.getASAPKeyStore());
         }
         catch(ASAPException | IOException asapException) {
             throw new SharkMessengerException(asapException);

src/net/sharksystem/cmdline/sharkmessengerUI/commands/pki/PKIPrinter.java

@@ -76,7 +76,7 @@ public void sendSharkMessage(byte[] content, CharSequence uri,
                                     this.asapPeer.getPeerID(),
                                     receiver,
                                     sign, encrypt,
-                                    this.sharkPKIComponent));
+                                    this.sharkPKIComponent.getASAPKeyStore()));
                 }
             } else {
                 this.asapPeer.sendASAPMessage(SHARK_MESSENGER_FORMAT, uri,
@@ -86,7 +86,7 @@ public void sendSharkMessage(byte[] content, CharSequence uri,
                             this.asapPeer.getPeerID(),
                             selectedRecipients,
                             sign, encrypt,
-                            this.sharkPKIComponent));
+                            this.sharkPKIComponent.getASAPKeyStore()));
             }
         } catch (ASAPException e) {
             throw new SharkMessengerException("when serialising and sending message: " + e.getLocalizedMessage(), e);

src/net/sharksystem/messenger/SharkMessageComparison.java

@@ -5,9 +5,7 @@
 import net.sharksystem.SharkTestPeerFS;
 import net.sharksystem.asap.crypto.InMemoASAPKeyStore;
 import net.sharksystem.asap.pki.ASAPCertificate;
-import net.sharksystem.pki.CredentialMessage;
-import net.sharksystem.pki.SharkPKIComponent;
-import net.sharksystem.pki.SharkPKIComponentFactory;
+import net.sharksystem.pki.*;
 import org.junit.jupiter.api.Assertions;
 
 import java.io.IOException;
@@ -88,9 +86,9 @@ public void setUpScenario_1() throws SharkException, IOException {
         SharkPKIComponent claraPKI = (SharkPKIComponent) this.claraPeer.getComponent(SharkPKIComponent.class);
 
         // create credential messages
-        CredentialMessage aliceCredentialMessage = alicePKI.createCredentialMessage();
-        CredentialMessage bobCredentialMessage = bobPKI.createCredentialMessage();
-        CredentialMessage claraCredentialMessage = claraPKI.createCredentialMessage();
+        CredentialMessage aliceCredentialMessage = ((SharkPKIDebugSupport) alicePKI).createCredentialMessage();
+        CredentialMessage bobCredentialMessage = ((SharkPKIDebugSupport) bobPKI).createCredentialMessage();
+        CredentialMessage claraCredentialMessage = ((SharkPKIDebugSupport) claraPKI).createCredentialMessage();
 
         // a) Alice and Bob exchange and accept credential messages and issue certificates
         ASAPCertificate aliceIssuedBobCert = alicePKI.acceptAndSignCredential(bobCredentialMessage);
@@ -187,10 +185,10 @@ public void setUpScenario_2() throws SharkException, IOException {
         SharkPKIComponent davidPKI = (SharkPKIComponent) this.davidPeer.getComponent(SharkPKIComponent.class);
 
         // create credential messages
-        CredentialMessage aliceCredentialMessage = alicePKI.createCredentialMessage();
-        CredentialMessage bobCredentialMessage = bobPKI.createCredentialMessage();
-        CredentialMessage claraCredentialMessage = claraPKI.createCredentialMessage();
-        CredentialMessage davidCredentialMessage = davidPKI.createCredentialMessage();
+        CredentialMessage aliceCredentialMessage = ((SharkPKIDebugSupport) alicePKI).createCredentialMessage();
+        CredentialMessage bobCredentialMessage = ((SharkPKIDebugSupport) bobPKI).createCredentialMessage();
+        CredentialMessage claraCredentialMessage = ((SharkPKIDebugSupport) claraPKI).createCredentialMessage();
+        CredentialMessage davidCredentialMessage = ((SharkPKIDebugSupport) davidPKI).createCredentialMessage();
 
         // a) Alice and Bob exchange and accept credential messages and issue certificates
         alicePKI.acceptAndSignCredential(bobCredentialMessage);
@@ -283,7 +281,7 @@ public static void addComponentsToSharkPeer(CharSequence peerID, SharkPeer shark
 
         // create a component factory
         SharkPKIComponentFactory certificateComponentFactory =
-                new SharkPKIComponentFactory(new InMemoASAPKeyStore(peerID));
+                new SharkPKIComponentFactory();
 
         // register this component with shark peer - note: we use interface SharkPeer
         sharkPeer.addComponent(certificateComponentFactory, SharkPKIComponent.class);

src/net/sharksystem/messenger/SharkMessageListImpl.java

@@ -4,7 +4,7 @@ public class CredentialTests {
     public void a2b2c() {
         /*
         step 1:
-        A send signed message, opens (sendMessage signedA 1 true, openTCP 7777, lsMessages, showOpenTCPPorts) okay
+        A send signed message, opens (sendMessage signedA 1 true, openTCP 7777, lsMessages, showOpenTCPPorts) fails - cannot verify
         B connects to A, got message, cannot verify (connectTCP localhost 7777, wait 500, lsMessages) okay
 
         step 2: