Merge pull request #154 from roburio/tls016

update to tls 0.16

albatross.opam

@@ -21,9 +21,10 @@ depends: [
   "cmdliner" {>= "1.1.0"}
   "fmt" {>= "0.8.7"}
   "x509" {>= "0.13.0"}
-  "tls" {>= "0.13.1"}
+  "tls" {>= "0.16.0"}
+  "tls-lwt" {>= "0.16.0"}
   "mirage-crypto"
-  "mirage-crypto-rng" {>= "0.8.0"}
+  "mirage-crypto-rng" {>= "0.11.0"}
   "asn1-combinators" {>= "0.2.0"}
   "duration"
   "decompress" {>= "1.3.0"}

provision/albatross_provision_ca.ml

@@ -67,7 +67,7 @@ let sign_csr dbname cacert key csr days =
   sign ~dbname extensions issuer key csr (Duration.of_day days)
 
 let sign_main _ db cacert cakey csrname days =
-  Mirage_crypto_rng_unix.initialize () ;
+  Mirage_crypto_rng_unix.initialize (module Mirage_crypto_rng.Fortuna) ;
   let* cacert = Bos.OS.File.read (Fpath.v cacert) in
   let* cacert = Certificate.decode_pem (Cstruct.of_string cacert) in
   let* pk = Bos.OS.File.read (Fpath.v cakey) in
@@ -82,7 +82,7 @@ let help _ man_format cmds = function
   | Some _ -> List.iter print_endline cmds; `Ok ()
 
 let generate _ name db days sname sdays key_type bits =
-  Mirage_crypto_rng_unix.initialize () ;
+  Mirage_crypto_rng_unix.initialize (module Mirage_crypto_rng.Fortuna) ;
   let* key = priv_key key_type bits name in
   let name = [ Distinguished_name.(Relative_distinguished_name.singleton (CN name)) ] in
   let* csr = Signing_request.create name key in

provision/albatross_provision_request.ml

@@ -15,7 +15,7 @@ let csr priv name cmd =
 
 let jump key_type bits name cmd =
   let ( let* ) = Result.bind in
-  Mirage_crypto_rng_unix.initialize () ;
+  Mirage_crypto_rng_unix.initialize (module Mirage_crypto_rng.Fortuna) ;
   let* priv = priv_key key_type bits name in
   let* csr = csr priv name cmd in
   let enc = X509.Signing_request.encode_pem csr in

tls/dune

@@ -3,7 +3,7 @@
  (public_name albatross.tls)
  (wrapped false)
  (modules vmm_tls vmm_tls_lwt)
- (libraries albatross tls tls.lwt x509))
+ (libraries albatross tls tls-lwt x509))
 
 (library
  (name albatross_tls_cli)