add kdf; wip FDH-RSA

This commit is contained in:
swrup 2026-02-13 09:34:03 +01:00
parent 6670b763f3
commit 03fef73233
6 changed files with 79 additions and 0 deletions

View file

@ -35,6 +35,7 @@
bin bin
angstrom angstrom
mirage-crypto mirage-crypto
kdf
digestif digestif
duration duration
jsont jsont

View file

@ -22,6 +22,7 @@ depends: [
"bin" "bin"
"angstrom" "angstrom"
"mirage-crypto" "mirage-crypto"
"kdf"
"digestif" "digestif"
"duration" "duration"
"jsont" "jsont"

View file

@ -17,6 +17,7 @@
caqti-driver-pgx caqti-driver-pgx
bin bin
mirage-crypto mirage-crypto
kdf.hkdf
digestif digestif
duration duration
vif vif

55
src/fdh.ml Normal file
View file

@ -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
*)

0
src/rsa.ml Normal file
View file

View file

@ -73,3 +73,24 @@ let () =
in in
() ()
let () =
(* kdf *)
let salt = "94KPT83PCNS7J83KC5P78Y8" in
let ikm = "94KPT83MD1JJ0WV5CDS6AX10D5Q70XBM41NPAY90DNGQ8SBJD5GPR" in
let ctx =
"94KPT83141HPYVKMCNW78833D1TPWTSC41GPRWVF41NPWVVQDRG62WS04XMPWSKF4WG6JVH0EHM6A82J8S1G"
in
let out_len = 64 in
let out =
"GTMR4QT05Z9WF5HKVG0WK9RPXGHSMHJNW377G9GJXCA8B0FEKPF4D27RJMSJZYWSQNTBJ5EYVV7ZW18B48Z0JVJJ80RHB706Y96Q358"
in
let xts = salt |> decode in
let ikm = ikm |> decode in
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);
()