New KBlock crypto stuff.

2 files changed, 207 insertions, 9 deletions

diff --git a/src/org/gnu/clojure/gnunet/crypto.clj b/src/org/gnu/clojure/gnunet/crypto.clj
index 7183a96..7eaa6f3 100644
--- a/src/org/gnu/clojure/gnunet/crypto.clj
+++ b/src/org/gnu/clojure/gnunet/crypto.clj
@@ -2,7 +2,9 @@
   (:use (org.gnu.clojure.gnunet parser message)
     clojure.contrib.monads)
   (:import (java.security KeyPairGenerator KeyFactory MessageDigest)
-    (java.security.spec RSAKeyGenParameterSpec RSAPublicKeySpec)))
+    (java.security.spec RSAKeyGenParameterSpec RSAPublicKeySpec
+                        RSAPrivateCrtKeySpec)
+    (java.math.BigInteger)))
 
 (defn generate-rsa-keypair
   "Generate a 2048 bit RSA keypair."
@@ -12,13 +14,20 @@
     (.initialize rsa spec)
     (.generateKeyPair rsa)))
 
-(defn generate-rsa-public-key
-  "Generate an RSA public key from a modulus and exponent."
+(defn make-rsa-public-key
+  "Make an RSA public key from a modulus and exponent."
   [modulus exponent]
   (let [keyfactory (KeyFactory/getInstance "RSA")
         keyspec (RSAPublicKeySpec. modulus exponent)]
     (.generatePublic keyfactory keyspec)))
 
+(defn make-rsa-private-key
+  "Make an RSA private key from PKCS#1 values."
+  [e n p q d u dp dq]
+  (let [keyfactory (KeyFactory/getInstance "RSA")
+        keyspec (RSAPrivateCrtKeySpec. n e d p q dp dq u)]
+    (.generatePrivate keyfactory keyspec)))
+
 (defn sha-512
   "Compute the SHA-512 digest of a sequence of bytes."
   [x]
@@ -45,9 +54,198 @@
                      n (parse-uint sizen)
                      e (parse-uint (- len sizen 4))
                      :when (try
-                             (do (generate-rsa-public-key n e) true)
+                             (do (make-rsa-public-key n e) true)
                              (catch Exception e false)
                              )
                      padding parse-uint16
                      :when (== padding 0)]
-    (generate-rsa-public-key n e)))
+    (make-rsa-public-key n e)))
+
+(defn fermat-primality-test
+  [prime]
+  (== (.modPow (bigint 2) (dec prime) prime) 1))
+
+(defn randomize-test
+  []
+  (let [seed (sha-512 [])
+        [n seed] (randomize 1024 seed)]
+    (assert (== n 91590674251499093884392150551101679508885411058606840339755137987143766603275636247934528964993934135690152777440512955430485884972253333431499809071368893109850734973123733834291751787678335529426877428528037229911013836000235885623137710504201186733461410657974411464562780903763911167512126562189243987970))
+    (assert (= (seq seed) [-83 -57 -58 -86 82 42 91 -29 -56 -97 -36 -125 47 5 -57 120 48 -112 51 -103 26 113 29 126 -80 46 88 13 -23 -59 -15 49 -34 50 54 -99 -61 -106 -2 37 18 -103 -85 -98 -58 -4 33 -13 118 -112 125 -121 -43 43 19 11 -113 -116 59 14 37 66 56 2]))))
+
+(defn
+  #^{:test randomize-test}
+  randomize
+  [bit-length seed]
+  (let [cnt (inc (quot bit-length 512))
+        hashes (take cnt (iterate sha-512 seed))
+        number (BigInteger. 1 (byte-array (mapcat identity hashes)))
+        len (.bitLength number)
+        number (reduce bit-clear number (range len (dec bit-length) -1))]
+    [number (last hashes)]))
+
+(defn set-highbit
+  [number bit]
+  (let [bit-length (.bitLength number)
+        number (reduce bit-clear number (range bit-length bit -1))]
+    (bit-set number bit)))
+
+(defn is-prime
+  [n steps seed]
+  (let [bit-length (.bitLength n)
+        nminus1 (dec n)
+        k (.getLowestSetBit nminus1)
+        q (bit-shift-right nminus1 k)]
+    (loop [step 0 seed seed]
+      (if (>= step steps)
+        [true seed]
+        (let [[x seed] (if (zero? step)
+                  [(bigint 2) seed]
+                  (let [[x seed] (randomize bit-length seed)]
+                    [(bit-clear x (- bit-length 2)) seed]))
+              y (.modPow x q n)]
+          (if (and (not (== y 1)) (not (== y nminus1))
+                (not (loop [g (take k (iterate #(.modPow % (bigint 2) n) y))]
+                       (cond
+                         (nil? g) (== nminus1 y)
+                         (== 1 (first g)) false
+                         (nil? (next g)) (== nminus1 (first g))
+                         (== nminus1 (first g)) true
+                         :else (recur (next g)))))
+                [false seed])
+            (recur (inc step) seed)))))))
+
+(def small-primes)
+
+(defn generate-prime
+  [bit-length seed]
+  {:pre [(>= bit-length 32)]}
+  (loop [seed seed]
+    (let [[prime seed] (randomize bit-length seed)
+          prime (set-highbit prime (- bit-length 1))
+          prime (bit-set (bit-set prime (- bit-length 2)) 0)
+          mods (map (partial rem prime) small-primes)
+          [prime seed] (loop [step 0 seed seed]
+                         (if (> step 20000)
+                           [nil seed]
+                           (if (not-any?
+                                 zero?
+                                 (map #(rem (+ step %1) %2) mods small-primes))
+                             (let [prime (+ prime step)]
+                               (if (fermat-primality-test prime)
+                                 (let [[result seed] (is-prime prime 5 seed)]
+                                   (if result
+                                     [prime seed]
+                                     (recur (inc step) seed)))
+                                 (recur (inc step) seed)))
+                             (recur (inc step) seed))))]
+      (if prime [prime seed] (recur seed)))))
+
+(defn generate-kblock-key
+  [bit-length seed]
+  {:pre [(even? bit-length)]}
+  (loop [seed seed]
+    (let [[n p q seed] (some #(when (== bit-length (.bitLength (first %))) %)
+                         (iterate #(let [[_ _ _ seed] %
+                                         [p seed] (generate-prime
+                                                    (quot bit-length 2) seed)
+                                         [q seed] (generate-prime
+                                                    (quot bit-length 2) seed)
+                                         [p q] (sort [p q])
+                                         n (* p q)]
+                                     [n p q seed])
+                           [(bigint 0) 0 0 seed]))
+          t1 (- p 1)
+          t2 (- q 1)
+          phi (* t1 t2)
+          g (.gcd t1 t2)
+          f (quot phi g)
+          e (some #(when (== 1 (.gcd phi (bigint %))) %)
+              (iterate (partial + 2) 257))]
+      (let [private-key (try
+                  (let [d (.modInverse e f)
+                        u (.modInverse p q)]
+                    (make-rsa-private-key e n p q d u (.mod d t1) (.mod d t2)))
+                  (catch Exception e nil))]
+        (if private-key private-key (recur seed))))))
+
+(def small-primes [
+  3, 5, 7, 11, 13, 17, 19, 23, 29, 31, 37, 41, 43,
+  47, 53, 59, 61, 67, 71, 73, 79, 83, 89, 97, 101,
+  103, 107, 109, 113, 127, 131, 137, 139, 149, 151,
+  157, 163, 167, 173, 179, 181, 191, 193, 197, 199,
+  211, 223, 227, 229, 233, 239, 241, 251, 257, 263,
+  269, 271, 277, 281, 283, 293, 307, 311, 313, 317,
+  331, 337, 347, 349, 353, 359, 367, 373, 379, 383,
+  389, 397, 401, 409, 419, 421, 431, 433, 439, 443,
+  449, 457, 461, 463, 467, 479, 487, 491, 499, 503,
+  509, 521, 523, 541, 547, 557, 563, 569, 571, 577,
+  587, 593, 599, 601, 607, 613, 617, 619, 631, 641,
+  643, 647, 653, 659, 661, 673, 677, 683, 691, 701,
+  709, 719, 727, 733, 739, 743, 751, 757, 761, 769,
+  773, 787, 797, 809, 811, 821, 823, 827, 829, 839,
+  853, 857, 859, 863, 877, 881, 883, 887, 907, 911,
+  919, 929, 937, 941, 947, 953, 967, 971, 977, 983,
+  991, 997, 1009, 1013, 1019, 1021, 1031, 1033,
+  1039, 1049, 1051, 1061, 1063, 1069, 1087, 1091,
+  1093, 1097, 1103, 1109, 1117, 1123, 1129, 1151,
+  1153, 1163, 1171, 1181, 1187, 1193, 1201, 1213,
+  1217, 1223, 1229, 1231, 1237, 1249, 1259, 1277,
+  1279, 1283, 1289, 1291, 1297, 1301, 1303, 1307,
+  1319, 1321, 1327, 1361, 1367, 1373, 1381, 1399,
+  1409, 1423, 1427, 1429, 1433, 1439, 1447, 1451,
+  1453, 1459, 1471, 1481, 1483, 1487, 1489, 1493,
+  1499, 1511, 1523, 1531, 1543, 1549, 1553, 1559,
+  1567, 1571, 1579, 1583, 1597, 1601, 1607, 1609,
+  1613, 1619, 1621, 1627, 1637, 1657, 1663, 1667,
+  1669, 1693, 1697, 1699, 1709, 1721, 1723, 1733,
+  1741, 1747, 1753, 1759, 1777, 1783, 1787, 1789,
+  1801, 1811, 1823, 1831, 1847, 1861, 1867, 1871,
+  1873, 1877, 1879, 1889, 1901, 1907, 1913, 1931,
+  1933, 1949, 1951, 1973, 1979, 1987, 1993, 1997,
+  1999, 2003, 2011, 2017, 2027, 2029, 2039, 2053,
+  2063, 2069, 2081, 2083, 2087, 2089, 2099, 2111,
+  2113, 2129, 2131, 2137, 2141, 2143, 2153, 2161,
+  2179, 2203, 2207, 2213, 2221, 2237, 2239, 2243,
+  2251, 2267, 2269, 2273, 2281, 2287, 2293, 2297,
+  2309, 2311, 2333, 2339, 2341, 2347, 2351, 2357,
+  2371, 2377, 2381, 2383, 2389, 2393, 2399, 2411,
+  2417, 2423, 2437, 2441, 2447, 2459, 2467, 2473,
+  2477, 2503, 2521, 2531, 2539, 2543, 2549, 2551,
+  2557, 2579, 2591, 2593, 2609, 2617, 2621, 2633,
+  2647, 2657, 2659, 2663, 2671, 2677, 2683, 2687,
+  2689, 2693, 2699, 2707, 2711, 2713, 2719, 2729,
+  2731, 2741, 2749, 2753, 2767, 2777, 2789, 2791,
+  2797, 2801, 2803, 2819, 2833, 2837, 2843, 2851,
+  2857, 2861, 2879, 2887, 2897, 2903, 2909, 2917,
+  2927, 2939, 2953, 2957, 2963, 2969, 2971, 2999,
+  3001, 3011, 3019, 3023, 3037, 3041, 3049, 3061,
+  3067, 3079, 3083, 3089, 3109, 3119, 3121, 3137,
+  3163, 3167, 3169, 3181, 3187, 3191, 3203, 3209,
+  3217, 3221, 3229, 3251, 3253, 3257, 3259, 3271,
+  3299, 3301, 3307, 3313, 3319, 3323, 3329, 3331,
+  3343, 3347, 3359, 3361, 3371, 3373, 3389, 3391,
+  3407, 3413, 3433, 3449, 3457, 3461, 3463, 3467,
+  3469, 3491, 3499, 3511, 3517, 3527, 3529, 3533,
+  3539, 3541, 3547, 3557, 3559, 3571, 3581, 3583,
+  3593, 3607, 3613, 3617, 3623, 3631, 3637, 3643,
+  3659, 3671, 3673, 3677, 3691, 3697, 3701, 3709,
+  3719, 3727, 3733, 3739, 3761, 3767, 3769, 3779,
+  3793, 3797, 3803, 3821, 3823, 3833, 3847, 3851,
+  3853, 3863, 3877, 3881, 3889, 3907, 3911, 3917,
+  3919, 3923, 3929, 3931, 3943, 3947, 3967, 3989,
+  4001, 4003, 4007, 4013, 4019, 4021, 4027, 4049,
+  4051, 4057, 4073, 4079, 4091, 4093, 4099, 4111,
+  4127, 4129, 4133, 4139, 4153, 4157, 4159, 4177,
+  4201, 4211, 4217, 4219, 4229, 4231, 4241, 4243,
+  4253, 4259, 4261, 4271, 4273, 4283, 4289, 4297,
+  4327, 4337, 4339, 4349, 4357, 4363, 4373, 4391,
+  4397, 4409, 4421, 4423, 4441, 4447, 4451, 4457,
+  4463, 4481, 4483, 4493, 4507, 4513, 4517, 4519,
+  4523, 4547, 4549, 4561, 4567, 4583, 4591, 4597,
+  4603, 4621, 4637, 4639, 4643, 4649, 4651, 4657,
+  4663, 4673, 4679, 4691, 4703, 4721, 4723, 4729,
+  4733, 4751, 4759, 4783, 4787, 4789, 4793, 4799,
+  4801, 4813, 4817, 4831, 4861, 4871, 4877, 4889,
+  4903, 4909, 4919, 4931, 4933, 4937, 4943, 4951,
+  4957, 4967, 4969, 4973, 4987, 4993, 4999,
+  ])
diff --git a/src/org/gnu/clojure/gnunet/message.clj b/src/org/gnu/clojure/gnunet/message.clj
index 30d6e33..ae54bcb 100644
--- a/src/org/gnu/clojure/gnunet/message.clj
+++ b/src/org/gnu/clojure/gnunet/message.clj
@@ -95,9 +95,9 @@
     (:bytes msg)))
 
 (def parse-message
-  (domonad parser-m [header parse-header
-                     message (items (- (:size header) header-size))]
-    {:message-type (:message-type header)
+  (domonad parser-m [{message-type :message-type size :size} parse-header
+                     message (items (- size header-size))]
+    {:message-type message-type
      :bytes message}))
 
 (defn parse-message-types
@@ -110,4 +110,4 @@
       (let [[{message-type :message-type message :bytes} ss] xs]
         (when (contains? parser-map message-type)
           (when-let [xs ((get parser-map message-type) message)]
-            [[message-type (first xs)] ss]))))))
+            [{:message-type message-type :message (first xs)} ss]))))))