- started implementing new crypto

- $-expansion and XDG in config

6 files changed, 6 insertions, 13 deletions

diff --git a/src/main/java/org/gnunet/identity/messages/CreateRequestMessage.java b/src/main/java/org/gnunet/identity/messages/CreateRequestMessage.java
index 475100c..dd67fa1 100644
--- a/src/main/java/org/gnunet/identity/messages/CreateRequestMessage.java
+++ b/src/main/java/org/gnunet/identity/messages/CreateRequestMessage.java
@@ -44,8 +44,8 @@ import org.gnunet.construct.NestedMessage;
 import org.gnunet.construct.UInt16;
 import org.gnunet.construct.UnionCase;
 import org.gnunet.construct.ZeroTerminatedString;
-import org.gnunet.util.CryptoECC;
 import org.gnunet.util.GnunetMessage;
+import org.gnunet.util.crypto.EcdsaPrivateKey;
 
 @UnionCase(629)
 public class CreateRequestMessage implements GnunetMessage.Body {
@@ -57,7 +57,7 @@ public class CreateRequestMessage implements GnunetMessage.Body {
     @UInt16
     public int reserved;
     @NestedMessage
-    public CryptoECC.PrivateKey privateKey;
+    public EcdsaPrivateKey privateKey;
     @ZeroTerminatedString
     public String name;
 }
diff --git a/src/main/java/org/gnunet/identity/messages/GetDefaultMessage.java b/src/main/java/org/gnunet/identity/messages/GetDefaultMessage.java
index fab5f33..eb44eba 100644
--- a/src/main/java/org/gnunet/identity/messages/GetDefaultMessage.java
+++ b/src/main/java/org/gnunet/identity/messages/GetDefaultMessage.java
@@ -80,11 +80,9 @@
 
 package org.gnunet.identity.messages;
 
-import org.gnunet.construct.NestedMessage;
 import org.gnunet.construct.UInt16;
 import org.gnunet.construct.UnionCase;
 import org.gnunet.construct.ZeroTerminatedString;
-import org.gnunet.util.CryptoECC;
 import org.gnunet.util.GnunetMessage;
 
 @UnionCase(627)
diff --git a/src/main/java/org/gnunet/identity/messages/ResultCodeMessage.java b/src/main/java/org/gnunet/identity/messages/ResultCodeMessage.java
index c761603..12bd55b 100644
--- a/src/main/java/org/gnunet/identity/messages/ResultCodeMessage.java
+++ b/src/main/java/org/gnunet/identity/messages/ResultCodeMessage.java
@@ -101,7 +101,6 @@
 package org.gnunet.identity.messages;
 
 import org.gnunet.construct.*;
-import org.gnunet.util.CryptoECC;
 import org.gnunet.util.GnunetMessage;
 
 /**
diff --git a/src/main/java/org/gnunet/identity/messages/SetDefaultMessage.java b/src/main/java/org/gnunet/identity/messages/SetDefaultMessage.java
index bcdb233..484bde7 100644
--- a/src/main/java/org/gnunet/identity/messages/SetDefaultMessage.java
+++ b/src/main/java/org/gnunet/identity/messages/SetDefaultMessage.java
@@ -64,8 +64,8 @@ import org.gnunet.construct.NestedMessage;
 import org.gnunet.construct.UInt16;
 import org.gnunet.construct.UnionCase;
 import org.gnunet.construct.ZeroTerminatedString;
-import org.gnunet.util.CryptoECC;
 import org.gnunet.util.GnunetMessage;
+import org.gnunet.util.crypto.EcdsaPrivateKey;
 
 
 /**
@@ -79,7 +79,7 @@ public class SetDefaultMessage implements GnunetMessage.Body {
     @UInt16
     public int reserved;
     @NestedMessage
-    public CryptoECC.PrivateKey privateKey;
+    public EcdsaPrivateKey privateKey;
     @ZeroTerminatedString
     public String serviceName;
 }
diff --git a/src/main/java/org/gnunet/identity/messages/StartMessage.java b/src/main/java/org/gnunet/identity/messages/StartMessage.java
index b8fbbee..ffc0a08 100644
--- a/src/main/java/org/gnunet/identity/messages/StartMessage.java
+++ b/src/main/java/org/gnunet/identity/messages/StartMessage.java
@@ -60,11 +60,7 @@
 
 package org.gnunet.identity.messages;
 
-import org.gnunet.construct.NestedMessage;
-import org.gnunet.construct.UInt16;
 import org.gnunet.construct.UnionCase;
-import org.gnunet.construct.ZeroTerminatedString;
-import org.gnunet.util.CryptoECC;
 import org.gnunet.util.GnunetMessage;
 
 @UnionCase(624)
diff --git a/src/main/java/org/gnunet/identity/messages/UpdateListMessage.java b/src/main/java/org/gnunet/identity/messages/UpdateListMessage.java
index f1fb8ab..f30d18a 100644
--- a/src/main/java/org/gnunet/identity/messages/UpdateListMessage.java
+++ b/src/main/java/org/gnunet/identity/messages/UpdateListMessage.java
@@ -84,8 +84,8 @@ import org.gnunet.construct.NestedMessage;
 import org.gnunet.construct.UInt16;
 import org.gnunet.construct.UnionCase;
 import org.gnunet.construct.ZeroTerminatedString;
-import org.gnunet.util.CryptoECC;
 import org.gnunet.util.GnunetMessage;
+import org.gnunet.util.crypto.EcdsaPrivateKey;
 
 
 /**
@@ -98,7 +98,7 @@ public class UpdateListMessage implements GnunetMessage.Body{
     @UInt16
     public int endOfList;
     @NestedMessage
-    public CryptoECC.PrivateKey privateKey;
+    public EcdsaPrivateKey privateKey;
     @ZeroTerminatedString
     public String egoName;
 }