JJ: Description from the destination commit:

different verify for master sigs

JJ: Description from source commit:
.
This commit is contained in:
swrup 2026-02-21 21:32:18 +01:00
parent 37ed47326a
commit 1d0d36c2b9
5 changed files with 108 additions and 138 deletions

View file

@ -3,29 +3,13 @@ open Api
open Hash
module Keys_get = struct
let mk_future_keys_response (module Keys : Keys.S) =
let* future_signkeys = Keys.future_signkeys () in
let* future_denoms = Keys.future_denominations () in
let master_pub = Keys.master_pub in
let denom_secmod_public_key = Keys.secmod_rsa_pub in
let signkey_secmod_public_key = Keys.secmod_eddsa_pub in
Ok
FutureKeysResponse.
{
future_denoms;
future_signkeys;
master_pub;
denom_secmod_public_key;
signkey_secmod_public_key;
}
let jsont = FutureKeysResponse.jsont
let f req server _env =
Logs.info (fun m -> m "GET /management/keys/");
let keys = Vif.Server.device Devices.keys server in
let (module Keys : Keys.S) = Vif.Server.device Devices.keys server in
let res =
let* v = mk_future_keys_response keys in
let* v = Keys.make_future_keys_response () in
let s = Api.encode_exn jsont v in
Ok s
in
@ -36,9 +20,9 @@ module Keys_post = struct
let verify_dn (module Keys : Keys.S) fdn denom_hash master_sig =
let open FutureDenom in
let open Signatures.DenominationKeyValidity in
let r : r =
let r =
{
master= Config.master_public_key;
R.master= Config.master_public_key;
start= fdn.stamp_start;
expire_withdraw= fdn.stamp_expire_withdraw;
expire_spend= fdn.stamp_expire_deposit;
@ -51,7 +35,7 @@ module Keys_post = struct
denom_hash;
}
in
verify Keys.master_pub master_sig r
verify master_sig r
let verify_denom_sigs (module Keys : Keys.S) denom_sigs =
let* fdn_l = Keys.future_denominations () in
@ -78,15 +62,15 @@ module Keys_post = struct
{ key; stamp_start; stamp_expire; stamp_end; signkey_secmod_sig= _ }
master_sig =
let open Signatures.ExchangeSigningKeyValidity in
let r : r =
let r =
{
start= stamp_start;
R.start= stamp_start;
expire= stamp_expire;
end_= stamp_end;
signkey_pub= key;
}
in
verify Keys.master_pub master_sig r
verify master_sig r
let verify_signkey_sigs (module Keys : Keys.S) signkey_sigs =
let* fsk_l = Keys.future_signkeys () in
@ -137,7 +121,7 @@ module Denom_revoke = struct
let verify (module Keys : Keys.S) h_denom_pub
DenomRevocationSignature.{ master_sig } =
let open Signatures.MasterDenominationKeyRevocation in
verify Keys.master_pub master_sig { h_denom_pub }
verify master_sig { h_denom_pub }
let do_ (module Keys : Keys.S) h_denom_pub
DenomRevocationSignature.{ master_sig } =
@ -163,7 +147,7 @@ module Signkey_revoke = struct
let verify (module Keys : Keys.S) exchange_pub
SignkeyRevocationSignature.{ master_sig } =
let open Signatures.MasterSigningKeyRevocation in
verify Keys.master_pub master_sig { exchange_pub }
verify master_sig { exchange_pub }
let do_ (module Keys : Keys.S) exchange_pub
SignkeyRevocationSignature.{ master_sig } =
@ -196,7 +180,7 @@ module Auditors = struct
validity_start;
} =
let open Signatures.MasterAddAuditor in
verify Keys.master_pub master_sig
verify master_sig
{
start_date= validity_start;
auditor_pub;
@ -243,7 +227,7 @@ module Auditors_disable = struct
let verify (module Keys : Keys.S) auditor_pub
AuditorTeardownMessage.{ master_sig; validity_end } =
let open Signatures.MasterDelAuditor in
verify Keys.master_pub master_sig { end_date= validity_end; auditor_pub }
verify master_sig { end_date= validity_end; auditor_pub }
let do_ ~db_conn auditor_pub
AuditorTeardownMessage.{ master_sig= _; validity_end } =
@ -291,7 +275,7 @@ module Wire_fee = struct
wire_fee;
} =
let open Signatures.MasterWireFee in
verify Keys.master_pub master_sig_wire
verify master_sig_wire
{
h_wire_method= Hash.Cstring.H64.hash wire_method;
start_date= fee_start;
@ -353,7 +337,7 @@ module Global_fees = struct
master_sig;
} =
let open Signatures.GlobalFees in
verify Keys.master_pub master_sig
verify master_sig
{
start_date;
end_date;
@ -426,7 +410,7 @@ module Wire = struct
let debit_restrictions = "" in
let* () =
let open Signatures.MasterWireDetails in
verify Keys.master_pub master_sig_wire
verify master_sig_wire
{
h_wire_details= FullPaytoHash.hash payto_uri;
h_conversion_url= Hash.Cstring.H64.hash conversion_url;
@ -436,7 +420,7 @@ module Wire = struct
in
let* () =
let open Signatures.MasterAddWire in
verify Keys.master_pub master_sig_add
verify master_sig_add
{
start_date= validity_start;
h_wire= FullPaytoHash.hash payto_uri;
@ -492,7 +476,7 @@ module Wire_disable = struct
let verify (module Keys : Keys.S)
WireTeardownMessage.{ payto_uri; master_sig_del; validity_end } =
let open Signatures.MasterDelWire in
verify Keys.master_pub master_sig_del
verify master_sig_del
{ end_date= validity_end; h_wire= FullPaytoHash.hash payto_uri }
let do_ ~db_conn
@ -535,7 +519,7 @@ module Drain = struct
amount;
} =
let open Signatures.MasterDrainProfit in
verify Keys.master_pub master_sig
verify master_sig
{
wtid;
date;
@ -576,7 +560,7 @@ module AmlOfficer = struct
} =
let open Signatures.MasterAmlOfficerStatus in
let is_active = match is_active with true -> 1_l | false -> 0_l in
verify Keys.master_pub master_sig
verify master_sig
{
change_date;
officer_pub;
@ -616,7 +600,7 @@ module Partners = struct
wad_fee;
} =
let open Signatures.PartnerConfiguration in
verify Keys.master_pub master_sig
verify master_sig
{
partner_pub;
start_date;