Skip to content

Commit 28805b7

Browse files
committed
mirage-crypto-ec: remove superfluous check, further bytes_buf -> octets renaming
1 parent e7cd517 commit 28805b7

File tree

1 file changed

+16
-19
lines changed

1 file changed

+16
-19
lines changed

ec/mirage_crypto_ec.ml

+16-19
Original file line numberDiff line numberDiff line change
@@ -112,12 +112,12 @@ module type Foreign = sig
112112
val sub : out_field_element -> field_element -> field_element -> unit
113113
val add : out_field_element -> field_element -> field_element -> unit
114114
val to_montgomery : out_field_element -> field_element -> unit
115-
val from_bytes_buf : out_field_element -> string -> unit
115+
val from_octets : out_field_element -> string -> unit
116116
val set_one : out_field_element -> unit
117117
val nz : field_element -> bool
118118
val sqr : out_field_element -> field_element -> unit
119119
val from_montgomery : out_field_element -> field_element -> unit
120-
val to_bytes_buf : bytes -> field_element -> unit
120+
val to_octets : bytes -> field_element -> unit
121121
val inv : out_field_element -> field_element -> unit
122122
val select_c : out_field_element -> bool -> field_element -> field_element -> unit
123123

@@ -195,21 +195,18 @@ module Make_field_element (P : Parameters) (F : Foreign) : Field_element = struc
195195
b_uts tmp
196196

197197
let from_be_octets buf =
198-
if String.length buf = P.byte_length then
199-
let buf_rev = rev_string buf in
200-
let tmp = create () in
201-
F.from_bytes_buf tmp buf_rev;
202-
F.to_montgomery tmp (b_uts tmp);
203-
b_uts tmp
204-
else
205-
invalid_arg "buffer not of required byte length"
198+
let buf_rev = rev_string buf in
199+
let tmp = create () in
200+
F.from_octets tmp buf_rev;
201+
F.to_montgomery tmp (b_uts tmp);
202+
b_uts tmp
206203

207204
let create_p () =
208205
Bytes.make P.byte_length '\000'
209206

210207
let to_octets fe =
211208
let tmp = create_p () in
212-
F.to_bytes_buf tmp fe;
209+
F.to_octets tmp fe;
213210
b_uts tmp
214211

