Move libjade dependency into nix

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "libjade"]
-	path = libjade
-	url = https://github.com/formosa-crypto/libjade.git

Makefile

@@ -18,7 +18,7 @@ clean:
 	$(MAKE) -C syscall clean
 
 build/%.S: src/%.jazz
-	JASMINPATH="Jade=libjade/src/" $(JC) $< -o $@
+	$(JC) $< -o $@
 
 syscall/jasmin_syscall.o: syscall/jasmin_syscall.c syscall/jasmin_syscall.h
 	$(MAKE) -C syscall

default.nix

@@ -4,8 +4,8 @@ let
   jasmin-src = fetchFromGitHub {
     owner = "Rixxc";
     repo = "jasmin";
-    rev = "244d42d2a8c37d7607abf7dd5e92eddd2c339340";
-    hash = "sha256-EDLsFsRZmSzei2LvgJfI6W+DiErnfrwO7ciom/1+6BQ=";
+    rev = "783aea97836f5ddf7b62de24ab94768cb606adf8";
+    hash = "sha256-5XXZ2IYXCixJHaswdYkG8ivh3fIftaibOgkpz2TKGMI=";
   };
 
   jasmin-drv = callPackage "${jasmin-src}/default.nix" { inherit pkgs; };
@@ -16,6 +16,13 @@ let
       make -C compiler/
     '';
   };
+
+  libjade = fetchFromGitHub {
+    owner = "formosa-crypto";
+    repo = "libjade";
+    rev = "b0940068243f01dc3c185d166f1450936eec3eed";
+    hash = "sha256-w71QmJn5TG1cJ+SGXJyjh86uge177uRGSvwgnJXpKYg=";
+  };
 in
 stdenv.mkDerivation {
   name = "x25519-agent";
@@ -25,6 +32,7 @@ stdenv.mkDerivation {
     gnumake
     gcc
     jasmin
+    libjade
   ];
 
   configurePhase = ''
@@ -35,4 +43,6 @@ stdenv.mkDerivation {
     mkdir -p $out/lib
     cp build/libagent.a $out/lib
   '';
+
+  JASMINPATH = "Jade=${libjade}/src/";
 }

src/agent.jazz

@@ -1,5 +1,14 @@
 from Jade require "crypto_scalarmult/curve25519/amd64/mulx/scalarmult.jazz"
 
+inline fn extract_nth_ptr(reg u64 sync_mem shared_mem, inline int i) -> reg u64 {
+    reg u64 p;
+
+    p = (u64)[sync_mem + (16 + i * 8)];
+    p += shared_mem;
+
+    return p;
+}
+
 inline fn extract_ipc_id(reg u64 sync_mem) -> reg u64 {
     reg u64 id;
 
@@ -8,7 +17,7 @@ inline fn extract_ipc_id(reg u64 sync_mem) -> reg u64 {
     return id;
 }
 
-inline fn generate_key(reg u64 shared_mem sync_mem private_mem key_id) -> reg u64 {
+inline fn generate_keypair(reg u64 shared_mem sync_mem private_mem, stack u64 key_id) -> stack u64 {
     inline int i;
     stack u8[32] key;
     reg u64 addr idptr pkptr;
@@ -18,13 +27,11 @@ inline fn generate_key(reg u64 shared_mem sync_mem private_mem key_id) -> reg u6
     key[31] &= 127;
     key[31] |= 64;
 
-    key_id += 1; 
-
     addr = key_id * 32;
     addr += private_mem;
 
     for i=0 to 4 {
-        (u64)[private_mem + i * 8] = key[u64 i];
+        (u64)[addr + i * 8] = key[u64 i];
     }
 
     idptr = (u64)[sync_mem + 16];
@@ -35,18 +42,44 @@ inline fn generate_key(reg u64 shared_mem sync_mem private_mem key_id) -> reg u6
     pkptr = (u64)[sync_mem + 24];
     pkptr += shared_mem;
 
-    () = #spill(key_id);
+    jade_scalarmult_curve25519_amd64_mulx_base(pkptr, addr);
 
-    jade_scalarmult_curve25519_amd64_mulx_base(pkptr, private_mem);
-
-    () = #unspill(key_id);
+    key_id += 1; 
 
     return key_id;
 }
 
+inline fn calculate_pubkey(reg u64 shared_mem sync_mem private_mem) {
+    reg u64 skptr outptr;
+
+    skptr = extract_nth_ptr(sync_mem, shared_mem, 0);
+    outptr = extract_nth_ptr(sync_mem, shared_mem, 1);
+
+    skptr = (u64)[skptr];
+    skptr *= 32;
+    skptr += private_mem;
+
+    jade_scalarmult_curve25519_amd64_mulx_base(outptr, skptr);
+}
+
+inline fn x25519(reg u64 shared_mem sync_mem private_mem) {
+    reg u64 outptr idptr pkptr keyptr;
+    reg u64 keyid;
+
+    outptr = extract_nth_ptr(sync_mem, shared_mem, 0);
+    idptr = extract_nth_ptr(sync_mem, shared_mem, 1);
+    pkptr = extract_nth_ptr(sync_mem, shared_mem, 2);
+
+    keyid = (u64)[idptr];
+    keyid *= 32;
+    keyptr = private_mem + keyid;
+
+    jade_scalarmult_curve25519_amd64_mulx(outptr, keyptr, pkptr);
+}
+
 export fn agent_start(reg u64 shared_mem sync_mem private_mem) {
     stack u8[8] unused;
-    reg u64 key_id;
+    stack u64 key_id;
 
     key_id = 0;
 
@@ -60,11 +93,18 @@ export fn agent_start(reg u64 shared_mem sync_mem private_mem) {
         () = #unspill(shared_mem, sync_mem, private_mem);
         
         reg u64 id;
-
         id = extract_ipc_id(sync_mem);
 
         if (id == 0) {
-            key_id = generate_key(shared_mem, sync_mem, private_mem, key_id);
+            key_id = generate_keypair(shared_mem, sync_mem, private_mem, key_id);
+        } else {
+            if (id == 1) {
+                calculate_pubkey(shared_mem, sync_mem, private_mem);
+            } else {
+                if (id == 2) {
+                    x25519(shared_mem, sync_mem, private_mem);
+                }
+            }
         }
 
         () = #unspill(sync_mem);