From 6a526e09b914f726251cd1f66f60276b0a833d9a Mon Sep 17 00:00:00 2001
From: swrup <swrup@protonmail.com>
Date: Fri, 13 Feb 2026 10:58:30 +0100
Subject: [PATCH] .

---
 src/crypto.ml  | 10 ---------
 src/fdh.ml     | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++
 test/crypto.ml | 10 ++++-----
 3 files changed, 60 insertions(+), 15 deletions(-)
 create mode 100644 src/fdh.ml

diff --git a/src/crypto.ml b/src/crypto.ml
index bc93fc6b..92d1dadb 100644
--- a/src/crypto.ml
+++ b/src/crypto.ml
@@ -232,16 +232,6 @@ module RsaPublicKey = struct
       Caqti_type.octets
 end
 
-module Kdf = struct
-  module XTR = Hkdf.Make (Digestif.SHA512)
-  module PRF = Hkdf.Make (Digestif.SHA256)
-
-  let kdf ~salt ~ikm ~info ~len =
-    let prk = XTR.extract ~salt ikm in
-    let okm = PRF.expand ~prk ~info len in
-    okm
-end
-
 module RsaPrivateKey = struct
   open Mirage_crypto_pk.Rsa
 
diff --git a/src/fdh.ml b/src/fdh.ml
new file mode 100644
index 00000000..31f4c893
--- /dev/null
+++ b/src/fdh.ml
@@ -0,0 +1,55 @@
+module Kdf = struct
+  module XTR = Hkdf.Make (Digestif.SHA512)
+  module PRF = Hkdf.Make (Digestif.SHA256)
+
+  let kdf ~xts ~ikm ~ctx ~len =
+    let prk = XTR.extract ~salt:xts ikm in
+    let okm = PRF.expand ~prk ~info:ctx len in
+    okm
+end
+
+(* WIP
+let kdf_mod_n ~n ~xts ~ikm ~ctx =
+  let nbits = Z.numbits n in
+  let rec go ctr =
+    let len = ((nbits - 1) / 8) + 1 in
+    let ctr_be =
+      let b = Bytes.create 2 in
+      Bytes.set_uint16_be b 0 ctr;
+      Bytes.unsafe_to_string b
+    in
+    let ctx = String.cat ctx ctr_be in
+    let okm = Kdf.kdf ~xts ~ikm ~ctx ~len in
+    let r = Z.of_bits okm in
+    (* we do that because n is odd?
+       TODO
+       gcry_mpi_clear_highbit .. *)
+    if Z.gt r n then go (succ ctr) else r
+  in
+  go 0
+
+let rsa_full_domain_hash pub msg =
+  let xts = RsaPublicKey.to_octets pub in
+  let ctx = "RSA-FDA FTpsW!" in
+  let r = kdf_mod_n ~n:pub.n ~xts ~ikm:msg ~ctx in
+  r
+
+let rsa_sign_fdh priv msg =
+  let pub = Mirage_crypto_pk.Rsa.pub_of_priv priv in
+  let v = rsa_full_domain_hash pub msg in
+  let v = Z.to_bits v in
+  Mirage_crypto_pk.Rsa.PKCS1.sig_encode ~crt_hardening:true ~key:priv v
+
+let rsa_blinding_key_derive (pub : RsaPublicKey.t) bks =
+  let xts = "Blinding KDF extractor HMAC key" in
+  let ctx = "Blinding KDF" in
+  let r = kdf_mod_n ~n:pub.n ~xts ~ikm:bks ~ctx in
+  r
+
+let rsa_blind pub ~bks ~msg =
+  let data = rsa_full_domain_hash pub msg in
+  let bkey = rsa_blinding_key_derive pub bks in
+  let r_e = Z.powm bkey pub.e pub.n in
+  let data_r_e = Z.rem (Z.mul data r_e) pub.n in
+  Z.to_bits data_r_e
+  *)
diff --git a/test/crypto.ml b/test/crypto.ml
index 2fb77832..0d09e8a8 100644
--- a/test/crypto.ml
+++ b/test/crypto.ml
@@ -86,11 +86,11 @@ let () =
     "GTMR4QT05Z9WF5HKVG0WK9RPXGHSMHJNW377G9GJXCA8B0FEKPF4D27RJMSJZYWSQNTBJ5EYVV7ZW18B48Z0JVJJ80RHB706Y96Q358"
   in
 
-  let salt = salt |> decode in
+  let xts = salt |> decode in
   let ikm = ikm |> decode in
-  let info = ctx |> decode in
-  let km = Crypto.Kdf.kdf ~salt ~ikm ~info ~len:out_len in
-  let km = km |> encode in
-  assert (km = out);
+  let ctx = ctx |> decode in
+  let okm = Fdh.Kdf.kdf ~xts ~ikm ~ctx ~len:out_len in
+  let okm = okm |> encode in
+  assert (okm = out);
 
   ()