From 20a01aa1736343bce1c67be629ae31d8c7aed548 Mon Sep 17 00:00:00 2001
From: Hussein Kasem <devnull@localhost>
Date: Wed, 13 Nov 2019 18:45:22 +0100
Subject: [PATCH] Modify Testing to use a separate key for encryption

---
 test/Testing.java                             | 39 +++++++++++------
 .../pub/pep-test-alice-0x6FF00E97_pub.asc     | 42 +++++++++++++++++++
 2 files changed, 69 insertions(+), 12 deletions(-)
 create mode 100644 test/test_keys/pub/pep-test-alice-0x6FF00E97_pub.asc

diff --git a/test/Testing.java b/test/Testing.java
index ef4041a..0f41ef5 100644
--- a/test/Testing.java
+++ b/test/Testing.java
@@ -5,6 +5,11 @@ import java.net.URLClassLoader;
 import java.lang.Thread;
 import java.lang.InterruptedException;
 
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
 class Testing {
     public void printClassPath() {
         ClassLoader cl = ClassLoader.getSystemClassLoader();
@@ -23,7 +28,7 @@ class Testing {
         try {
             e = new Engine();
             SyncCallbacks callbacks = new SyncCallbacks();
-            e.setNotifyHandshakeCallback(callbacks);
+            //e.setNotifyHandshakeCallback(callbacks);
             e.setMessageToSendCallback(callbacks);        
         }
         catch (pEpException ex) {
@@ -42,11 +47,21 @@ class Testing {
         user = e.myself(user);
         System.out.print("Keys generated: ");
         System.out.println(user.fpr);
+        
+        // Import key
+        try {
+            Path path = Paths.get("test_keys/pub/pep-test-alice-0x6FF00E97_pub.asc");
+            byte[] key = Files.readAllBytes(path);
+            e.importKey(key);
+        } catch (IOException exception) {
+            System.out.println("Could not import key");
+            exception.printStackTrace();
 
+        }
         // trustwords
-        Identity vb = new Identity();
-        vb.fpr = "DB4713183660A12ABAFA7714EBE90D44146F62F4";
-        String t = e.trustwords(vb);
+        Identity alice = new Identity();
+        alice.fpr = "4ABE3AAF59AC32CFE4F86500A9411D176FF00E97";
+        String t = e.trustwords(alice);
         System.out.print("Trustwords: ");
         System.out.println(t);
 
@@ -57,12 +72,11 @@ class Testing {
 
         Vector<Identity> to = new Vector<Identity>();
         Identity to1 = new Identity();
-        //to1.username = "Volker Birk";
-        //to1.address = "vb@pep-project.org";
-        //to1.address = "android01@peptest.ch";
-        //to1.user_id = "42";
-        //to.add(to1);
-        to.add(user);
+        to1.username = "pEp Test Alice (test key don't use)";
+        to1.address = "pep.test.alice@pep-project.org";
+        to1.user_id = "42";
+        to.add(to1);
+        //to.add(user);
         msg.setTo(to);
 
         msg.setShortmsg("hello, world");
@@ -81,6 +95,7 @@ class Testing {
 
         System.out.println(enc.getLongmsg());
         Vector<Blob> attachments = enc.getAttachments();
+        // Print msg.txt (encrypted body) contents.
         System.out.println(e.toUTF16(attachments.get(1).data));
 
         msg.setDir(Message.Direction.Outgoing);
@@ -107,14 +122,14 @@ class Testing {
         System.out.println("TEST DONE - FINISHED");
 
         try {
-            e.key_reset(null, null);
+            e.key_reset_all_own_keys();
         } 
         catch (pEpException ex) {
             System.out.println("cannot reset all own keys");
                 ex.printStackTrace();
         }
 
-        e.startSync();
+        //e.startSync();
 
         // Keygen
         System.out.println("Generating keys: ");
diff --git a/test/test_keys/pub/pep-test-alice-0x6FF00E97_pub.asc b/test/test_keys/pub/pep-test-alice-0x6FF00E97_pub.asc
new file mode 100644
index 0000000..1bf7d06
--- /dev/null
+++ b/test/test_keys/pub/pep-test-alice-0x6FF00E97_pub.asc
@@ -0,0 +1,42 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+=8Dao
+-----END PGP PUBLIC KEY BLOCK-----