From 20acc9cab9a574770b440c4e11734be02ccf7e79 Mon Sep 17 00:00:00 2001 From: Hannes Mehnert Date: Wed, 5 Feb 2025 18:11:42 +0100 Subject: [PATCH 1/2] [new release] mirage-crypto (6 packages) (2.0.0) CHANGES: * Remove now superfluous mirage-crypto-rng-{eio,lwt,async} packages (mirage/mirage-crypto#256 @hannesm) * Remove functorisation of mirage-crypto-rng-mirage, use mirage-sleep and mirage-mtime directly (mirage/mirage-crypto#257 @hannesm) --- .../mirage-crypto-ec.2.0.0/opam | 62 +++++++++++++++++++ .../mirage-crypto-pk.2.0.0/opam | 43 +++++++++++++ .../mirage-crypto-rng-miou-unix.2.0.0/opam | 39 ++++++++++++ .../mirage-crypto-rng-mirage.2.0.0/opam | 40 ++++++++++++ .../mirage-crypto-rng.2.0.0/opam | 42 +++++++++++++ .../mirage-crypto/mirage-crypto.2.0.0/opam | 39 ++++++++++++ 6 files changed, 265 insertions(+) create mode 100644 packages/mirage-crypto-ec/mirage-crypto-ec.2.0.0/opam create mode 100644 packages/mirage-crypto-pk/mirage-crypto-pk.2.0.0/opam create mode 100644 packages/mirage-crypto-rng-miou-unix/mirage-crypto-rng-miou-unix.2.0.0/opam create mode 100644 packages/mirage-crypto-rng-mirage/mirage-crypto-rng-mirage.2.0.0/opam create mode 100644 packages/mirage-crypto-rng/mirage-crypto-rng.2.0.0/opam create mode 100644 packages/mirage-crypto/mirage-crypto.2.0.0/opam diff --git a/packages/mirage-crypto-ec/mirage-crypto-ec.2.0.0/opam b/packages/mirage-crypto-ec/mirage-crypto-ec.2.0.0/opam new file mode 100644 index 00000000000..94a2826ce70 --- /dev/null +++ b/packages/mirage-crypto-ec/mirage-crypto-ec.2.0.0/opam @@ -0,0 +1,62 @@ +opam-version: "2.0" +synopsis: "Elliptic Curve Cryptography with primitives taken from Fiat" +description: """ +An implementation of key exchange (ECDH) and digital signature (ECDSA/EdDSA) +algorithms using code from Fiat (). + +The curves P256 (SECP256R1), P384 (SECP384R1), +P521 (SECP521R1), and 25519 (X25519, Ed25519) are implemented by this package. +""" +maintainer: "Hannes Mehnert " +authors: [ + "Hannes Mehnert " + "Nathan Rebours " + "Clément Pascutto " + "Etienne Millon " + "Virgile Robles " +# and from the fiat-crypto AUTHORS file + "Andres Erbsen " + "Google Inc." + "Jade Philipoom " + "Massachusetts Institute of Technology" + "Zoe Paraskevopoulou " +] +license: "MIT" +homepage: "https://github.com/mirage/mirage-crypto" +doc: "https://mirage.github.io/mirage-crypto/doc" +bug-reports: "https://github.com/mirage/mirage-crypto/issues" +depends: [ + "dune" {>= "2.7"} + "ocaml" {>= "4.13.0"} + "dune-configurator" + "eqaf" {>= "0.7"} + "mirage-crypto-rng" {=version} + "digestif" {>= "1.2.0"} + "alcotest" {with-test & >= "0.8.1"} + "ppx_deriving_yojson" {with-test} + "ppx_deriving" {with-test} + "yojson" {with-test & >= "1.6.0"} + "asn1-combinators" {with-test & >= "0.3.1"} + "ohex" {with-test & >= "0.2.0"} + "ounit2" {with-test} +] +conflicts: [ + "ocaml-freestanding" +] +build: [ + ["dune" "subst"] {dev} + ["dune" "build" "-p" name "-j" jobs] + ["dune" "runtest" "-p" name "-j" jobs] {with-test} +] +dev-repo: "git+https://github.com/mirage/mirage-crypto.git" +tags: ["org:mirage"] +x-maintenance-intent: [ "(latest)" ] +url { + src: + "https://github.com/mirage/mirage-crypto/releases/download/v2.0.0/mirage-crypto-2.0.0.tbz" + checksum: [ + "sha256=5111764b9b21168eb8f517333463ead2dd16fb58227288783a284097974ff928" + "sha512=6aa8c666d29a47b7a64e8108f706e7ffcdf436d41f9fd8e3e72247019b13c9332fe518f84bb298e4f161586a5e3735199373ca7029897ea63d9eed0720e59599" + ] +} +x-commit-hash: "cadf0e1230cada9f108e63321b30af24642e2b74" diff --git a/packages/mirage-crypto-pk/mirage-crypto-pk.2.0.0/opam b/packages/mirage-crypto-pk/mirage-crypto-pk.2.0.0/opam new file mode 100644 index 00000000000..366aa826b8a --- /dev/null +++ b/packages/mirage-crypto-pk/mirage-crypto-pk.2.0.0/opam @@ -0,0 +1,43 @@ +opam-version: "2.0" +homepage: "https://github.com/mirage/mirage-crypto" +dev-repo: "git+https://github.com/mirage/mirage-crypto.git" +bug-reports: "https://github.com/mirage/mirage-crypto/issues" +doc: "https://mirage.github.io/mirage-crypto/doc" +authors: ["David Kaloper " "Hannes Mehnert " ] +maintainer: "Hannes Mehnert " +license: "ISC" +synopsis: "Simple public-key cryptography for the modern age" + +build: [ ["dune" "subst"] {dev} + ["dune" "build" "-p" name "-j" jobs ] + ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] + +depends: [ + "conf-gmp-powm-sec" {build} + "ocaml" {>= "4.13.0"} + "dune" {>= "2.7"} + "ounit2" {with-test} + "randomconv" {with-test & >= "0.2.0"} + "ohex" {with-test & >= "0.2.0"} + "mirage-crypto" {=version} + "mirage-crypto-rng" {=version} + "digestif" {>= "1.2.0"} + "zarith" {>= "1.13"} + "eqaf" {>= "0.8"} +] +conflicts: [ + "ocaml-freestanding" +] +description: """ +Mirage-crypto-pk provides public-key cryptography (RSA, DSA, DH). +""" +x-maintenance-intent: [ "(latest)" ] +url { + src: + "https://github.com/mirage/mirage-crypto/releases/download/v2.0.0/mirage-crypto-2.0.0.tbz" + checksum: [ + "sha256=5111764b9b21168eb8f517333463ead2dd16fb58227288783a284097974ff928" + "sha512=6aa8c666d29a47b7a64e8108f706e7ffcdf436d41f9fd8e3e72247019b13c9332fe518f84bb298e4f161586a5e3735199373ca7029897ea63d9eed0720e59599" + ] +} +x-commit-hash: "cadf0e1230cada9f108e63321b30af24642e2b74" diff --git a/packages/mirage-crypto-rng-miou-unix/mirage-crypto-rng-miou-unix.2.0.0/opam b/packages/mirage-crypto-rng-miou-unix/mirage-crypto-rng-miou-unix.2.0.0/opam new file mode 100644 index 00000000000..04426b1c7f8 --- /dev/null +++ b/packages/mirage-crypto-rng-miou-unix/mirage-crypto-rng-miou-unix.2.0.0/opam @@ -0,0 +1,39 @@ +opam-version: "2.0" +homepage: "https://github.com/mirage/mirage-crypto" +dev-repo: "git+https://github.com/mirage/mirage-crypto.git" +bug-reports: "https://github.com/mirage/mirage-crypto/issues" +doc: "https://mirage.github.io/mirage-crypto/doc" +authors: ["Romain Calascibetta " ] +maintainer: "Romain Calascibetta " +license: "ISC" +synopsis: "Feed the entropy source in an miou.unix-friendly way" + +build: [ ["dune" "subst"] {dev} + ["dune" "build" "-p" name "-j" jobs ] + ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] + +depends: [ + "ocaml" {>= "5.0.0"} + "dune" {>= "2.7"} + "miou" {>= "0.2.0"} + "logs" + "mirage-crypto-rng" {=version} + "duration" + "mtime" {>= "1.0.0"} + "digestif" {>= "1.2.0"} + "ohex" {with-test & >= "0.2.0"} +] +description: """ +Mirage-crypto-rng-miou-unix feeds the entropy source for Mirage_crypto_rng-based +random number generator implementations, in an miou.unix-friendly way. +""" +x-maintenance-intent: [ "(latest)" ] +url { + src: + "https://github.com/mirage/mirage-crypto/releases/download/v2.0.0/mirage-crypto-2.0.0.tbz" + checksum: [ + "sha256=5111764b9b21168eb8f517333463ead2dd16fb58227288783a284097974ff928" + "sha512=6aa8c666d29a47b7a64e8108f706e7ffcdf436d41f9fd8e3e72247019b13c9332fe518f84bb298e4f161586a5e3735199373ca7029897ea63d9eed0720e59599" + ] +} +x-commit-hash: "cadf0e1230cada9f108e63321b30af24642e2b74" diff --git a/packages/mirage-crypto-rng-mirage/mirage-crypto-rng-mirage.2.0.0/opam b/packages/mirage-crypto-rng-mirage/mirage-crypto-rng-mirage.2.0.0/opam new file mode 100644 index 00000000000..e2be91e4a61 --- /dev/null +++ b/packages/mirage-crypto-rng-mirage/mirage-crypto-rng-mirage.2.0.0/opam @@ -0,0 +1,40 @@ +opam-version: "2.0" +homepage: "https://github.com/mirage/mirage-crypto" +dev-repo: "git+https://github.com/mirage/mirage-crypto.git" +bug-reports: "https://github.com/mirage/mirage-crypto/issues" +doc: "https://mirage.github.io/mirage-crypto/doc" +authors: ["David Kaloper " "Hannes Mehnert " ] +maintainer: "Hannes Mehnert " +license: "BSD-2-Clause" +synopsis: "Entropy collection for a cryptographically secure PRNG" + +build: [ ["dune" "subst"] {dev} + ["dune" "build" "-p" name "-j" jobs ] + ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] + +depends: [ + "ocaml" {>= "4.13.0"} + "dune" {>= "2.7"} + "mirage-crypto-rng" {=version} + "duration" + "logs" + "lwt" {>= "4.0.0"} + "mirage-runtime" {>= "3.8.0"} + "mirage-sleep" {>= "4.0.0"} + "mirage-mtime" {>= "4.0.0"} + "mirage-unix" {with-test & >= "5.0.0"} + "ohex" {with-test & >= "0.2.0"} +] +description: """ +Mirage-crypto-rng-mirage provides entropy collection code for the RNG. +""" +x-maintenance-intent: [ "(latest)" ] +url { + src: + "https://github.com/mirage/mirage-crypto/releases/download/v2.0.0/mirage-crypto-2.0.0.tbz" + checksum: [ + "sha256=5111764b9b21168eb8f517333463ead2dd16fb58227288783a284097974ff928" + "sha512=6aa8c666d29a47b7a64e8108f706e7ffcdf436d41f9fd8e3e72247019b13c9332fe518f84bb298e4f161586a5e3735199373ca7029897ea63d9eed0720e59599" + ] +} +x-commit-hash: "cadf0e1230cada9f108e63321b30af24642e2b74" diff --git a/packages/mirage-crypto-rng/mirage-crypto-rng.2.0.0/opam b/packages/mirage-crypto-rng/mirage-crypto-rng.2.0.0/opam new file mode 100644 index 00000000000..795ccac0d33 --- /dev/null +++ b/packages/mirage-crypto-rng/mirage-crypto-rng.2.0.0/opam @@ -0,0 +1,42 @@ +opam-version: "2.0" +homepage: "https://github.com/mirage/mirage-crypto" +dev-repo: "git+https://github.com/mirage/mirage-crypto.git" +bug-reports: "https://github.com/mirage/mirage-crypto/issues" +doc: "https://mirage.github.io/mirage-crypto/doc" +authors: ["David Kaloper " "Hannes Mehnert " ] +maintainer: "Hannes Mehnert " +license: "ISC" +synopsis: "A cryptographically secure PRNG" + +build: [ ["dune" "subst"] {dev} + ["dune" "build" "-p" name "-j" jobs ] + ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] + +depends: [ + "ocaml" {>= "4.14.0"} + "dune" {>= "2.7"} + "dune-configurator" {>= "2.0.0"} + "duration" + "logs" + "mirage-crypto" {=version} + "digestif" {>= "1.1.4"} + "ounit2" {with-test} + "randomconv" {with-test & >= "0.2.0"} + "ohex" {with-test & >= "0.2.0"} +] +conflicts: [ "mirage-runtime" {< "3.8.0"} ] +description: """ +Mirage-crypto-rng provides a random number generator interface, and +implementations: Fortuna, HMAC-DRBG, getrandom/getentropy based (in the unix +sublibrary) +""" +x-maintenance-intent: [ "(latest)" ] +url { + src: + "https://github.com/mirage/mirage-crypto/releases/download/v2.0.0/mirage-crypto-2.0.0.tbz" + checksum: [ + "sha256=5111764b9b21168eb8f517333463ead2dd16fb58227288783a284097974ff928" + "sha512=6aa8c666d29a47b7a64e8108f706e7ffcdf436d41f9fd8e3e72247019b13c9332fe518f84bb298e4f161586a5e3735199373ca7029897ea63d9eed0720e59599" + ] +} +x-commit-hash: "cadf0e1230cada9f108e63321b30af24642e2b74" diff --git a/packages/mirage-crypto/mirage-crypto.2.0.0/opam b/packages/mirage-crypto/mirage-crypto.2.0.0/opam new file mode 100644 index 00000000000..45309991990 --- /dev/null +++ b/packages/mirage-crypto/mirage-crypto.2.0.0/opam @@ -0,0 +1,39 @@ +opam-version: "2.0" +homepage: "https://github.com/mirage/mirage-crypto" +dev-repo: "git+https://github.com/mirage/mirage-crypto.git" +bug-reports: "https://github.com/mirage/mirage-crypto/issues" +doc: "https://mirage.github.io/mirage-crypto/doc" +authors: ["David Kaloper " "Hannes Mehnert " ] +maintainer: "Hannes Mehnert " +license: "ISC" +synopsis: "Simple symmetric cryptography for the modern age" + +build: [ ["dune" "subst"] {dev} + ["dune" "build" "-p" name "-j" jobs ] + ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] + +depends: [ + "ocaml" {>= "4.13.0"} + "dune" {>= "2.7"} + "dune-configurator" {>= "2.0.0"} + "ounit2" {with-test} + "ohex" {with-test & >= "0.2.0"} + "eqaf" {>= "0.8"} +] +conflicts: [ + "ocaml-freestanding" + "result" {< "1.5"} +] +description: """ +Mirage-crypto provides symmetric ciphers (DES, AES, RC4, ChaCha20/Poly1305). +""" +x-maintenance-intent: [ "(latest)" ] +url { + src: + "https://github.com/mirage/mirage-crypto/releases/download/v2.0.0/mirage-crypto-2.0.0.tbz" + checksum: [ + "sha256=5111764b9b21168eb8f517333463ead2dd16fb58227288783a284097974ff928" + "sha512=6aa8c666d29a47b7a64e8108f706e7ffcdf436d41f9fd8e3e72247019b13c9332fe518f84bb298e4f161586a5e3735199373ca7029897ea63d9eed0720e59599" + ] +} +x-commit-hash: "cadf0e1230cada9f108e63321b30af24642e2b74" From a252729027e4f4b3167ef1627ec4a991bd561696 Mon Sep 17 00:00:00 2001 From: Hannes Mehnert Date: Wed, 5 Feb 2025 19:52:26 +0100 Subject: [PATCH 2/2] fix revdeps --- packages/caldav/caldav.0.2.3/opam | 2 +- packages/tcpip/tcpip.8.2.0/opam | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/caldav/caldav.0.2.3/opam b/packages/caldav/caldav.0.2.3/opam index e10b9c36b8c..7c957c0afbe 100644 --- a/packages/caldav/caldav.0.2.3/opam +++ b/packages/caldav/caldav.0.2.3/opam @@ -38,7 +38,7 @@ depends: [ "cohttp-lwt" {>= "2.0.0"} "cohttp-lwt-unix" {with-test & >= "2.0.0" & < "6.0.0~~"} "digestif" {>= "1.2.0"} - "mirage-crypto-rng" {>= "1.0.0"} + "mirage-crypto-rng" {>= "1.0.0" & < "2.0.0"} "mirage-crypto-rng-mirage" {>= "1.0.0"} "mirage-crypto-rng-lwt" {with-test & >= "1.0.0"} "base64" {>= "3.0.0"} diff --git a/packages/tcpip/tcpip.8.2.0/opam b/packages/tcpip/tcpip.8.2.0/opam index c6c7bf80b6f..b8d977c65be 100644 --- a/packages/tcpip/tcpip.8.2.0/opam +++ b/packages/tcpip/tcpip.8.2.0/opam @@ -30,7 +30,7 @@ depends: [ "cstruct-lwt" "mirage-net" {>= "3.0.0"} "mirage-clock" {>= "3.0.0"} - "mirage-crypto-rng-mirage" {>= "1.0.0"} + "mirage-crypto-rng-mirage" {>= "1.0.0" & < "2.0.0"} "mirage-time" {>= "2.0.0"} "ipaddr" {>= "5.6.0"} "macaddr" {>="4.0.0"}