[Nym3-commit] r11 - trunk/crypto

[nym3-devel@lists.noreply.org]

Author: laurent
Date: 2004-05-02 20:04:23 +0200 (Sun, 02 May 2004)
New Revision: 11

Modified:
   trunk/crypto/sprp.ml
Log:
lioness_encrypt is readable again and compiles. Don't ask me about
correctness though.


Modified: trunk/crypto/sprp.ml
===================================================================
--- trunk/crypto/sprp.ml	2004-05-02 16:43:49 UTC (rev 10)
+++ trunk/crypto/sprp.ml	2004-05-02 18:04:23 UTC (rev 11)
@@ -6,7 +6,7 @@
  *
  * Note that we will use Cryptokit for our cryptographic primitives.
  *
- * $Id: sprp.ml,v 1.2 2004/04/27 04:47:20 erik Exp $
+ * $Id$
  *)
 
 open Cryptokit
@@ -38,20 +38,10 @@
   and k2 = xor_string k k1_mask
   and k3 = xor_string k k2_mask
   and k4 = xor_string k k3_mask
-  and lm = String.sub m 0 20
-  and rm = String.sub m 20 ((String.length m) - 20) in
-  let rf = ef (String.sub 
-		 (hf 
-		    (k3 ^ 
-		     (xor_string lm 
-			(hf 
-			   (k2 ^ 
-			    (ef (String.sub (hf (k1 ^ lm ^ k1)) 0 16)
-			       rm) ^ 
-			    k2))) 
-		     ^ k3)) 
-		 0 16) re in
-  let lf = xor_string lh (hf (k4 ^ rf ^ k4)) in
-    lf ^ rf
-;;
-
+  and li = String.sub m 0 20
+  and ri = String.sub m 20 ((String.length m) - 20) in
+  let rm = ef (String.sub (hf (k1 ^ li ^ k1)) 0 16) ri in
+  let lm = xor_string li (hf (k2 ^ rm ^ k2)) in
+  let rf = ef (String.sub (hf (k3 ^ lm ^ k3)) 0 16) rm in
+  let lf = xor_string lm (hf (k4 ^ rm ^ k4)) in
+  lf ^ rf;;