From 178f02300fc9c59fab45d3656ed2b6f081633c4c Mon Sep 17 00:00:00 2001
From: swrup <swrup@protonmail.com>
Date: Sat, 7 Feb 2026 20:29:35 +0100
Subject: [PATCH] b32: add test + rm padding

---
 src/b32.ml   |  4 ----
 test/b32.ml  | 15 +++++++++++++++
 test/dune    |  5 +++++
 test/test.ml | 28 ++++------------------------
 4 files changed, 24 insertions(+), 28 deletions(-)
 create mode 100644 test/b32.ml

diff --git a/src/b32.ml b/src/b32.ml
index 6bd06400..12ef4294 100644
--- a/src/b32.ml
+++ b/src/b32.ml
@@ -29,10 +29,6 @@ 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
diff --git a/test/b32.ml b/test/b32.ml
new file mode 100644
index 00000000..c6986084
--- /dev/null
+++ b/test/b32.ml
@@ -0,0 +1,15 @@
+let () =
+  let id s = s |> B32.encode |> B32.decode |> Result.get_ok in
+  let f s =
+    let s' = id s in
+    match s' = s with
+    | false ->
+        Fmt.failwith "b32 round trip failure: @\nin :`%S`@\nout:`%S`" s' s
+    | true -> ()
+  in
+  let s = String.init 0xff Char.chr in
+  let s_l = List.init 0x0f (fun i -> String.init i Char.chr) in
+  f s;
+  List.iter f s_l;
+
+  ()
diff --git a/test/dune b/test/dune
index 1eefa8ef..bec41ef4 100644
--- a/test/dune
+++ b/test/dune
@@ -3,6 +3,11 @@
  (modules test)
  (libraries mte fmt))
 
+(test
+ (name b32)
+ (modules b32)
+ (libraries b32 fmt))
+
 ; TODO
 ; cram test?
 ; gcc -o a.out ./test/signatures.c && ./a.out > a.output
diff --git a/test/test.ml b/test/test.ml
index 079280c9..aa577b06 100644
--- a/test/test.ml
+++ b/test/test.ml
@@ -1,17 +1,16 @@
 let () = Mirage_crypto_rng_unix.use_default ()
-let get_ok = function Error e -> failwith e | Ok v -> v
 
 let () =
   let priv = Mirage_crypto_pk.Rsa.generate ~bits:2048 () in
   let pub = Mirage_crypto_pk.Rsa.pub_of_priv priv in
   let () =
     let open Crypto.RsaPrivateKey in
-    let priv' = priv |> to_octets |> of_octets |> get_ok in
+    let priv' = priv |> to_octets |> of_octets |> Result.get_ok in
     assert (to_octets priv = to_octets priv')
   in
   let () =
     let open Crypto.RsaPublicKey in
-    let pub' = pub |> to_octets |> of_octets |> get_ok in
+    let pub' = pub |> to_octets |> of_octets |> Result.get_ok in
     assert (to_octets pub = to_octets pub')
   in
   ()
@@ -19,8 +18,8 @@ let () =
 let () =
   let open Api in
   let check jsont s =
-    let encode v = encode jsont v |> get_ok in
-    let decode v = decode jsont v |> get_ok in
+    let encode v = encode jsont v |> Result.get_ok in
+    let decode v = decode jsont v |> Result.get_ok in
     let ts = decode s in
     let s' = encode ts in
     let ts' = decode s' in
@@ -107,22 +106,3 @@ let () =
   *)
   ()
   *)
-
-let () =
-  let v =
-    "04000274VF2F65WWABKGZYHREQWAFTVPMWEK9EQYMCPP1E6CMC224XDDDBVM7NRMNDX3TETHTK5G7GPPPYGN08FEMSY6B7NGBE8AYMG5HWT2BXRSAHAWDWW5Y16YVGXJG0BCKW3X17EWEF8MNGFGJBKVWQV5WPT0R2QK82QXFHFVGP3HR1D8HF69JXBC22B62M4SFETRJNXRG2GXX03BETSNQW0X7BYTMFJX5JQH4B2KJMABB02RFSNNMND7CT7MSAX5SCZY5ZB9XS4ZDKA9AVTS11V790KXXBSFZSD3NNEHKB6RS99RJD3MDJE04G1Q83HR50N5NVBDW3HPJZKQS5SSG7R2R2F7K8P06HJ4YSQFF52GF3RZW22N4FRQ28KQ2JZMZ1GJS1KBNHNNMS1RW9DZQ3882Z5V0000000004002"
-  in
-  let decode s = B32.decode s |> get_ok in
-  let v' = B32.encode (decode v) in
-  let v'' = B32.encode (decode v') in
-  (*
-  Fmt.pr "v  : %s@." v;
-  Fmt.pr "v' : %s@." v';
-  Fmt.pr "v'': %s@." v'';
-  Fmt.pr "len v  : %d@." (String.length v);
-  Fmt.pr "len v' : %d@." (String.length v');
-  Fmt.pr "len v'': %d@." (String.length v'');
-  *)
-  assert (v = v');
-  assert (v' = v'');
-  ()