refacturing: extract crypto code from asap protocol.

Author: thsc42

src/net/sharksystem/asap/ASAPPeer.java

@@ -1,7 +1,7 @@
 package net.sharksystem.asap;
 
 import net.sharksystem.asap.protocol.*;
-import net.sharksystem.crypto.ASAPBasicKeyStorage;
+import net.sharksystem.crypto.BasisCryptoParameters;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -112,7 +112,7 @@ void sendOnlineASAPAssimilateMessage(CharSequence format, CharSequence urlTarget
     void sendOnlineASAPAssimilateMessage(CharSequence format, CharSequence urlTarget, byte[] messageAsBytes)
             throws IOException, ASAPException;
 
-    void setASAPBasicKeyStorage(ASAPBasicKeyStorage asapBasicKeyStorage);
+    void setASAPBasicKeyStorage(BasisCryptoParameters basisCryptoParameters);
 
     ASAPCommunicationSetting getASAPCommunicationControl();
 }

src/net/sharksystem/asap/ASAPPeerFS.java

@@ -4,7 +4,7 @@
 import net.sharksystem.asap.protocol.*;
 import net.sharksystem.asap.util.Helper;
 import net.sharksystem.asap.util.Log;
-import net.sharksystem.crypto.ASAPBasicKeyStorage;
+import net.sharksystem.crypto.BasisCryptoParameters;
 import net.sharksystem.crypto.ASAPCommunicationCryptoSettings;
 
 import java.io.*;
@@ -19,7 +19,7 @@ public class ASAPPeerFS implements
     private CharSequence owner;
     private HashMap<CharSequence, EngineSetting> folderMap;
     private final long maxExecutionTime;
-    private ASAPBasicKeyStorage asapBasicKeyStorage;
+    private BasisCryptoParameters basisCryptoParameters;
     private DefaultSecurityAdministrator defaultSecurityAdministrator = new DefaultSecurityAdministrator();
 
     public ASAPCommunicationCryptoSettings getASAPCommunicationCryptoSettings() {
@@ -288,7 +288,7 @@ public Set<CharSequence> getFormats() {
     public ASAPConnection handleConnection(InputStream is, OutputStream os) {
         ASAPPersistentConnection asapConnection = new ASAPPersistentConnection(
                 is, os, this, new ASAP_Modem_Impl(),
-                this, this.asapBasicKeyStorage,
+                this, this.basisCryptoParameters,
                 maxExecutionTime, this, this);
 
         StringBuilder sb = new StringBuilder();
@@ -550,8 +550,8 @@ public void sendOnlineASAPAssimilateMessage(CharSequence format, CharSequence ur
     }
 
     @Override
-    public void setASAPBasicKeyStorage(ASAPBasicKeyStorage asapBasicKeyStorage) {
-        this.asapBasicKeyStorage = asapBasicKeyStorage;
+    public void setASAPBasicKeyStorage(BasisCryptoParameters basisCryptoParameters) {
+        this.basisCryptoParameters = basisCryptoParameters;
     }
 
     public void sendOnlineASAPAssimilateMessage(CharSequence format, CharSequence urlTarget,