summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Kavanagh <rak@rak.ac>2020-06-12 21:49:54 -0400
committerRyan Kavanagh <rak@rak.ac>2020-06-12 21:49:54 -0400
commit4f1f13ae89c4649b52cbdeb66e9b076162c55cba (patch)
tree14a9ab5408572dd46842b3bb6d226aa67f0104b6
parentRevert "Refactor transactions to use conduit" (diff)
tls is fixed thanks to upstream
-rw-r--r--dune-project3
-rw-r--r--gemini/dune13
-rw-r--r--gemini/tlsUtils.ml1
3 files changed, 14 insertions, 3 deletions
diff --git a/dune-project b/dune-project
index 2db5774..d9a52b4 100644
--- a/dune-project
+++ b/dune-project
@@ -10,4 +10,5 @@
(name leda)
(synopsis "gemini client")
(depends
- (angstrom :dev)))
+ (angstrom :dev)
+ (tls (>= 0.12.1))))
diff --git a/gemini/dune b/gemini/dune
index 7e15878..2025fa9 100644
--- a/gemini/dune
+++ b/gemini/dune
@@ -1,4 +1,15 @@
(library
(name gemini)
- (libraries base angstrom angstrom-lwt-unix lwt lwt_ppx mirage-crypto-pk ptime stdlib tls.lwt uri)
+ (libraries
+ base
+ angstrom
+ angstrom-lwt-unix
+ lwt
+ lwt_ppx
+ mirage-crypto-pk
+ mirage-crypto-rng.lwt
+ ptime
+ stdlib
+ tls.lwt
+ uri)
(preprocess (pps lwt_ppx)))
diff --git a/gemini/tlsUtils.ml b/gemini/tlsUtils.ml
index 0ea00ab..584221b 100644
--- a/gemini/tlsUtils.ml
+++ b/gemini/tlsUtils.ml
@@ -29,7 +29,6 @@ struct
X509_lwt.authenticator (`Ca_file path)
let self_sign ?(bits=2048) ?(days=1) dnames =
- let () = Mirage_crypto_rng_unix.initialize () in
let priv = Mirage_crypto_pk.Rsa.generate ~bits:bits () in
let csr = X509.Signing_request.create dnames (`RSA priv) in
let valid_from : Ptime.t = Ptime_clock.now () in