Get rid of encode_mpint.

mirage · Feb 16, 2017 · 752752f · 752752f
1 parent 2e69ea6
commit 752752f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/lib/kex.ml b/lib/kex.ml
@@ -60,7 +60,7 @@ type keys = {
 }
 
 let derive_keys digestv k h session_id need =
-  let k = encode_mpint k in
+  let k = Buf.(to_cstruct @@ add_mpint k (create ())) in
   let x = Cstruct.create 1 in
   let rec expand kn =
     if (Cstruct.len kn) >= need then

diff --git a/lib/ssh.ml b/lib/ssh.ml
@@ -186,8 +186,8 @@ let decode_mpint buf =
           Nocrypto.Numeric.Z.of_cstruct_be mpbuf,
           Cstruct.shift buf (len + 4)) ()
 
-let encode_mpint mpint =
-  Buf.(to_cstruct @@ add_mpint mpint (create ()))
+(* let encode_mpint mpint = *)
+(*   Buf.(to_cstruct @@ add_mpint mpint (create ())) *)
 
 let decode_key buf =
   decode_string buf >>= fun (key, buf) ->

diff --git a/test/test.ml b/test/test.ml
@@ -164,13 +164,16 @@ let t_mpint () =
    * Case 2: Test identity
    *)
   assert (mpint =
-          (fst @@ get_ok_s (Ssh.decode_mpint (Ssh.encode_mpint mpint))));
+          (fst @@ get_ok_s
+             (Ssh.decode_mpint
+                (Buf.(to_cstruct @@
+                      add_mpint mpint (create ()))))));
 
   (*
    * Case 3: Test the other way from 1, one zero must be prepended
    * since the first byte is negative (0xff).
    *)
-  let buf = Ssh.encode_mpint mpint in
+  let buf = Buf.(to_cstruct @@ add_mpint mpint (create ())) in
   (* 4 for header + 1 zero prepended + 2 data*)
   assert ((Cstruct.len buf) = (4 + 1 + 2));
   assert_byte buf 0 0x00;