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

compatibility with x509 0.9.0

This commit is contained in:
Hannes Mehnert 2020-02-16 16:33:19 +01:00
parent 56aa5545f8
commit ff59f05660
3 changed files with 30 additions and 30 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.8.0"} "x509" {>= "0.9.0"}
"tls" {>= "0.9.0"} "tls" {>= "0.9.0"}
"nocrypto" "nocrypto"
"asn1-combinators" {>= "0.2.0"} "asn1-combinators" {>= "0.2.0"}

6
client/albatross_client_bistro.ml
View File

@ -63,15 +63,15 @@ let handle (host, port) cert key ca id (cmd : Vmm_commands.t) =
let extensions = Signing_request.Ext.(singleton Extensions extensions) in let extensions = Signing_request.Ext.(singleton Extensions extensions) in
Signing_request.create name ~extensions (`RSA tmpkey) Signing_request.create name ~extensions (`RSA tmpkey)
in in
let mycert =
let valid_from, valid_until = timestamps 300 in let valid_from, valid_until = timestamps 300 in
let extensions = let extensions =
let capub = match key with `RSA key -> Nocrypto.Rsa.pub_of_priv key in let capub = match key with `RSA key -> Nocrypto.Rsa.pub_of_priv key in
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
Signing_request.sign csr ~valid_from ~valid_until ~extensions key issuer match Signing_request.sign csr ~valid_from ~valid_until ~extensions key issuer with
in | Error _ as e -> Lwt.return e
| Ok mycert ->
let certificates = `Single ([ mycert ; cert ], tmpkey) in let certificates = `Single ([ mycert ; cert ], tmpkey) in
X509_lwt.authenticator (`Ca_file ca) >>= fun authenticator -> X509_lwt.authenticator (`Ca_file ca) >>= fun authenticator ->
Lwt_unix.gethostbyname host >>= fun host_entry -> Lwt_unix.gethostbyname host >>= fun host_entry ->

2
provision/albatross_provision.ml
View File

@ -52,7 +52,7 @@ let sign ?dbname ?certname extensions issuer key csr delta =
let capub = `RSA (Nocrypto.Rsa.pub_of_priv priv) in let capub = `RSA (Nocrypto.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
let cert = X509.Signing_request.sign csr ~valid_from ~valid_until ~extensions key issuer in 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 ->