215212
let out_point () = {
@@ -812,12 +809,12 @@ module P224 : Dh_dsa = struct
812809
external sub : out_field_element -> field_element -> field_element -> unit = "mc_p224_sub" [@@noalloc]
813810
external add : out_field_element -> field_element -> field_element -> unit = "mc_p224_add" [@@noalloc]
814811
external to_montgomery : out_field_element -> field_element -> unit = "mc_p224_to_montgomery" [@@noalloc]
815-
external from_bytes_buf : out_field_element -> string -> unit = "mc_p224_from_bytes" [@@noalloc]
812+
external from_octets : out_field_element -> string -> unit = "mc_p224_from_bytes" [@@noalloc]
816813
external set_one : out_field_element -> unit = "mc_p224_set_one" [@@noalloc]
817814
external nz : field_element -> bool = "mc_p224_nz" [@@noalloc]
818815
external sqr : out_field_element -> field_element -> unit = "mc_p224_sqr" [@@noalloc]
819816
external from_montgomery : out_field_element -> field_element -> unit = "mc_p224_from_montgomery" [@@noalloc]
820-
external to_bytes_buf : bytes -> field_element -> unit = "mc_p224_to_bytes" [@@noalloc]
817+
external to_octets : bytes -> field_element -> unit = "mc_p224_to_bytes" [@@noalloc]
821818
external inv : out_field_element -> field_element -> unit = "mc_p224_inv" [@@noalloc]
822819
external select_c : out_field_element -> bool -> field_element -> field_element -> unit = "mc_p224_select" [@@noalloc]
823820

@@ -862,12 +859,12 @@ module P256 : Dh_dsa = struct
862859
external sub : out_field_element -> field_element -> field_element -> unit = "mc_p256_sub" [@@noalloc]
863860
external add : out_field_element -> field_element -> field_element -> unit = "mc_p256_add" [@@noalloc]
864861
external to_montgomery : out_field_element -> field_element -> unit = "mc_p256_to_montgomery" [@@noalloc]
865-
external from_bytes_buf : out_field_element -> string -> unit = "mc_p256_from_bytes" [@@noalloc]
862+
external from_octets : out_field_element -> string -> unit = "mc_p256_from_bytes" [@@noalloc]
866863
external set_one : out_field_element -> unit = "mc_p256_set_one" [@@noalloc]
867864
external nz : field_element -> bool = "mc_p256_nz" [@@noalloc]
868865
external sqr : out_field_element -> field_element -> unit = "mc_p256_sqr" [@@noalloc]
869866
external from_montgomery : out_field_element -> field_element -> unit = "mc_p256_from_montgomery" [@@noalloc]
870-
external to_bytes_buf : bytes -> field_element -> unit = "mc_p256_to_bytes" [@@noalloc]
867+
external to_octets : bytes -> field_element -> unit = "mc_p256_to_bytes" [@@noalloc]
871868
external inv : out_field_element -> field_element -> unit = "mc_p256_inv" [@@noalloc]
872869
external select_c : out_field_element -> bool -> field_element -> field_element -> unit = "mc_p256_select" [@@noalloc]
873870

@@ -913,12 +910,12 @@ module P384 : Dh_dsa = struct
913910
external sub : out_field_element -> field_element -> field_element -> unit = "mc_p384_sub" [@@noalloc]
914911
external add : out_field_element -> field_element -> field_element -> unit = "mc_p384_add" [@@noalloc]
915912
external to_montgomery : out_field_element -> field_element -> unit = "mc_p384_to_montgomery" [@@noalloc]
916-
external from_bytes_buf : out_field_element -> string -> unit = "mc_p384_from_bytes" [@@noalloc]
913+
external from_octets : out_field_element -> string -> unit = "mc_p384_from_bytes" [@@noalloc]
917914
external set_one : out_field_element -> unit = "mc_p384_set_one" [@@noalloc]
918915
external nz : field_element -> bool = "mc_p384_nz" [@@noalloc]
919916
external sqr : out_field_element -> field_element -> unit = "mc_p384_sqr" [@@noalloc]
920917
external from_montgomery : out_field_element -> field_element -> unit = "mc_p384_from_montgomery" [@@noalloc]
921-
external to_bytes_buf : bytes -> field_element -> unit = "mc_p384_to_bytes" [@@noalloc]
918+
external to_octets : bytes -> field_element -> unit = "mc_p384_to_bytes" [@@noalloc]
922919
external inv : out_field_element -> field_element -> unit = "mc_p384_inv" [@@noalloc]
923920
external select_c : out_field_element -> bool -> field_element -> field_element -> unit = "mc_p384_select" [@@noalloc]
924921

@@ -965,12 +962,12 @@ module P521 : Dh_dsa = struct
965962
external sub : out_field_element -> field_element -> field_element -> unit = "mc_p521_sub" [@@noalloc]
966963
external add : out_field_element -> field_element -> field_element -> unit = "mc_p521_add" [@@noalloc]
967964
external to_montgomery : out_field_element -> field_element -> unit = "mc_p521_to_montgomery" [@@noalloc]
968-
external from_bytes_buf : out_field_element -> string -> unit = "mc_p521_from_bytes" [@@noalloc]
965+
external from_octets : out_field_element -> string -> unit = "mc_p521_from_bytes" [@@noalloc]
969966
external set_one : out_field_element -> unit = "mc_p521_set_one" [@@noalloc]
970967
external nz : field_element -> bool = "mc_p521_nz" [@@noalloc]
971968
external sqr : out_field_element -> field_element -> unit = "mc_p521_sqr" [@@noalloc]
972969
external from_montgomery : out_field_element -> field_element -> unit = "mc_p521_from_montgomery" [@@noalloc]
973-
external to_bytes_buf : bytes -> field_element -> unit = "mc_p521_to_bytes" [@@noalloc]
970+
external to_octets : bytes -> field_element -> unit = "mc_p521_to_bytes" [@@noalloc]
974971
external inv : out_field_element -> field_element -> unit = "mc_p521_inv" [@@noalloc]
975972
external select_c : out_field_element -> bool -> field_element -> field_element -> unit = "mc_p521_select" [@@noalloc]
976973

0 commit comments

Comments
 (0)