diff options
| author | David Barksdale <amatus.amongus@gmail.com> | 2010-09-26 13:35:55 -0500 |
|---|---|---|
| committer | David Barksdale <amatus.amongus@gmail.com> | 2010-09-26 13:35:55 -0500 |
| commit | ed0d80ab6cbba5b4fed1df409ef355ffa1e3dfce (patch) | |
| tree | 524b693bda7be989e48741db915279a1d2da7df2 /src | |
| parent | 1e3a4481f9e47d3d4534bc58f4144fdad11f51af (diff) | |
Making the code a bit more readable/consistant.
Diffstat (limited to 'src')
| -rw-r--r-- | src/org/gnu/clojure/gnunet/crypto.clj | 7 | ||||
| -rw-r--r-- | src/org/gnu/clojure/gnunet/message.clj | 3 | ||||
| -rw-r--r-- | src/org/gnu/clojure/gnunet/parser.clj | 2 |
3 files changed, 5 insertions, 7 deletions
diff --git a/src/org/gnu/clojure/gnunet/crypto.clj b/src/org/gnu/clojure/gnunet/crypto.clj index cb0dc7d..4d4e92f 100644 --- a/src/org/gnu/clojure/gnunet/crypto.clj +++ b/src/org/gnu/clojure/gnunet/crypto.clj @@ -55,10 +55,9 @@ e (parse-uint (- len sizen 4)) :when (try (do (make-rsa-public-key n e) true) - (catch Exception e false) - ) + (catch Exception e false)) padding parse-uint16 - :when (== padding 0)] + :when (== 0 padding)] (make-rsa-public-key n e))) (defn @@ -82,7 +81,7 @@ (defn fermat-compositeness-test "Perform Fermat's Compositeness Test on the given bigint." [number] - (not (== (.modPow (bigint 2) (dec number) number) 1))) + (not (== 1 (.modPow (bigint 2) (dec number) number)))) (defn miller-rabin-compositeness-test "Perform the Miller-Rabin Compositeness Test on the given bigint with the diff --git a/src/org/gnu/clojure/gnunet/message.clj b/src/org/gnu/clojure/gnunet/message.clj index 3d94cb7..96c54b8 100644 --- a/src/org/gnu/clojure/gnunet/message.clj +++ b/src/org/gnu/clojure/gnunet/message.clj @@ -62,8 +62,7 @@ (def parse-utf8 (domonad parser-m [xs (none-or-more (is #(not (== 0 %)))) - zero item - :when (== zero 0)] + zero item] (String. (byte-array xs) "UTF-8"))) (defn encode-date diff --git a/src/org/gnu/clojure/gnunet/parser.clj b/src/org/gnu/clojure/gnunet/parser.clj index 99adc5d..d131af9 100644 --- a/src/org/gnu/clojure/gnunet/parser.clj +++ b/src/org/gnu/clojure/gnunet/parser.clj @@ -63,7 +63,7 @@ [mv n] (fn [s] (when-let [xs ((parser-m-until - #(>= (first %) n) + #(<= n (first %)) #(fn [s] (when-let [xs (mv s)] [[(inc (first %)) (conj (second %) (first xs))] |