reynir/ocaml-passwordsafe
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Aliasing (^) is unnecessary.

Browse source
This commit is contained in:
Reynir Björnsson 2018-09-07 11:59:19 +02:00
parent 544969ce97
commit cc12de37f7
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
twofish/primitives.ml
View file

@ -25,9 +25,6 @@ open Bin
let ( << ) x y = left32 x y ;; let ( << ) x y = left32 x y ;;
let ( >> ) x y = right32 x y ;; let ( >> ) x y = right32 x y ;;
(* ^ is more useful as a 32-bit XOR than it is as a string-concat *)
let ( ^^ ) = ( ^ ) ;;
type ctx = { type ctx = {
k : Int32.t array; k : Int32.t array;
s : Int32.t array array; (* s-boxes *) s : Int32.t array array; (* s-boxes *)
@ -273,8 +270,8 @@ let ord32 c = Int32.of_int (ord c)
let unpack_longs s n = let unpack_longs s n =
let slen = String.length s in let slen = String.length s in
if (slen/4) < n then if (slen/4) < n then
failwith ("unpack_longs: asked to unpack "^^(string_of_int n)^^" longs from failwith ("unpack_longs: asked to unpack "^(string_of_int n)^" longs from
string length "^^(string_of_int slen)) string length "^(string_of_int slen))
else else
let rec unpack_long i accum = let rec unpack_long i accum =
if i == n then if i == n then
@ -357,7 +354,7 @@ let mds_rem a b =
let init key = let init key =
let keylength = String.length key in let keylength = String.length key in
if keylength != 32 then if keylength != 32 then
failwith ("init: key length must be 32, got key length "^^string_of_int (keylength)) failwith ("init: key length must be 32, got key length "^string_of_int (keylength))
else else
let le_longs = unpack_longs key 8 in let le_longs = unpack_longs key 8 in