.

src/b32.ml

@@ -23,4 +23,6 @@ let decode s =
         | c -> c)
       s
   in
-  Base32.decode ~alphabet ~off:0 ~len:(String.length s) s
+  match Base32.decode ~alphabet ~off:0 ~len:(String.length s) s with
+  | Error (`Msg e) -> Error e
+  | Ok v -> Ok v

src/crypto.ml

@@ -10,15 +10,15 @@ module EddsaPublicKey = struct
   type t = pub
 
   let to_octets t = pub_to_octets t
-  let of_octets t = pub_of_octets t
+
+  let of_octets t =
+    pub_of_octets t |> function
+    | Error e -> Fmt.error "%a" Mirage_crypto_ec.pp_error e
+    | Ok v -> Ok v
 
   let bin =
     let of_octets o =
-      match of_octets o with
+      match of_octets o with Error e -> raise (Util.Bin_error e) | Ok v -> v
-      | Error e ->
-          let e = Fmt.str "%a" Mirage_crypto_ec.pp_error e in
-          raise (Util.Bin_error e)
-      | Ok v -> v
     in
     Bin.map (Bin.bytes 32) of_octets to_octets
 

src/pg.ml

@@ -38,7 +38,7 @@ module Caqti_type = struct
     let open EddsaPublicKey in
     custom
       ~encode:(fun v -> Ok (to_octets v))
-      ~decode:(fun v -> Ok (of_octets v))
+      ~decode:(fun v -> of_octets v)
       octets
 
   let eddsa_signature : EddsaSignature.t t =

src/util.ml

@@ -54,7 +54,7 @@ module Bin_rsa = struct
       Bytes.unsafe_to_string b
 
     let check = function
-      | false -> Error (`Msg "rsa of_octets error, invalid data")
+      | false -> Error "rsa of_octets error, invalid data"
       | true -> Ok ()
 
     let z_array_of_octets ~nb s =
@@ -90,7 +90,7 @@ module Bin_rsa = struct
     let* arr = z_array_of_octets ~nb:2 s in
     match arr with
     | [| n; e |] ->
-        let+ pub = Mirage_crypto_pk.Rsa.pub ~n ~e in
+        let+ pub = Mirage_crypto_pk.Rsa.pub ~n ~e |> unwrap_err_msg in
         pub
     | _ -> assert false
 
@@ -102,7 +102,9 @@ module Bin_rsa = struct
     let* arr = z_array_of_octets ~nb:8 s in
     match arr with
     | [| e; d; n; p; q; dp; dq; q' |] ->
-        let+ priv = Mirage_crypto_pk.Rsa.priv ~e ~d ~n ~p ~q ~dp ~dq ~q' in
+        let+ priv =
+          Mirage_crypto_pk.Rsa.priv ~e ~d ~n ~p ~q ~dp ~dq ~q' |> unwrap_err_msg
+        in
         priv
     | _ -> assert false
 end