reynir/albatross
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

adapt to x509 0.11.0 API changes

Browse source
This commit is contained in:
Hannes Mehnert 2020-04-21 10:39:30 +02:00
parent b7747a2547
commit 4c9faf4262
3 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
albatross.opam
View file

@ -20,7 +20,7 @@ depends: [
"fmt" "fmt"
"astring" "astring"
"jsonm" "jsonm"
"x509" {>= "0.10.0"} "x509" {>= "0.11.0"}
"tls" {>= "0.11.0"} "tls" {>= "0.11.0"}
"mirage-crypto-pk" "mirage-crypto-pk"
"mirage-crypto-rng" "mirage-crypto-rng"

5
client/albatross_client_bistro.ml
View file

@ -69,7 +69,10 @@ let handle (host, port) cert key ca id (cmd : Vmm_commands.t) =
key_ids extensions Signing_request.((info csr).public_key) (`RSA capub) key_ids extensions Signing_request.((info csr).public_key) (`RSA capub)
in in
let issuer = Certificate.subject cert in let issuer = Certificate.subject cert in
match Signing_request.sign csr ~valid_from ~valid_until ~extensions key issuer with match
Rresult.R.error_to_msg ~pp_error:X509.Validation.pp_signature_error
(Signing_request.sign csr ~valid_from ~valid_until ~extensions key issuer)
with
| Error _ as e -> Lwt.return e | Error _ as e -> Lwt.return e
| Ok mycert -> | Ok mycert ->
let certificates = `Single ([ mycert ; cert ], tmpkey) in let certificates = `Single ([ mycert ; cert ], tmpkey) in

3
provision/albatross_provision.ml
View file

@ -52,7 +52,8 @@ let sign ?dbname ?certname extensions issuer key csr delta =
let capub = `RSA (Mirage_crypto_pk.Rsa.pub_of_priv priv) in let capub = `RSA (Mirage_crypto_pk.Rsa.pub_of_priv priv) in
key_ids extensions X509.Signing_request.((info csr).public_key) capub key_ids extensions X509.Signing_request.((info csr).public_key) capub
in in
X509.Signing_request.sign csr ~valid_from ~valid_until ~extensions key issuer >>= fun cert -> Rresult.R.error_to_msg ~pp_error:X509.Validation.pp_signature_error
(X509.Signing_request.sign csr ~valid_from ~valid_until ~extensions key issuer) >>= fun cert ->
(match dbname with (match dbname with
| None -> Ok () (* no DB! *) | None -> Ok () (* no DB! *)
| Some dbname -> | Some dbname ->