swrup/mte
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

hash: use of_raw_string_opt

Browse source
This commit is contained in:
swrup 2026-02-10 16:47:08 +01:00
parent 3d7553c690
commit 95ba5d223c
5 changed files with 43 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/b32.ml
View file

@ -29,6 +29,10 @@ let decode s =
| c -> c)
s
in
(* restore padding for base32 lib *)
let n = 8 - (String.length s mod 8) in
let pad = String.make n '=' in
let s = s ^ pad in
match Base32.decode ~alphabet ~off:0 ~len:(String.length s) s with
| Error (`Msg e) -> Error e
| Ok v -> Ok v

20
src/hash.ml
View file

@ -1,3 +1,4 @@
(* TODO use SHA512.of_raw_string_opt *)
open Digestif
module type S = sig
@ -18,9 +19,9 @@ module H32 = struct
let hash s = SHA256.(digest_string s)
let of_octets s =
match String.length s = 32 with
| false -> Fmt.failwith "Hash.of_octets failure: data is not 32 bytes"
| true -> SHA256.of_raw_string s
match SHA256.of_raw_string_opt s with
| None -> Fmt.failwith "H32.of_octets failure: data is not 32 bytes"
| Some t -> t
let to_octets = SHA256.to_raw_string
let of_b32 s = Result.map of_octets (B32.decode s)
@ -48,16 +49,11 @@ module H64 = struct
let hash s = SHA512.(digest_string s)
let of_octets s =
match String.length s = 64 with
| false -> Fmt.failwith "Hash.of_octets failure: data is not 64 bytes"
| true -> SHA512.of_raw_string s
let to_octets v =
let s = SHA512.to_raw_string v in
match String.length s = 64 with
| false -> Fmt.failwith "Hash.to_octets failure: data is not 64 bytes"
| true -> s
match SHA512.of_raw_string_opt s with
| None -> Fmt.failwith "H64.of_octets failure: data is not 64 bytes"
| Some t -> t
let to_octets = SHA512.to_raw_string
let of_b32 s = Result.map of_octets (B32.decode s)
let bin =