From ae9426c74808b1b359e1901ac6dbc9997461ccac Mon Sep 17 00:00:00 2001
From: Michael Brenner <info@hcrypt.com>
Date: Mon, 6 Jan 2014 01:59:01 +0100
Subject: [PATCH] assembler works (shaky)

---
 asm/test.hcrypt_asm |  4 ++--
 assembler.c         | 21 ++++++++++++++++++---
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/asm/test.hcrypt_asm b/asm/test.hcrypt_asm
index b4fe4f3..8f18d67 100644
--- a/asm/test.hcrypt_asm
+++ b/asm/test.hcrypt_asm
@@ -1,7 +1,7 @@
 INITAC 0
-START 0
+INITPC 0
 
-start	L 1
+start	L start
 		CLC
 		ADD 2
 end		J end 
\ No newline at end of file
diff --git a/assembler.c b/assembler.c
index 8ce23a7..434d050 100644
--- a/assembler.c
+++ b/assembler.c
@@ -44,20 +44,32 @@ mpz_t cipher;
                 int i,j;
                 int sourceline=0;
 
-                printf("argc=%d\n",argc);
+                char skout[500],pkout[500];
 
-                if(argc!=4)
+                //printf("argc=%d\n",argc);
+
+                if(argc!=3)
                 {
-                        printf("usage: %s <in> <out> <publickey>\n",argv[0]);
+                        printf("usage: %s <in> <out>\n",argv[0]);
                         exit(0);
                 }
+
+                sprintf(skout,"%s.hcrypt_sk",argv[2]);
+                sprintf(pkout,"%s.hcrypt_pk",argv[2]);
+
                 fhe_pk_init(pk);
                 fhe_sk_init(sk);
+
                // fhe_pk_loadkey(pk,argv[3]);
                 //fhe_pk_print(pk);
 
                 puts("keygen");
                 fhe_keygen(pk,sk);
+                fhe_pk_store(pk,pkout);
+                fhe_sk_store(sk,skout);
+
+                printf("wrote secret key: %s\n",skout);
+                printf("wrote public key: %s\n",pkout);
 
                 symbols=NULL;
                 alloc=&symbols;
@@ -397,6 +409,9 @@ mpz_t cipher;
                         //printf(".\n");
                 }
 
+                printf("---- reference table start ----\n");
+                printlist(symbols);
+                printf("---- reference table end   ----\n");
                 //XXX
                 fclose(w);
                 fclose(r);