diff options
| -rw-r--r-- | flake.nix | 864 | ||||
| -rw-r--r-- | nix/boringssl_pkg_versions.nix | 504 | ||||
| -rw-r--r-- | nix/boringsslshim.nix | 8 | ||||
| -rw-r--r-- | nix/botan_pkg_versions.nix | 318 | ||||
| -rw-r--r-- | nix/botanshim.nix | 10 | ||||
| -rw-r--r-- | nix/commonlibs.nix | 7 | ||||
| -rw-r--r-- | nix/cryptopp_pkg_versions.nix | 118 | ||||
| -rw-r--r-- | nix/cryptoppshim.nix | 8 | ||||
| -rw-r--r-- | nix/gcrypt_pkg_versions.nix | 410 | ||||
| -rw-r--r-- | nix/gcryptshim.nix | 9 | ||||
| -rw-r--r-- | nix/ippcp_pkg_versions.nix | 174 | ||||
| -rw-r--r-- | nix/ippcpshim.nix | 8 | ||||
| -rw-r--r-- | nix/libressl_pkg_versions.nix | 837 | ||||
| -rw-r--r-- | nix/libresslshim.nix | 8 | ||||
| -rw-r--r-- | nix/mbedtls_pkg_versions.nix | 154 | ||||
| -rw-r--r-- | nix/mbedtlsshim.nix | 8 | ||||
| -rw-r--r-- | nix/nettle_pkg_versions.nix | 148 | ||||
| -rw-r--r-- | nix/nettleshim.nix | 9 | ||||
| -rw-r--r-- | nix/openssl_pkg_versions.nix | 146 | ||||
| -rw-r--r-- | nix/opensslshim.nix | 8 | ||||
| -rw-r--r-- | nix/tomcrypt_pkg_versions.nix | 46 | ||||
| -rw-r--r-- | nix/tomcryptshim.nix | 9 | ||||
| -rw-r--r-- | nix/x | 21 | ||||
| -rw-r--r-- | standalone/src/main/resources/cz/crcs/ectester/standalone/libs/jni/Makefile | 8 |
24 files changed, 2709 insertions, 1131 deletions
@@ -2,267 +2,498 @@ description = "ECTester"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - flake-utils.url = "github:numtide/flake-utils"; - gradle2nix.url = "github:tadfisher/gradle2nix/03c1b713ad139eb6dfc8d463b5bd348368125cf1"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + flake-utils.url = "github:numtide/flake-utils"; + gradle2nix.url = "github:tadfisher/gradle2nix/03c1b713ad139eb6dfc8d463b5bd348368125cf1"; custom-nixpkgs.url = "github:quapka/nixpkgs/customPkgs"; }; - outputs = { self, nixpkgs, custom-nixpkgs, flake-utils, gradle2nix, ... }: - flake-utils.lib.eachDefaultSystem (system: + outputs = + { + self, + nixpkgs, + custom-nixpkgs, + flake-utils, + gradle2nix, + ... + }: + flake-utils.lib.eachDefaultSystem ( + system: let - overlays = []; - pkgs = import nixpkgs { - inherit system overlays; - }; - customPkgs = import custom-nixpkgs { - inherit system overlays; - }; + overlays = [ ]; + pkgs = import nixpkgs { inherit system overlays; }; + customPkgs = import custom-nixpkgs { inherit system overlays; }; # removes the patch/revision from the version. E.g. getMajorMinor "1.2.3" = "1.2" - getMajorMinor = version: builtins.concatStringsSep "." (pkgs.lib.take 2 ( builtins.splitVersion version)); + getMajorMinor = + version: builtins.concatStringsSep "." (pkgs.lib.take 2 (builtins.splitVersion version)); # Altered upstream packages - boringsslBuilder = { rev, hash }: pkgs.boringssl.overrideAttrs (final: prev: rec { - src = if rev == null then prev.src else pkgs.fetchgit { - url = "https://boringssl.googlesource.com/boringssl"; - inherit rev hash; - }; - postFixup = '' - cp $out/lib/libcrypto.a $out/lib/lib_boringssl.a - ''; - }); + boringsslBuilder = + { rev, hash }: + pkgs.boringssl.overrideAttrs ( + final: prev: rec { + src = + if rev == null then + prev.src + else + pkgs.fetchgit { + url = "https://boringssl.googlesource.com/boringssl"; + inherit rev hash; + }; + postFixup = '' + cp $out/lib/libcrypto.a $out/lib/lib_boringssl.a + ''; + } + ); # FIXME: `nix develeop` now has different version than `nix run` - opensslBuilder = { version ? null, hash ? null }: (pkgs.openssl.override { static = true; }).overrideAttrs (final: prev: rec { - pname = "openssl"; - src = if version != null then pkgs.fetchurl { - url = "https://www.openssl.org/source/openssl-${version}.tar.gz"; - hash = hash; - } else prev.src; - # FIXME Removing patches might cause unwanted things; this should be version based! - patches = []; - }); - botan2Builder = { version, source_extension, hash }: pkgs.botan2.overrideAttrs (final: prev: { - src = if ( version == null ) then prev.src else - pkgs.fetchurl { - urls = [ - "http://botan.randombit.net/releases/Botan-${version}.${source_extension}" - ]; - inherit hash; - }; - }); + opensslBuilder = + { + version ? null, + hash ? null, + }: + (pkgs.openssl.override { static = true; }).overrideAttrs ( + final: prev: rec { + pname = "openssl"; + src = + if version != null then + pkgs.fetchurl { + url = "https://www.openssl.org/source/openssl-${version}.tar.gz"; + hash = hash; + } + else + prev.src; + # FIXME Removing patches might cause unwanted things; this should be version based! + patches = [ ]; + } + ); + botan2Builder = + { + version, + source_extension, + hash, + }: + pkgs.botan2.overrideAttrs ( + final: prev: { + src = + if (version == null) then + prev.src + else + pkgs.fetchurl { + urls = [ "http://botan.randombit.net/releases/Botan-${version}.${source_extension}" ]; + inherit hash; + }; + } + ); - libgcryptBuilder = { version, hash }: pkgs.libgcrypt.overrideAttrs (final: prev: { - configureFlags = ( prev.configureFlags or [] ) ++ [ "--enable-static" ]; - src = if version == null then prev.src else pkgs.fetchurl { - url = "mirror://gnupg/libgcrypt/${prev.pname}-${version}.tar.bz2"; - inherit hash; - }; - }); - libgpg-error = pkgs.libgpg-error.overrideAttrs (final: prev: { - configureFlags = ( prev.configureFlags or [] ) ++ [ "--enable-static" ]; - }); + libgcryptBuilder = + { version, hash }: + pkgs.libgcrypt.overrideAttrs ( + final: prev: { + configureFlags = (prev.configureFlags or [ ]) ++ [ "--enable-static" ]; + src = + if version == null then + prev.src + else + pkgs.fetchurl { + url = "mirror://gnupg/libgcrypt/${prev.pname}-${version}.tar.bz2"; + inherit hash; + }; + } + ); + libgpg-error = pkgs.libgpg-error.overrideAttrs ( + final: prev: { configureFlags = (prev.configureFlags or [ ]) ++ [ "--enable-static" ]; } + ); - mbedtlsBuilder = { version, hash}: pkgs.mbedtls.overrideAttrs (final: prev: { - src = if version == null then prev.src else pkgs.fetchFromGitHub { - owner = "Mbed-TLS"; - repo = "mbedtls"; - rev = "mbedtls-${version}"; - inherit hash; - # mbedtls >= 3.6.0 uses git submodules - fetchSubmodules = true; - }; - }); + mbedtlsBuilder = + { version, hash }: + pkgs.mbedtls.overrideAttrs ( + final: prev: { + src = + if version == null then + prev.src + else + pkgs.fetchFromGitHub { + owner = "Mbed-TLS"; + repo = "mbedtls"; + rev = "mbedtls-${version}"; + inherit hash; + # mbedtls >= 3.6.0 uses git submodules + fetchSubmodules = true; + }; + } + ); - ipp-cryptoBuilder = { version, hash }: customPkgs.ipp-crypto.overrideAttrs (final: prev: { - src = if version == null then prev.src else pkgs.fetchFromGitHub { - owner = "intel"; - repo = "ipp-crypto"; - rev = "ippcp_${version}"; - inherit hash; - }; - }); + ipp-cryptoBuilder = + { version, hash }: + customPkgs.ipp-crypto.overrideAttrs ( + final: prev: { + src = + if version == null then + prev.src + else + pkgs.fetchFromGitHub { + owner = "intel"; + repo = "ipp-crypto"; + rev = "ippcp_${version}"; + inherit hash; + }; + } + ); - libtomcryptBuilder = { tcVersion, tcHash, tmVersion, tmHash }: - (pkgs.libtomcrypt.override { libtommath = libtommathBuilder { version = tmVersion; hash = tmHash; }; }).overrideAttrs (final: prev: - let - preBuilds = { - "1.18" = '' - makeFlagsArray+=(PREFIX=$out \ - CFLAGS="-DUSE_LTM -DLTM_DESC" \ - EXTRALIBS=\"-ltommath\" \ - INSTALL_GROUP=$(id -g) \ - INSTALL_USER=$(id -u)) - ''; - "1.17" = '' - mkdir --parents $out/{lib, include, share/doc/} + libtomcryptBuilder = + { + tcVersion, + tcHash, + tmVersion, + tmHash, + }: + (pkgs.libtomcrypt.override { + libtommath = libtommathBuilder { + version = tmVersion; + hash = tmHash; + }; + }).overrideAttrs + ( + final: prev: + let + preBuilds = { + "1.18" = '' + makeFlagsArray+=(PREFIX=$out \ + CFLAGS="-DUSE_LTM -DLTM_DESC" \ + EXTRALIBS=\"-ltommath\" \ + INSTALL_GROUP=$(id -g) \ + INSTALL_USER=$(id -u)) + ''; + "1.17" = '' + mkdir --parents $out/{lib, include, share/doc/} - makeFlagsArray+=(PREFIX=$out \ - LIBPATH=$out/lib \ - INCPATH=$out/include \ - DATAPATH=$out/share/doc/libtomcrypt/pdf - CFLAGS_OPTS="-DUSE_LTM -DLTM_DESC" \ - EXTRALIBS=\"-ltommath\" \ - GROUP=$(id -g) \ - USER=$(id -u)) - ''; - # "1.01" = '' - # ''; - }; - preBuild = if tcVersion != null - then if builtins.hasAttr (getMajorMinor tcVersion) preBuilds - then preBuilds."${getMajorMinor tcVersion}" - else preBuilds."1.17" - else preBuilds."1.18"; - in - rec { - makefile = "makefile.unix"; - version = if tcVersion != null then tcVersion else prev.version; + makeFlagsArray+=(PREFIX=$out \ + LIBPATH=$out/lib \ + INCPATH=$out/include \ + DATAPATH=$out/share/doc/libtomcrypt/pdf + CFLAGS_OPTS="-DUSE_LTM -DLTM_DESC" \ + EXTRALIBS=\"-ltommath\" \ + GROUP=$(id -g) \ + USER=$(id -u)) + ''; + # "1.01" = '' + # ''; + }; + preBuild = + if tcVersion != null then + if builtins.hasAttr (getMajorMinor tcVersion) preBuilds then + preBuilds."${getMajorMinor tcVersion}" + else + preBuilds."1.17" + else + preBuilds."1.18"; + in + rec { + makefile = "makefile.unix"; + version = if tcVersion != null then tcVersion else prev.version; - src = if version == prev.version then prev.src else pkgs.fetchFromGitHub { - owner = "libtom"; - repo = "libtomcrypt"; - rev = if pkgs.lib.hasPrefix "1.18" version then "refs/tags/v${version}" else "refs/tags/${version}" ; - hash = tcHash; - }; + src = + if version == prev.version then + prev.src + else + pkgs.fetchFromGitHub { + owner = "libtom"; + repo = "libtomcrypt"; + rev = if pkgs.lib.hasPrefix "1.18" version then "refs/tags/v${version}" else "refs/tags/${version}"; + hash = tcHash; + }; - inherit preBuild; - patches = if pkgs.lib.hasPrefix "1.18" version then ( prev.patches or [] ) ++ [ - # NOTE: LibTomCrypt does not expose the lib, when built statically (using `makefile and not `makefile.shared`). - # This patch copies the necessary code from `makefile.shared`. - ./nix/libtomcrypt-pkgconfig-for-static.patch - ] else []; - }); + inherit preBuild; + patches = + if pkgs.lib.hasPrefix "1.18" version then + (prev.patches or [ ]) + ++ [ + # NOTE: LibTomCrypt does not expose the lib, when built statically (using `makefile and not `makefile.shared`). + # This patch copies the necessary code from `makefile.shared`. + ./nix/libtomcrypt-pkgconfig-for-static.patch + ] + else + [ ]; + } + ); - libtommathBuilder = { version, hash }: pkgs.libtommath.overrideAttrs (final: prev: rec { - makefile = "makefile.unix"; - # version = if version != null then version else prev.version; - version = "1.3.0"; - src = pkgs.fetchurl { - url = "https://github.com/libtom/libtommath/releases/download/v${version}/ltm-${version}.tar.xz"; - # hash = if hash != null then hash else prev.hash; - hash = "sha256-KWJy2TQ1mRMI63NgdgDANLVYgHoH6CnnURQuZcz6nQg"; - }; - patches = ( prev.patches or [] ) ++ [ - # NOTE: LibTomMath does not expose the lib, when built statically (using `makefile and not `makefile.shared`). - # This patch copies the necessary code from `makefile.shared`. - ./nix/libtommath-pkgconfig-for-static-build.patch - ]; - }); - nettleBuilder = { version, tag, hash }: pkgs.nettle.overrideAttrs (final: prev: { - configureFlags = ( prev.configureFlags or [] ) ++ [ "--enable-static" ]; - src = if version == null then prev.src else pkgs.fetchurl { - url = "mirror://gnu/nettle/nettle-${version}.tar.gz"; - inherit hash; - }; - }); - cryptoppBuilder = { version, hash }: (pkgs.cryptopp.override { enableStatic = true; }).overrideAttrs (final: prev: { - src = if version == null then prev.src else - pkgs.fetchFromGitHub { - owner = "weidai11"; - repo = "cryptopp"; - rev = "CRYPTOPP_${version}"; - inherit hash; - }; - }); - libresslBuilder = { version, hash }: (pkgs.libressl.override { buildShared = false; } ).overrideAttrs (final: prev: rec { + libtommathBuilder = + { version, hash }: + pkgs.libtommath.overrideAttrs ( + final: prev: rec { + makefile = "makefile.unix"; + # version = if version != null then version else prev.version; + version = "1.3.0"; + src = pkgs.fetchurl { + url = "https://github.com/libtom/libtommath/releases/download/v${version}/ltm-${version}.tar.xz"; + # hash = if hash != null then hash else prev.hash; + hash = "sha256-KWJy2TQ1mRMI63NgdgDANLVYgHoH6CnnURQuZcz6nQg"; + }; + patches = (prev.patches or [ ]) ++ [ + # NOTE: LibTomMath does not expose the lib, when built statically (using `makefile and not `makefile.shared`). + # This patch copies the necessary code from `makefile.shared`. + ./nix/libtommath-pkgconfig-for-static-build.patch + ]; + } + ); + nettleBuilder = + { + version, + tag, + hash, + }: + pkgs.nettle.overrideAttrs ( + final: prev: { + configureFlags = (prev.configureFlags or [ ]) ++ [ "--enable-static" ]; + src = + if version == null then + prev.src + else + pkgs.fetchurl { + url = "mirror://gnu/nettle/nettle-${version}.tar.gz"; + inherit hash; + }; + } + ); + cryptoppBuilder = + { version, hash }: + (pkgs.cryptopp.override { enableStatic = true; }).overrideAttrs ( + final: prev: { + src = + if version == null then + prev.src + else + pkgs.fetchFromGitHub { + owner = "weidai11"; + repo = "cryptopp"; + rev = "CRYPTOPP_${version}"; + inherit hash; + }; + } + ); + libresslBuilder = + { version, hash }: + (pkgs.libressl.override { buildShared = false; }).overrideAttrs ( + final: prev: rec { - src = if version == null then prev.src else pkgs.fetchurl { - url = "mirror://openbsd/LibreSSL/${prev.pname}-${version}.tar.gz"; - inherit hash; - }; - patches = [ - (pkgs.fetchpatch { - url = "https://github.com/libressl/portable/commit/86e4965d7f20c3a6afc41d95590c9f6abb4fe788.patch"; - includes = [ "tests/tlstest.sh" ]; - hash = "sha256-XmmKTvP6+QaWxyGFCX6/gDfME9GqBWSx4X8RH8QbDXA="; - }) - ]; + src = + if version == null then + prev.src + else + pkgs.fetchurl { + url = "mirror://openbsd/LibreSSL/${prev.pname}-${version}.tar.gz"; + inherit hash; + }; + patches = [ + (pkgs.fetchpatch { + url = "https://github.com/libressl/portable/commit/86e4965d7f20c3a6afc41d95590c9f6abb4fe788.patch"; + includes = [ "tests/tlstest.sh" ]; + hash = "sha256-XmmKTvP6+QaWxyGFCX6/gDfME9GqBWSx4X8RH8QbDXA="; + }) + ]; - # NOTE: Due to name conflicts between OpenSSL and LibreSSL we need to resolve this manually. - # This is not needed for building the individual shims through Nix, as libresslShim build env does not - # contain OpenSSL at all, but for the interactive shell (started with `nix develop`), when multiple - # lib shims are built alongside each other. - postFixup = pkgs.lib.concatLines [ - ( prev.postFixup or "" ) - '' - cp $dev/lib/pkgconfig/libcrypto.pc $dev/lib/pkgconfig/libresslcrypto.pc - sed --in-place --expression 's/-lcrypto/-lresslcrypto/' $dev/lib/pkgconfig/libresslcrypto.pc - ln -s $out/lib/libcrypto.so $out/lib/libresslcrypto.so - ln -s $out/lib/libcrypto.a $out/lib/libresslcrypto.a - '' - ]; + # NOTE: Due to name conflicts between OpenSSL and LibreSSL we need to resolve this manually. + # This is not needed for building the individual shims through Nix, as libresslShim build env does not + # contain OpenSSL at all, but for the interactive shell (started with `nix develop`), when multiple + # lib shims are built alongside each other. + postFixup = pkgs.lib.concatLines [ + (prev.postFixup or "") + '' + cp $dev/lib/pkgconfig/libcrypto.pc $dev/lib/pkgconfig/libresslcrypto.pc + sed --in-place --expression 's/-lcrypto/-lresslcrypto/' $dev/lib/pkgconfig/libresslcrypto.pc + ln -s $out/lib/libcrypto.so $out/lib/libresslcrypto.so + ln -s $out/lib/libcrypto.a $out/lib/libresslcrypto.a + '' + ]; - }); + } + ); gmp = pkgs.gmp.override { withStatic = true; }; # Custom added packages - wolfcryptjni = with customPkgs; wolfcrypt-jni.overrideAttrs (final: prev: { - src = pkgs.fetchFromGitHub { - owner = "wolfSSL"; - repo = "wolfcrypt-jni"; - rev = "0497ee767c994775beda2f2091009593961e5c7e"; - hash = "sha256-mtUXUyIKJ617WzAWjlOaMscWM7zuGBISVMEAbmQNBOg="; - }; - }); + wolfcryptjni = + with customPkgs; + wolfcrypt-jni.overrideAttrs ( + final: prev: { + src = pkgs.fetchFromGitHub { + owner = "wolfSSL"; + repo = "wolfcrypt-jni"; + rev = "0497ee767c994775beda2f2091009593961e5c7e"; + hash = "sha256-mtUXUyIKJ617WzAWjlOaMscWM7zuGBISVMEAbmQNBOg="; + }; + } + ); # Shims and libs # Current list of targets: tomcrypt botan cryptopp openssl boringssl gcrypt mbedtls ippcp nettle libressl - tomcryptShimBuilder = { tcVersion, tcHash, tmVersion, tmHash}: pkgs.callPackage ./nix/tomcryptshim.nix { - inherit pkgs; - libtomcrypt = ( libtomcryptBuilder { inherit tcVersion tcHash tmVersion tmHash; }); - libtommath = ( libtommathBuilder { version = tmVersion; hash = tmHash; }); - }; - botanShimBuilder = { version, source_extension, hash }: pkgs.callPackage ./nix/botanshim.nix { botan2 = botan2Builder { inherit version source_extension hash; }; }; - cryptoppShimBuilder = { version, hash}: pkgs.callPackage ./nix/cryptoppshim.nix { cryptopp = cryptoppBuilder { inherit version hash; };}; - opensslShimBuilder = { version, hash }: import ./nix/opensslshim.nix { inherit pkgs; openssl = (opensslBuilder { version = version; hash = hash;}); }; - boringsslShimBuilder = { rev, hash }: import ./nix/boringsslshim.nix { inherit pkgs; boringssl = ( boringsslBuilder { inherit rev hash; }); }; - gcryptShimBuilder = { version, hash}: import ./nix/gcryptshim.nix { inherit pkgs libgpg-error; libgcrypt = libgcryptBuilder { inherit version hash; }; }; - mbedtlsShimBuilder = { version, hash }: import ./nix/mbedtlsshim.nix { inherit pkgs; mbedtls = ( mbedtlsBuilder { inherit version hash; }); }; - ippcpShimBuilder = { version, hash }: import ./nix/ippcpshim.nix { pkgs = pkgs; ipp-crypto = ( ipp-cryptoBuilder { inherit version hash; }); }; - nettleShimBuilder = { version, tag, hash }: import ./nix/nettleshim.nix { inherit pkgs gmp; nettle = ( nettleBuilder { inherit version tag hash; }); }; - libresslShimBuilder = { version, hash }: import ./nix/libresslshim.nix { inherit pkgs; libressl = ( libresslBuilder { inherit version hash; }); }; + tomcryptShimBuilder = + { + tcVersion, + tcHash, + tmVersion, + tmHash, + }: + pkgs.callPackage ./nix/tomcryptshim.nix { + inherit pkgs; + libtomcrypt = ( + libtomcryptBuilder { + inherit + tcVersion + tcHash + tmVersion + tmHash + ; + } + ); + libtommath = ( + libtommathBuilder { + version = tmVersion; + hash = tmHash; + } + ); + }; + botanShimBuilder = + { + version, + source_extension, + hash, + }: + pkgs.callPackage ./nix/botanshim.nix { + botan2 = botan2Builder { inherit version source_extension hash; }; + }; + cryptoppShimBuilder = + { version, hash }: + pkgs.callPackage ./nix/cryptoppshim.nix { cryptopp = cryptoppBuilder { inherit version hash; }; }; + opensslShimBuilder = + { version, hash }: + import ./nix/opensslshim.nix { + inherit pkgs; + openssl = ( + opensslBuilder { + version = version; + hash = hash; + } + ); + }; + boringsslShimBuilder = + { rev, hash }: + import ./nix/boringsslshim.nix { + inherit pkgs; + boringssl = (boringsslBuilder { inherit rev hash; }); + }; + gcryptShimBuilder = + { version, hash }: + import ./nix/gcryptshim.nix { + inherit pkgs libgpg-error; + libgcrypt = libgcryptBuilder { inherit version hash; }; + }; + mbedtlsShimBuilder = + { version, hash }: + import ./nix/mbedtlsshim.nix { + inherit pkgs; + mbedtls = (mbedtlsBuilder { inherit version hash; }); + }; + ippcpShimBuilder = + { version, hash }: + import ./nix/ippcpshim.nix { + pkgs = pkgs; + ipp-crypto = (ipp-cryptoBuilder { inherit version hash; }); + }; + nettleShimBuilder = + { + version, + tag, + hash, + }: + import ./nix/nettleshim.nix { + inherit pkgs gmp; + nettle = (nettleBuilder { inherit version tag hash; }); + }; + libresslShimBuilder = + { version, hash }: + import ./nix/libresslshim.nix { + inherit pkgs; + libressl = (libresslBuilder { inherit version hash; }); + }; commonLibs = import ./nix/commonlibs.nix { pkgs = pkgs; }; - buildECTesterStandalone = { - tomcrypt ? { version = null; hash = null; }, - tommath ? { version = null; hash = null; }, - botan ? { version = null; source_extension = null; hash = null; }, - cryptopp ? { version = null; hash = null; }, - openssl ? { version = null; hash = null; }, - boringssl ? { rev = null; hash = null; }, - gcrypt ? { version = null; hash = null; }, - mbedtls ? { version = null; hash = null; }, - ippcp ? { version = null; hash = null; }, - nettle ? { version = null; tag = null; hash = null; }, - libressl ? { version = null; hash = null; }, - }: ( - let - tomcryptShim = tomcryptShimBuilder { - tcVersion = tomcrypt.version; - tcHash = tomcrypt.hash; - tmVersion = tommath.version; - tmHash = tommath.hash; - }; - opensslShim = (opensslShimBuilder { inherit (openssl) version hash; }); - botanShim = botanShimBuilder { inherit (botan) version source_extension hash; }; - cryptoppShim = cryptoppShimBuilder { inherit (cryptopp) version hash; }; - boringsslShim = boringsslShimBuilder { inherit (boringssl) rev hash; }; - gcryptShim = gcryptShimBuilder { inherit (gcrypt) version hash; }; - mbedtlsShim = mbedtlsShimBuilder { inherit (mbedtls) version hash; }; - ippcpShim = ippcpShimBuilder { inherit (ippcp) version hash; }; - nettleShim = nettleShimBuilder { inherit (nettle) version tag hash; }; - libresslShim = libresslShimBuilder { inherit (libressl) version hash; }; - in - with pkgs; + buildECTesterStandalone = + { + tomcrypt ? { + version = null; + hash = null; + }, + tommath ? { + version = null; + hash = null; + }, + botan ? { + version = null; + source_extension = null; + hash = null; + }, + cryptopp ? { + version = null; + hash = null; + }, + openssl ? { + version = null; + hash = null; + }, + boringssl ? { + rev = null; + hash = null; + }, + gcrypt ? { + version = null; + hash = null; + }, + mbedtls ? { + version = null; + hash = null; + }, + ippcp ? { + version = null; + hash = null; + }, + nettle ? { + version = null; + tag = null; + hash = null; + }, + libressl ? { + version = null; + hash = null; + }, + }: + ( + let + tomcryptShim = tomcryptShimBuilder { + tcVersion = tomcrypt.version; + tcHash = tomcrypt.hash; + tmVersion = tommath.version; + tmHash = tommath.hash; + }; + opensslShim = (opensslShimBuilder { inherit (openssl) version hash; }); + botanShim = botanShimBuilder { inherit (botan) version source_extension hash; }; + cryptoppShim = cryptoppShimBuilder { inherit (cryptopp) version hash; }; + boringsslShim = boringsslShimBuilder { inherit (boringssl) rev hash; }; + gcryptShim = gcryptShimBuilder { inherit (gcrypt) version hash; }; + mbedtlsShim = mbedtlsShimBuilder { inherit (mbedtls) version hash; }; + ippcpShim = ippcpShimBuilder { inherit (ippcp) version hash; }; + nettleShim = nettleShimBuilder { inherit (nettle) version tag hash; }; + libresslShim = libresslShimBuilder { inherit (libressl) version hash; }; + in + with pkgs; gradle2nix.builders.${system}.buildGradlePackage rec { pname = "ECTesterStandalone"; version = "0.3.3"; lockFile = ./gradle.lock; # NOTE: the shims are built separately, therefore no need to call build `libs` target - gradleBuildFlags = [ ":standalone:uberJar"]; + gradleBuildFlags = [ ":standalone:uberJar" ]; src = ./.; jniLibsPath = "standalone/src/main/resources/cz/crcs/ectester/standalone/libs/jni/"; @@ -300,7 +531,8 @@ --set LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:$LD_LIBRARY_PATH ''; - }); + } + ); in { packages = rec { @@ -316,110 +548,112 @@ nettle = pkgs.callPackage ./nix/nettle_pkg_versions.nix { inherit buildECTesterStandalone; }; libressl = pkgs.callPackage ./nix/libressl_pkg_versions.nix { inherit buildECTesterStandalone; }; - fetchReleases = with pkgs.python3Packages; buildPythonApplication { - pname = "fetchReleases"; - version = "0.1.0"; - format = "other"; + fetchReleases = + with pkgs.python3Packages; + buildPythonApplication { + pname = "fetchReleases"; + version = "0.1.0"; + format = "other"; - propagatedBuildInputs = [ - jinja2 - requests - beautifulsoup4 - ]; + propagatedBuildInputs = [ + jinja2 + requests + beautifulsoup4 + ]; - src = ./fetchReleases.py; - dontUnpack = true; - installPhase = '' - install -Dm755 $src $out/bin/$pname - ''; + src = ./fetchReleases.py; + dontUnpack = true; + installPhase = '' + install -Dm755 $src $out/bin/$pname + ''; - }; + }; }; - devShells.default = with pkgs; mkShell rec { - nativeBuildInputs = [ - pkg-config - ]; - - preConfigure = '' - cp ${boringssl}/lib/lib_boringssl.a standalone/src/main/resources/cz/crcs/ectester/standalone/libs/jni/ - ''; - - buildInputs = [ - # # gradle2nix - # libresslShim - gdb - ant - jdk17 - pkg-config - global-platform-pro - gradle - # libraries to test - (opensslBuilder {}) - libressl - # glibc - boringssl - libtomcrypt - libtommath - botan2 - cryptopp + devShells.default = + with pkgs; + mkShell rec { + nativeBuildInputs = [ pkg-config ]; - # libraries' dependencies - cmake - ninja - gawk - automake - go - gtest - libunwind - autoconf - libb64 + preConfigure = '' + cp ${boringssl}/lib/lib_boringssl.a standalone/src/main/resources/cz/crcs/ectester/standalone/libs/jni/ + ''; - # clang - libgcrypt - libgpg-error - mbedtls - nasm - libtool - perl + buildInputs = [ + # # gradle2nix + # libresslShim + gdb + ant + jdk17 + pkg-config + global-platform-pro + gradle + # libraries to test + (opensslBuilder { }) + libressl + # glibc + boringssl + libtomcrypt + libtommath + botan2 + cryptopp - wolfssl - nettle - # libressl + # libraries' dependencies + cmake + ninja + gawk + automake + go + gtest + libunwind + autoconf + libb64 - customPkgs.ipp-crypto + # clang + libgcrypt + libgpg-error + mbedtls + nasm + libtool + perl - gmp - libgpg-error - wget - libconfig - ]; + wolfssl + nettle + # libressl - LD_LIBRARY_PATH = with pkgs; pkgs.lib.makeLibraryPath [ - libtommath - libtomcrypt - botan2 - cryptopp - (opensslBuilder {}) - boringssl - libgcrypt - libgpg-error - nettle - gmp - libgpg-error - libconfig - wolfcryptjni - ]; + customPkgs.ipp-crypto - BORINGSSL_CFLAGS = "${boringssl.dev.outPath}/include"; - WOLFCRYPT_LIB_PATH = "${wolfcryptjni}/lib"; + gmp + libgpg-error + wget + libconfig + ]; + LD_LIBRARY_PATH = + with pkgs; + pkgs.lib.makeLibraryPath [ + libtommath + libtomcrypt + botan2 + cryptopp + (opensslBuilder { }) + boringssl + libgcrypt + libgpg-error + nettle + gmp + libgpg-error + libconfig + wolfcryptjni + ]; - IPP_CRYPTO_HEADER = "${customPkgs.ipp-crypto.dev}/include"; - IPP_CRYPTO_LIB = "${customPkgs.ipp-crypto}/lib/"; + BORINGSSL_CFLAGS = "${boringssl.dev.outPath}/include"; + WOLFCRYPT_LIB_PATH = "${wolfcryptjni}/lib"; + IPP_CRYPTO_HEADER = "${customPkgs.ipp-crypto.dev}/include"; + IPP_CRYPTO_LIB = "${customPkgs.ipp-crypto}/lib/"; - }; + }; } ); } diff --git a/nix/boringssl_pkg_versions.nix b/nix/boringssl_pkg_versions.nix index 1979814..87e9519 100644 --- a/nix/boringssl_pkg_versions.nix +++ b/nix/boringssl_pkg_versions.nix @@ -1,305 +1,603 @@ -{ - buildECTesterStandalone -}: +{ buildECTesterStandalone }: { r5af122c3 = buildECTesterStandalone { - boringssl = { rev="5af122c3dfc163b5d1859f1f450756e8e320a142"; hash="sha256-q4fuH35u6WlmDweGFf7WOmOJyq3F6NeJe6B8oTWjutk="; }; + boringssl = { + rev = "5af122c3dfc163b5d1859f1f450756e8e320a142"; + hash = "sha256-q4fuH35u6WlmDweGFf7WOmOJyq3F6NeJe6B8oTWjutk="; + }; }; r1e8c35af = buildECTesterStandalone { - boringssl = { rev="1e8c35af5363c21f0f349b4e570dcccfb9ec3f74"; hash="sha256-inBz7hCoJjO/wFY8Rrvov+9lPO66zjWn4tUOwS+qLEI="; }; + boringssl = { + rev = "1e8c35af5363c21f0f349b4e570dcccfb9ec3f74"; + hash = "sha256-inBz7hCoJjO/wFY8Rrvov+9lPO66zjWn4tUOwS+qLEI="; + }; }; r14a2f35b = buildECTesterStandalone { - boringssl = { rev="14a2f35b6e06756902eaa7e188a25895721055fc"; hash="sha256-wmbkh5Gh3ewKBNrLgeUPTUKBFrVy5J/vKMnckvFR2Aw="; }; + boringssl = { + rev = "14a2f35b6e06756902eaa7e188a25895721055fc"; + hash = "sha256-wmbkh5Gh3ewKBNrLgeUPTUKBFrVy5J/vKMnckvFR2Aw="; + }; }; re23fe9b6 = buildECTesterStandalone { - boringssl = { rev="e23fe9b6eecc10e4f9ea1f0027fea5eaee7bd6b6"; hash="sha256-jB5WXaxGKCqT9tuKwiMr68RMrQgp8ElbQ+WZB8PY8NQ="; }; + boringssl = { + rev = "e23fe9b6eecc10e4f9ea1f0027fea5eaee7bd6b6"; + hash = "sha256-jB5WXaxGKCqT9tuKwiMr68RMrQgp8ElbQ+WZB8PY8NQ="; + }; }; r7a6e828d = buildECTesterStandalone { - boringssl = { rev="7a6e828dc53ba9a56bd49915f2a0780d63af97d2"; hash="sha256-BloPVeQvY7wxvxx6IqFbuo5dt1ATbl2epcgG8PmVXQk="; }; + boringssl = { + rev = "7a6e828dc53ba9a56bd49915f2a0780d63af97d2"; + hash = "sha256-BloPVeQvY7wxvxx6IqFbuo5dt1ATbl2epcgG8PmVXQk="; + }; }; r9cffd74f = buildECTesterStandalone { - boringssl = { rev="9cffd74fdb65c69506a0ce1b19420a67ad0cb19e"; hash="sha256-xy0eVPmLnoV/K8S0q0vsKvMR0bjGw2q1HzCeYclQBJ4="; }; + boringssl = { + rev = "9cffd74fdb65c69506a0ce1b19420a67ad0cb19e"; + hash = "sha256-xy0eVPmLnoV/K8S0q0vsKvMR0bjGw2q1HzCeYclQBJ4="; + }; }; r82f9853f = buildECTesterStandalone { - boringssl = { rev="82f9853fc7d7360ae44f1e1357a6422c5244bbd8"; hash="sha256-oppWaOb3gmQN5O+xtdCZJfbwc4GbFmuAJxZDp9e/GEY="; }; + boringssl = { + rev = "82f9853fc7d7360ae44f1e1357a6422c5244bbd8"; + hash = "sha256-oppWaOb3gmQN5O+xtdCZJfbwc4GbFmuAJxZDp9e/GEY="; + }; }; r9b3ef1b3 = buildECTesterStandalone { - boringssl = { rev="9b3ef1b3d34d09c40b999d05ca6a92c77a9345e3"; hash="sha256-LJF+ooOKaB0Zj+VoLMJO5HDilQKEZfWJSl92X+ZMZmE="; }; + boringssl = { + rev = "9b3ef1b3d34d09c40b999d05ca6a92c77a9345e3"; + hash = "sha256-LJF+ooOKaB0Zj+VoLMJO5HDilQKEZfWJSl92X+ZMZmE="; + }; }; r096ded9f = buildECTesterStandalone { - boringssl = { rev="096ded9f097b73a15956b04cd168c7cfe7e28f52"; hash="sha256-WL0ndihbDyZnT3dJmwDIZWilxNtjsoZTQCbQ9+hjofo="; }; + boringssl = { + rev = "096ded9f097b73a15956b04cd168c7cfe7e28f52"; + hash = "sha256-WL0ndihbDyZnT3dJmwDIZWilxNtjsoZTQCbQ9+hjofo="; + }; }; rd274b1ba = buildECTesterStandalone { - boringssl = { rev="d274b1bacdca36f3941bf78e43dc38acf676a1a8"; hash="sha256-FtJFZorlGqPBfkPgFbEztNvYHweFaRVeuAM8xOMleMk="; }; + boringssl = { + rev = "d274b1bacdca36f3941bf78e43dc38acf676a1a8"; + hash = "sha256-FtJFZorlGqPBfkPgFbEztNvYHweFaRVeuAM8xOMleMk="; + }; }; rb34976ca = buildECTesterStandalone { - boringssl = { rev="b34976cae99f8d1b864dbab31e20fc00d06acb09"; hash="sha256-QUeBGFNQJE9DHq/thfk3RsRMTUhwB2Z6LRN0SJYJsVo="; }; + boringssl = { + rev = "b34976cae99f8d1b864dbab31e20fc00d06acb09"; + hash = "sha256-QUeBGFNQJE9DHq/thfk3RsRMTUhwB2Z6LRN0SJYJsVo="; + }; }; r77ef86d0 = buildECTesterStandalone { - boringssl = { rev="77ef86d0431ec3ceea503b0c59888942fd35b035"; hash="sha256-DprfilhYcYUcQA4kDtvh6UNsntXJwTo7YDm16yduJ1M="; }; + boringssl = { + rev = "77ef86d0431ec3ceea503b0c59888942fd35b035"; + hash = "sha256-DprfilhYcYUcQA4kDtvh6UNsntXJwTo7YDm16yduJ1M="; + }; }; r8934b1ef = buildECTesterStandalone { - boringssl = { rev="8934b1ef0857bc08626a2206a6f5f718942c14fc"; hash="sha256-3haLXiXWipf27XCChJQ9UU76hjydoGAC/HS+8AftZd0="; }; + boringssl = { + rev = "8934b1ef0857bc08626a2206a6f5f718942c14fc"; + hash = "sha256-3haLXiXWipf27XCChJQ9UU76hjydoGAC/HS+8AftZd0="; + }; }; r7c2b62e9 = buildECTesterStandalone { - boringssl = { rev="7c2b62e93487b772990fddc1905f22d4cfaee4a4"; hash="sha256-FGpAeOQ4Sfd/kbKs/Ziv+H/UzN3yH4FmUnFE5afszU4="; }; + boringssl = { + rev = "7c2b62e93487b772990fddc1905f22d4cfaee4a4"; + hash = "sha256-FGpAeOQ4Sfd/kbKs/Ziv+H/UzN3yH4FmUnFE5afszU4="; + }; }; r12f0f4be = buildECTesterStandalone { - boringssl = { rev="12f0f4bec2a6db53a53748dd6001d1aacaae26ba"; hash="sha256-uj99vsXUoHicoysqcPOn/yJf1M7fTPL3gSlikNyzUJw="; }; + boringssl = { + rev = "12f0f4bec2a6db53a53748dd6001d1aacaae26ba"; + hash = "sha256-uj99vsXUoHicoysqcPOn/yJf1M7fTPL3gSlikNyzUJw="; + }; }; rca2eba6a = buildECTesterStandalone { - boringssl = { rev="ca2eba6a5e6a1db7fc970b38c2975fb7bb7153fa"; hash="sha256-XVBOVn9ZuO9tobQ8TA6zDBwD/hxkMkcigGUpwn6Hnd8="; }; + boringssl = { + rev = "ca2eba6a5e6a1db7fc970b38c2975fb7bb7153fa"; + hash = "sha256-XVBOVn9ZuO9tobQ8TA6zDBwD/hxkMkcigGUpwn6Hnd8="; + }; }; rf01108e4 = buildECTesterStandalone { - boringssl = { rev="f01108e4761e1d4189cb134322c3cb01dc71ef87"; hash="sha256-jZ9T5/6t1ImeCDBAMzW0aSmT/NcLxbESYv/F+cBjIFY="; }; + boringssl = { + rev = "f01108e4761e1d4189cb134322c3cb01dc71ef87"; + hash = "sha256-jZ9T5/6t1ImeCDBAMzW0aSmT/NcLxbESYv/F+cBjIFY="; + }; }; r26468aea = buildECTesterStandalone { - boringssl = { rev="26468aea6483135b156fb03a5693c495dbad2e0f"; hash="sha256-a8r0bjKqsd/0FMhp5yR8iMU5LIC4ICV9cxsTIidWMUE="; }; + boringssl = { + rev = "26468aea6483135b156fb03a5693c495dbad2e0f"; + hash = "sha256-a8r0bjKqsd/0FMhp5yR8iMU5LIC4ICV9cxsTIidWMUE="; + }; }; r7811fdc9 = buildECTesterStandalone { - boringssl = { rev="7811fdc94b7ec146937e83f98d411157974ffa32"; hash="sha256-jZ9T5/6t1ImeCDBAMzW0aSmT/NcLxbESYv/F+cBjIFY="; }; + boringssl = { + rev = "7811fdc94b7ec146937e83f98d411157974ffa32"; + hash = "sha256-jZ9T5/6t1ImeCDBAMzW0aSmT/NcLxbESYv/F+cBjIFY="; + }; }; r45db24b3 = buildECTesterStandalone { - boringssl = { rev="45db24b36a030ec54464ea7a26c362f3c82305ee"; hash="sha256-dQhTNkyN+yVKpEWUSiaezfnktHr2EySScCANDcQjgq0="; }; + boringssl = { + rev = "45db24b36a030ec54464ea7a26c362f3c82305ee"; + hash = "sha256-dQhTNkyN+yVKpEWUSiaezfnktHr2EySScCANDcQjgq0="; + }; }; r45b24641 = buildECTesterStandalone { - boringssl = { rev="45b2464158379f48cec6e35a1ef503ddea1511a6"; hash="sha256-YLgAs3CzvTJ50C/VPUrflD2THBMLLNoEFEpOALrZQhY="; }; + boringssl = { + rev = "45b2464158379f48cec6e35a1ef503ddea1511a6"; + hash = "sha256-YLgAs3CzvTJ50C/VPUrflD2THBMLLNoEFEpOALrZQhY="; + }; }; r2fcdd11f = buildECTesterStandalone { - boringssl = { rev="2fcdd11f6d33b667968a5bc5147e2ba83a2082b8"; hash="sha256-aEZ3/t6Jg3LH+ZYuaqrB/sK44d8nilVfUleJEvN/qKA="; }; + boringssl = { + rev = "2fcdd11f6d33b667968a5bc5147e2ba83a2082b8"; + hash = "sha256-aEZ3/t6Jg3LH+ZYuaqrB/sK44d8nilVfUleJEvN/qKA="; + }; }; r6c98ebeb = buildECTesterStandalone { - boringssl = { rev="6c98ebeb8cf24c7be5d462ded7e60d88b2ceccec"; hash="sha256-BnD/HKW/2dz7AJz4B3iFvjx6ZTuItR2IyHgAGzexvCI="; }; + boringssl = { + rev = "6c98ebeb8cf24c7be5d462ded7e60d88b2ceccec"; + hash = "sha256-BnD/HKW/2dz7AJz4B3iFvjx6ZTuItR2IyHgAGzexvCI="; + }; }; rd1e6d3b4 = buildECTesterStandalone { - boringssl = { rev="d1e6d3b4af50c9490cc6210e2763b3c45ba14b07"; hash="sha256-Da2bMR7COJib9Y6GLpQmsTRt9oyDWZcbz3OkEExYvYo="; }; + boringssl = { + rev = "d1e6d3b4af50c9490cc6210e2763b3c45ba14b07"; + hash = "sha256-Da2bMR7COJib9Y6GLpQmsTRt9oyDWZcbz3OkEExYvYo="; + }; }; r84dc9bb6 = buildECTesterStandalone { - boringssl = { rev="84dc9bb624b47bda0bf802ae9e04a6eecb40865c"; hash="sha256-iM2dQCZIemZZysm5tQ83THHsdv3SAl8g6bR2eV5jqqo="; }; + boringssl = { + rev = "84dc9bb624b47bda0bf802ae9e04a6eecb40865c"; + hash = "sha256-iM2dQCZIemZZysm5tQ83THHsdv3SAl8g6bR2eV5jqqo="; + }; }; r67422ed4 = buildECTesterStandalone { - boringssl = { rev="67422ed4434116daa8898773692165ddd51a6ac2"; hash="sha256-7ScEX6ZqBl3PL+zn4bBBPFu5xxP1YswGQxh7g8+9VUc="; }; + boringssl = { + rev = "67422ed4434116daa8898773692165ddd51a6ac2"; + hash = "sha256-7ScEX6ZqBl3PL+zn4bBBPFu5xxP1YswGQxh7g8+9VUc="; + }; }; rc6c0b650 = buildECTesterStandalone { - boringssl = { rev="c6c0b650091e90e6206a361c14a73223f54d42c1"; hash="sha256-GirZs6NfiMvoXqDkW+J5zSK4NJJtI0rl2GOb+B+Hyeg="; }; + boringssl = { + rev = "c6c0b650091e90e6206a361c14a73223f54d42c1"; + hash = "sha256-GirZs6NfiMvoXqDkW+J5zSK4NJJtI0rl2GOb+B+Hyeg="; + }; }; r66d274df = buildECTesterStandalone { - boringssl = { rev="66d274dfbab9e4f84599f06504987c418ca087d9"; hash="sha256-eppy21RtniwE5gpD0ff4B1Gd0xLCdwc71i2DP7Y3nt0="; }; + boringssl = { + rev = "66d274dfbab9e4f84599f06504987c418ca087d9"; + hash = "sha256-eppy21RtniwE5gpD0ff4B1Gd0xLCdwc71i2DP7Y3nt0="; + }; }; re1d209d4 = buildECTesterStandalone { - boringssl = { rev="e1d209d4432846d28c31d84f269f4edcb9a63509"; hash="sha256-K2/9RS+UHCkHiog+//Q99RFWxLVXASE62l8yhJ6JVjg="; }; + boringssl = { + rev = "e1d209d4432846d28c31d84f269f4edcb9a63509"; + hash = "sha256-K2/9RS+UHCkHiog+//Q99RFWxLVXASE62l8yhJ6JVjg="; + }; }; r9cac8a6b = buildECTesterStandalone { - boringssl = { rev="9cac8a6b38c1cbd45c77aee108411d588da006fe"; hash="sha256-oVRzPR4OSpgifskilpke116E4mpx+9baXw6rfW/jegs="; }; + boringssl = { + rev = "9cac8a6b38c1cbd45c77aee108411d588da006fe"; + hash = "sha256-oVRzPR4OSpgifskilpke116E4mpx+9baXw6rfW/jegs="; + }; }; r11acdc6a = buildECTesterStandalone { - boringssl = { rev="11acdc6abf13cc8139c30ac9455840a347793110"; hash="sha256-FPiV4a+MmC3UdBZPqQRu2vUe0v7w+ar6/p19f0YGS+Y="; }; + boringssl = { + rev = "11acdc6abf13cc8139c30ac9455840a347793110"; + hash = "sha256-FPiV4a+MmC3UdBZPqQRu2vUe0v7w+ar6/p19f0YGS+Y="; + }; }; r962432c6 = buildECTesterStandalone { - boringssl = { rev="962432c687f67f8df1aa6e3dd364fbc88fea4ed8"; hash="sha256-BPOeSCjPiLh3pY/07J0vqUGdj6529idZtc+LCKb2MuQ="; }; + boringssl = { + rev = "962432c687f67f8df1aa6e3dd364fbc88fea4ed8"; + hash = "sha256-BPOeSCjPiLh3pY/07J0vqUGdj6529idZtc+LCKb2MuQ="; + }; }; ra220a602 = buildECTesterStandalone { - boringssl = { rev="a220a6024f66c123019b5c080f6bd8bcaf75448c"; hash="sha256-0R5EhwUi1Sc3hhwVhzCBAPxRhcftdmp2/FnwFckxlU0="; }; + boringssl = { + rev = "a220a6024f66c123019b5c080f6bd8bcaf75448c"; + hash = "sha256-0R5EhwUi1Sc3hhwVhzCBAPxRhcftdmp2/FnwFckxlU0="; + }; }; ra6c42d68 = buildECTesterStandalone { - boringssl = { rev="a6c42d6810ea5317fe8ed85704c097cd8f3513ca"; hash="sha256-tqgorwXUKb4wkTRD1OlMKNOp8LTDzyci5ulfaYHYGkQ="; }; + boringssl = { + rev = "a6c42d6810ea5317fe8ed85704c097cd8f3513ca"; + hash = "sha256-tqgorwXUKb4wkTRD1OlMKNOp8LTDzyci5ulfaYHYGkQ="; + }; }; r56fb43a2 = buildECTesterStandalone { - boringssl = { rev="56fb43a204e57af68e00f4561c108a7004381aa3"; hash="sha256-CK3EhbxQxL0SR1lznYTbOGO4PVU0ajHyJ6lVi6OzJGY="; }; + boringssl = { + rev = "56fb43a204e57af68e00f4561c108a7004381aa3"; + hash = "sha256-CK3EhbxQxL0SR1lznYTbOGO4PVU0ajHyJ6lVi6OzJGY="; + }; }; r29223ac3 = buildECTesterStandalone { - boringssl = { rev="29223ac349c144a4d0babc281644c0410dd1e313"; hash="sha256-0zOLcNJh7SMzI1r5AVdFpzZxH1Li9+m0rhXyIg+hiMQ="; }; + boringssl = { + rev = "29223ac349c144a4d0babc281644c0410dd1e313"; + hash = "sha256-0zOLcNJh7SMzI1r5AVdFpzZxH1Li9+m0rhXyIg+hiMQ="; + }; }; re2a801f6 = buildECTesterStandalone { - boringssl = { rev="e2a801f688dbdfac8fde90b849b1bf75f80b466c"; hash="sha256-me6iT8/l4uCeTPo0L6ID0GiUklFEiwR7JGOB+OhotLs="; }; + boringssl = { + rev = "e2a801f688dbdfac8fde90b849b1bf75f80b466c"; + hash = "sha256-me6iT8/l4uCeTPo0L6ID0GiUklFEiwR7JGOB+OhotLs="; + }; }; r39dd1e3c = buildECTesterStandalone { - boringssl = { rev="39dd1e3c904341ac14da80224d72a77d95501ad4"; hash="sha256-hyCIctgppjZmLquRQ7TfvOza9M5gUSPjkECeXIuhw/4="; }; + boringssl = { + rev = "39dd1e3c904341ac14da80224d72a77d95501ad4"; + hash = "sha256-hyCIctgppjZmLquRQ7TfvOza9M5gUSPjkECeXIuhw/4="; + }; }; r1385dbd5 = buildECTesterStandalone { - boringssl = { rev="1385dbd51dc2eeba39076687a6c9e45c7dc8965c"; hash="sha256-wutjtx+JxOdWOVxdwSDosQVAQag/u3KAlQqpUBSPkyk="; }; + boringssl = { + rev = "1385dbd51dc2eeba39076687a6c9e45c7dc8965c"; + hash = "sha256-wutjtx+JxOdWOVxdwSDosQVAQag/u3KAlQqpUBSPkyk="; + }; }; r2bc9245e = buildECTesterStandalone { - boringssl = { rev="2bc9245eb4b50bd9e6b8bd0aa4ac94b91eda997a"; hash="sha256-Wn1rWoaCIfNZuouxt9FPV8L0akTkgXULG68SGNyYDQM="; }; + boringssl = { + rev = "2bc9245eb4b50bd9e6b8bd0aa4ac94b91eda997a"; + hash = "sha256-Wn1rWoaCIfNZuouxt9FPV8L0akTkgXULG68SGNyYDQM="; + }; }; ra055b938 = buildECTesterStandalone { - boringssl = { rev="a055b93845a1b2a910919e21920e4bd1ce900841"; hash="sha256-ZjQC/pT8pdGMj1km4k9RPlMNB6FXkLStClfiazQJonI="; }; + boringssl = { + rev = "a055b93845a1b2a910919e21920e4bd1ce900841"; + hash = "sha256-ZjQC/pT8pdGMj1km4k9RPlMNB6FXkLStClfiazQJonI="; + }; }; rdec5989b = buildECTesterStandalone { - boringssl = { rev="dec5989b793c56ad4dd32173bd2d8595ca78b398"; hash="sha256-IRlarsuNbK7hBJ6W8bXqbHEfk0K9Gqy7h1uHZ1xazhI="; }; + boringssl = { + rev = "dec5989b793c56ad4dd32173bd2d8595ca78b398"; + hash = "sha256-IRlarsuNbK7hBJ6W8bXqbHEfk0K9Gqy7h1uHZ1xazhI="; + }; }; rc1d9ac02 = buildECTesterStandalone { - boringssl = { rev="c1d9ac02514a138129872a036e3f8a1074dcb8bd"; hash="sha256-C1+2oEyLY58IqeLD0G6kHs10cJvMt2AwfhMUEqb8Lt8="; }; + boringssl = { + rev = "c1d9ac02514a138129872a036e3f8a1074dcb8bd"; + hash = "sha256-C1+2oEyLY58IqeLD0G6kHs10cJvMt2AwfhMUEqb8Lt8="; + }; }; re1a860c3 = buildECTesterStandalone { - boringssl = { rev="e1a860c3745c77cb83228dde1b73fa62eaf43930"; hash="sha256-hVVyDOiPrmYFZVOEVPH+gQDdpAJQQXMpslyhXwRIESs="; }; + boringssl = { + rev = "e1a860c3745c77cb83228dde1b73fa62eaf43930"; + hash = "sha256-hVVyDOiPrmYFZVOEVPH+gQDdpAJQQXMpslyhXwRIESs="; + }; }; rfb1c75ca = buildECTesterStandalone { - boringssl = { rev="fb1c75caf8ba5d45a0f2c52facd36e4ad9289549"; hash="sha256-A4qrMxsfBMpkTl+GbhIp6tfa4ArbwYUy+wdl3M01kMI="; }; + boringssl = { + rev = "fb1c75caf8ba5d45a0f2c52facd36e4ad9289549"; + hash = "sha256-A4qrMxsfBMpkTl+GbhIp6tfa4ArbwYUy+wdl3M01kMI="; + }; }; re491eeb6 = buildECTesterStandalone { - boringssl = { rev="e491eeb610fcc69b98bc6d1ba08faf78655808f6"; hash="sha256-5Ju7KKWLJheH9E7aicjJEMCzrky1/6bhV8OsARsrK0U="; }; + boringssl = { + rev = "e491eeb610fcc69b98bc6d1ba08faf78655808f6"; + hash = "sha256-5Ju7KKWLJheH9E7aicjJEMCzrky1/6bhV8OsARsrK0U="; + }; }; ra11277e1 = buildECTesterStandalone { - boringssl = { rev="a11277e187e407d0ef403b8a60d9a32eaab7d301"; hash="sha256-7RsYw9E4fQgy5bdLviRIqLZE3/kbkOQmI+SCGgyCeuo="; }; + boringssl = { + rev = "a11277e187e407d0ef403b8a60d9a32eaab7d301"; + hash = "sha256-7RsYw9E4fQgy5bdLviRIqLZE3/kbkOQmI+SCGgyCeuo="; + }; }; r25cf1bb9 = buildECTesterStandalone { - boringssl = { rev="25cf1bb965ba9ae0302cbc6de4ff4dd6cdbbc016"; hash="sha256-suA9B4DZyRrSKCSrJifvYbRC923GstqPr8qLzUPmyfk="; }; + boringssl = { + rev = "25cf1bb965ba9ae0302cbc6de4ff4dd6cdbbc016"; + hash = "sha256-suA9B4DZyRrSKCSrJifvYbRC923GstqPr8qLzUPmyfk="; + }; }; rc8100f0f = buildECTesterStandalone { - boringssl = { rev="c8100f0f0d05c5185d58113e12a867ae0771a6c9"; hash="sha256-oTa8ZyNJH86rWRlq2+wOl6cc0MFm/yD0N3RK0/8t91Q="; }; + boringssl = { + rev = "c8100f0f0d05c5185d58113e12a867ae0771a6c9"; + hash = "sha256-oTa8ZyNJH86rWRlq2+wOl6cc0MFm/yD0N3RK0/8t91Q="; + }; }; r1eda2363 = buildECTesterStandalone { - boringssl = { rev="1eda2363f9e79aaa5febe91d31b6756ae4f24f30"; hash="sha256-zQ+y78EaZ36yeCi/pk9v7W7M2t5yPLpEO0QXyxtKJ0g="; }; + boringssl = { + rev = "1eda2363f9e79aaa5febe91d31b6756ae4f24f30"; + hash = "sha256-zQ+y78EaZ36yeCi/pk9v7W7M2t5yPLpEO0QXyxtKJ0g="; + }; }; r261579f0 = buildECTesterStandalone { - boringssl = { rev="261579f08b2f8aa7959670df1e928c1c305a632c"; hash="sha256-fnnCC4JcUtp3i3rTVbKAzzH/6YX8ZHXzv86oC9o61Tg="; }; + boringssl = { + rev = "261579f08b2f8aa7959670df1e928c1c305a632c"; + hash = "sha256-fnnCC4JcUtp3i3rTVbKAzzH/6YX8ZHXzv86oC9o61Tg="; + }; }; r9540c045 = buildECTesterStandalone { - boringssl = { rev="9540c0452343e684f94515288880b6b35655f792"; hash="sha256-7y6OxtmpHp3N48RRqP6us3twYHB/JGE5ElCxhxXOXCk="; }; + boringssl = { + rev = "9540c0452343e684f94515288880b6b35655f792"; + hash = "sha256-7y6OxtmpHp3N48RRqP6us3twYHB/JGE5ElCxhxXOXCk="; + }; }; red3f05a6 = buildECTesterStandalone { - boringssl = { rev="ed3f05a6794adfd39937d0027afefad8f6afcae9"; hash="sha256-dL2IJZIKYUoH9lnQMV6e95Ju9bl6D93JvLeio5waZrc="; }; + boringssl = { + rev = "ed3f05a6794adfd39937d0027afefad8f6afcae9"; + hash = "sha256-dL2IJZIKYUoH9lnQMV6e95Ju9bl6D93JvLeio5waZrc="; + }; }; r4a7815c9 = buildECTesterStandalone { - boringssl = { rev="4a7815c94077eebb3546fc287d1fa0e1356a2cd0"; hash="sha256-PWwhREqN/KUSNX7A+8sGJHd2ZUI+WsLW3+eVFBsLjN8="; }; + boringssl = { + rev = "4a7815c94077eebb3546fc287d1fa0e1356a2cd0"; + hash = "sha256-PWwhREqN/KUSNX7A+8sGJHd2ZUI+WsLW3+eVFBsLjN8="; + }; }; r5326e94d = buildECTesterStandalone { - boringssl = { rev="5326e94dd188beba0a5e536b1d2723aee65bd85d"; hash="sha256-FzKzPLXG9IiqtS1xzY/8Rkrs064YaZcISKADI1bwgP0="; }; + boringssl = { + rev = "5326e94dd188beba0a5e536b1d2723aee65bd85d"; + hash = "sha256-FzKzPLXG9IiqtS1xzY/8Rkrs064YaZcISKADI1bwgP0="; + }; }; re09fcf83 = buildECTesterStandalone { - boringssl = { rev="e09fcf8302f75dc50afcfe40f0d59a92b40a3c2e"; hash="sha256-S2/UyMz3xuQTwO5sXx9l+871q/aIvQVq9ezSOPTveUE="; }; + boringssl = { + rev = "e09fcf8302f75dc50afcfe40f0d59a92b40a3c2e"; + hash = "sha256-S2/UyMz3xuQTwO5sXx9l+871q/aIvQVq9ezSOPTveUE="; + }; }; rafd52e91 = buildECTesterStandalone { - boringssl = { rev="afd52e91dfed27ab7193be040f067900947b14ac"; hash="sha256-wi5sQnj631WuCLmDLa0DrM6GJoVKBsI4NUaXeREIEeo="; }; + boringssl = { + rev = "afd52e91dfed27ab7193be040f067900947b14ac"; + hash = "sha256-wi5sQnj631WuCLmDLa0DrM6GJoVKBsI4NUaXeREIEeo="; + }; }; re95b0cad = buildECTesterStandalone { - boringssl = { rev="e95b0cad901abd49755d2a2a2f1f6c3e87d12b94"; hash="sha256-xv3Q30yLrM0l8oDtyLxnfLGH1ZnfHs6F6XEJHjgu6Dw="; }; + boringssl = { + rev = "e95b0cad901abd49755d2a2a2f1f6c3e87d12b94"; + hash = "sha256-xv3Q30yLrM0l8oDtyLxnfLGH1ZnfHs6F6XEJHjgu6Dw="; + }; }; r13aa2733 = buildECTesterStandalone { - boringssl = { rev="13aa27338663c62600249ece54c94f180d57bbb7"; hash="sha256-Wj2gBLAe/C0A6p20lwjc9xa/eo/8ukATxP8dwiRQgds="; }; + boringssl = { + rev = "13aa27338663c62600249ece54c94f180d57bbb7"; + hash = "sha256-Wj2gBLAe/C0A6p20lwjc9xa/eo/8ukATxP8dwiRQgds="; + }; }; r03982b4c = buildECTesterStandalone { - boringssl = { rev="03982b4cfadca0e650b384c9539b2fdb5f8aa012"; hash="sha256-CKd60IZM09YYxXyvrnGvv2z7ecWFsTX2u6rP+wOtCyg="; }; + boringssl = { + rev = "03982b4cfadca0e650b384c9539b2fdb5f8aa012"; + hash = "sha256-CKd60IZM09YYxXyvrnGvv2z7ecWFsTX2u6rP+wOtCyg="; + }; }; r273a920f = buildECTesterStandalone { - boringssl = { rev="273a920f84e8b0b258737cea0f2f24627e8c5ed9"; hash="sha256-fBvaQk2cJE57DRfTV9avEKG2A+MBzsNJeQLQX63kykQ="; }; + boringssl = { + rev = "273a920f84e8b0b258737cea0f2f24627e8c5ed9"; + hash = "sha256-fBvaQk2cJE57DRfTV9avEKG2A+MBzsNJeQLQX63kykQ="; + }; }; r9f7f4d03 = buildECTesterStandalone { - boringssl = { rev="9f7f4d033b03ae1b6e7b69c9e3bfb368f06a887d"; hash="sha256-op7ClsGIL/o1ulHquGq+Uegtn8auPONTs/uWn92ieGw="; }; + boringssl = { + rev = "9f7f4d033b03ae1b6e7b69c9e3bfb368f06a887d"; + hash = "sha256-op7ClsGIL/o1ulHquGq+Uegtn8auPONTs/uWn92ieGw="; + }; }; rd7278ceb = buildECTesterStandalone { - boringssl = { rev="d7278cebad5b8eda0901246f2215344cffece4f4"; hash="sha256-QzrhYKnZKtV9SFwMPW2Axvw9mg1HKg3m5XqOKsDPLGA="; }; + boringssl = { + rev = "d7278cebad5b8eda0901246f2215344cffece4f4"; + hash = "sha256-QzrhYKnZKtV9SFwMPW2Axvw9mg1HKg3m5XqOKsDPLGA="; + }; }; rbfcab2aa = buildECTesterStandalone { - boringssl = { rev="bfcab2aa518899ce71e7ffbc23bb22c4ef51858f"; hash="sha256-DZRdCZA1BTQgBb7WWQylfsI+5naekSj8fmzTL7NeXGY="; }; + boringssl = { + rev = "bfcab2aa518899ce71e7ffbc23bb22c4ef51858f"; + hash = "sha256-DZRdCZA1BTQgBb7WWQylfsI+5naekSj8fmzTL7NeXGY="; + }; }; r68c29a24 = buildECTesterStandalone { - boringssl = { rev="68c29a24ee6c9c70ecce56766ca70b115aad768f"; hash="sha256-yf5eELIkNrJepihcf4SMg78wM8GpNGCgLZIYujHHlRo="; }; + boringssl = { + rev = "68c29a24ee6c9c70ecce56766ca70b115aad768f"; + hash = "sha256-yf5eELIkNrJepihcf4SMg78wM8GpNGCgLZIYujHHlRo="; + }; }; rde6ba216 = buildECTesterStandalone { - boringssl = { rev="de6ba216656b819d4d8de7602006561f82a8c669"; hash="sha256-U4d7K/3YDXOaUGtdJ56YMZ3o7Pb4rUoigo88+/m8oV4="; }; + boringssl = { + rev = "de6ba216656b819d4d8de7602006561f82a8c669"; + hash = "sha256-U4d7K/3YDXOaUGtdJ56YMZ3o7Pb4rUoigo88+/m8oV4="; + }; }; r29c9e64c = buildECTesterStandalone { - boringssl = { rev="29c9e64ce548ff8278e9d98aa53f611f115c2bed"; hash="sha256-29Qkg39XceB0LMHAvFkhbkg9jxlNbiPaSgXjKQ6e5c4="; }; + boringssl = { + rev = "29c9e64ce548ff8278e9d98aa53f611f115c2bed"; + hash = "sha256-29Qkg39XceB0LMHAvFkhbkg9jxlNbiPaSgXjKQ6e5c4="; + }; }; r58745d61 = buildECTesterStandalone { - boringssl = { rev="58745d61afe244a37941d391f5dec3ab08f5cf2c"; hash="sha256-IcfvFmoFoxzorWfKdPfcKLpqmNflqFFR5mxZ5y3fSIQ="; }; + boringssl = { + rev = "58745d61afe244a37941d391f5dec3ab08f5cf2c"; + hash = "sha256-IcfvFmoFoxzorWfKdPfcKLpqmNflqFFR5mxZ5y3fSIQ="; + }; }; rc798e3a5 = buildECTesterStandalone { - boringssl = { rev="c798e3a54912a1bfbf1c846630e2bb86e9b543a7"; hash="sha256-sBDyJuTz8yHcSwDgrXlKjQqvuifaXegb3qwqH0naGig="; }; + boringssl = { + rev = "c798e3a54912a1bfbf1c846630e2bb86e9b543a7"; + hash = "sha256-sBDyJuTz8yHcSwDgrXlKjQqvuifaXegb3qwqH0naGig="; + }; }; rba62c812 = buildECTesterStandalone { - boringssl = { rev="ba62c812f01fb379f49f94a08a2d1282ce46e678"; hash="sha256-u0F0CNV5F6kIfTRnTXLIHXkQ5bOBEUAG/SUItU/g2vU="; }; + boringssl = { + rev = "ba62c812f01fb379f49f94a08a2d1282ce46e678"; + hash = "sha256-u0F0CNV5F6kIfTRnTXLIHXkQ5bOBEUAG/SUItU/g2vU="; + }; }; r2fb5f9cb = buildECTesterStandalone { - boringssl = { rev="2fb5f9cb8feec2234952f6999af941ac48555710"; hash="sha256-dS+ze7Pz8oB2rAFFODOZYD49N7ngea5GKKi76+MLNs8="; }; + boringssl = { + rev = "2fb5f9cb8feec2234952f6999af941ac48555710"; + hash = "sha256-dS+ze7Pz8oB2rAFFODOZYD49N7ngea5GKKi76+MLNs8="; + }; }; rd477c0d7 = buildECTesterStandalone { - boringssl = { rev="d477c0d7c40ddca3a64ae26fc02d2dac175836d3"; hash="sha256-CMLdmGoHH0KBqSLLsTfnWi9Cg5OJZyIZ85ftVjzfcag="; }; + boringssl = { + rev = "d477c0d7c40ddca3a64ae26fc02d2dac175836d3"; + hash = "sha256-CMLdmGoHH0KBqSLLsTfnWi9Cg5OJZyIZ85ftVjzfcag="; + }; }; rc7019036 = buildECTesterStandalone { - boringssl = { rev="c70190368c7040c37c1d655f0690bcde2b109a0d"; hash="sha256-elaaAg/eub/myMsfsN1SQ3AKKMMdduaGHdvU05jxnmE="; }; + boringssl = { + rev = "c70190368c7040c37c1d655f0690bcde2b109a0d"; + hash = "sha256-elaaAg/eub/myMsfsN1SQ3AKKMMdduaGHdvU05jxnmE="; + }; }; r7662e58e = buildECTesterStandalone { - boringssl = { rev="7662e58e3e0f6b6bcfd6e93ef8c83062096f22e2"; hash="sha256-N++DCJApfXa19xRH+u0WXPdfr1bXFwLEFOxT0wSfiF4="; }; + boringssl = { + rev = "7662e58e3e0f6b6bcfd6e93ef8c83062096f22e2"; + hash = "sha256-N++DCJApfXa19xRH+u0WXPdfr1bXFwLEFOxT0wSfiF4="; + }; }; r0355048c = buildECTesterStandalone { - boringssl = { rev="0355048ce0302fdeb4744dae4b8a156a38496150"; hash="sha256-Cypt4iPc6ZJarXKVloUl7G+XfGSEunOCblTzakSjdIY="; }; + boringssl = { + rev = "0355048ce0302fdeb4744dae4b8a156a38496150"; + hash = "sha256-Cypt4iPc6ZJarXKVloUl7G+XfGSEunOCblTzakSjdIY="; + }; }; r3a01cba9 = buildECTesterStandalone { - boringssl = { rev="3a01cba9a5a133799dbb58b5fbf15d0ddfe23cee"; hash="sha256-2bVUZJToGg1xKKwPAKxCqQCucEccfk4wfZFSLQ3XDMk="; }; + boringssl = { + rev = "3a01cba9a5a133799dbb58b5fbf15d0ddfe23cee"; + hash = "sha256-2bVUZJToGg1xKKwPAKxCqQCucEccfk4wfZFSLQ3XDMk="; + }; }; r07f27b1d = buildECTesterStandalone { - boringssl = { rev="07f27b1d445a27433f2c871935da2cefcfbdb458"; hash="sha256-qWhcq7fcteKLlC/EG+/bkUew5UoNzBbkAvWDh22JC8A="; }; + boringssl = { + rev = "07f27b1d445a27433f2c871935da2cefcfbdb458"; + hash = "sha256-qWhcq7fcteKLlC/EG+/bkUew5UoNzBbkAvWDh22JC8A="; + }; }; rfc953df2 = buildECTesterStandalone { - boringssl = { rev="fc953df2352e1c1bcb34cb5f75a0e409014c1690"; hash="sha256-cxmSyN3FYc1/uC0qrf0SWbzzKikyQCNCYajlLldAxDU="; }; + boringssl = { + rev = "fc953df2352e1c1bcb34cb5f75a0e409014c1690"; + hash = "sha256-cxmSyN3FYc1/uC0qrf0SWbzzKikyQCNCYajlLldAxDU="; + }; }; r1a9edc3e = buildECTesterStandalone { - boringssl = { rev="1a9edc3e3b1024af4f6dc1ed6bb391510cb494ba"; hash="sha256-nYN7UhORegjNiH5XB+6wS+NPkxBtAXazps1KzNgyXnI="; }; + boringssl = { + rev = "1a9edc3e3b1024af4f6dc1ed6bb391510cb494ba"; + hash = "sha256-nYN7UhORegjNiH5XB+6wS+NPkxBtAXazps1KzNgyXnI="; + }; }; rb8912d71 = buildECTesterStandalone { - boringssl = { rev="b8912d713cb82a748bbe63f28f28b17632c70964"; hash="sha256-UJBdbyc0uv9NcAxKtVUh5L9FL35gk3PqVbRyxaUhbHc="; }; + boringssl = { + rev = "b8912d713cb82a748bbe63f28f28b17632c70964"; + hash = "sha256-UJBdbyc0uv9NcAxKtVUh5L9FL35gk3PqVbRyxaUhbHc="; + }; }; rb6bca9c6 = buildECTesterStandalone { - boringssl = { rev="b6bca9c6dde177f641137d2991aa677997c54c67"; hash="sha256-Qo/cW+FSCDoEDZClVZmlHurz3CbVN3iqYmpJwmANFcI="; }; + boringssl = { + rev = "b6bca9c6dde177f641137d2991aa677997c54c67"; + hash = "sha256-Qo/cW+FSCDoEDZClVZmlHurz3CbVN3iqYmpJwmANFcI="; + }; }; r03d1b7c5 = buildECTesterStandalone { - boringssl = { rev="03d1b7c544851d9f44df1e9ff21839742e08c819"; hash="sha256-bRmRC4iO1TdyKmb98inr9XNB0hna9z7iZg3CGEQPwIA="; }; + boringssl = { + rev = "03d1b7c544851d9f44df1e9ff21839742e08c819"; + hash = "sha256-bRmRC4iO1TdyKmb98inr9XNB0hna9z7iZg3CGEQPwIA="; + }; }; r6b36ad2b = buildECTesterStandalone { - boringssl = { rev="6b36ad2bd6001f17a997b7a1e0ab254b001438ef"; hash="sha256-bwu01bczIOLU93LYOJXRU0bZ5+a14eqEo8G6EVaXXzY="; }; + boringssl = { + rev = "6b36ad2bd6001f17a997b7a1e0ab254b001438ef"; + hash = "sha256-bwu01bczIOLU93LYOJXRU0bZ5+a14eqEo8G6EVaXXzY="; + }; }; r1d24e04c = buildECTesterStandalone { - boringssl = { rev="1d24e04c7143171ae2010c842e3e1438510fd1c0"; hash="sha256-fgsqIdp4ua4G1bpZflD/eRk7OLh+jlBn3gKmKoa5Qbc="; }; + boringssl = { + rev = "1d24e04c7143171ae2010c842e3e1438510fd1c0"; + hash = "sha256-fgsqIdp4ua4G1bpZflD/eRk7OLh+jlBn3gKmKoa5Qbc="; + }; }; r8a0da669 = buildECTesterStandalone { - boringssl = { rev="8a0da669a08b6c6b805fd7ec9d1e67694fda3711"; hash="sha256-kxx37r693eFZFyjTssS2KrSGYBjYb4hjNljc1wazAbc="; }; + boringssl = { + rev = "8a0da669a08b6c6b805fd7ec9d1e67694fda3711"; + hash = "sha256-kxx37r693eFZFyjTssS2KrSGYBjYb4hjNljc1wazAbc="; + }; }; r4d50a595 = buildECTesterStandalone { - boringssl = { rev="4d50a595b49a2e7b7017060a4d402c4ee9fe28a2"; hash="sha256-nuPaIVPLUxQVrjOx5kfeWOq8XZfrP+wwnZc8gH/diGA="; }; + boringssl = { + rev = "4d50a595b49a2e7b7017060a4d402c4ee9fe28a2"; + hash = "sha256-nuPaIVPLUxQVrjOx5kfeWOq8XZfrP+wwnZc8gH/diGA="; + }; }; rd34f540e = buildECTesterStandalone { - boringssl = { rev="d34f540e57394de22a1599c3c5d852519d388d6c"; hash="sha256-4ErkViNNPnrqzoXjiTA0yRM22XhNIMsc6fLpBcVjjE0="; }; + boringssl = { + rev = "d34f540e57394de22a1599c3c5d852519d388d6c"; + hash = "sha256-4ErkViNNPnrqzoXjiTA0yRM22XhNIMsc6fLpBcVjjE0="; + }; }; re7d76da9 = buildECTesterStandalone { - boringssl = { rev="e7d76da920a1bd79b6ebc77e75b407cdf0a58962"; hash="sha256-mb7io8ljofKPKD4jlZjfqk8+SjiMrlLUrnWod2b9/v0="; }; + boringssl = { + rev = "e7d76da920a1bd79b6ebc77e75b407cdf0a58962"; + hash = "sha256-mb7io8ljofKPKD4jlZjfqk8+SjiMrlLUrnWod2b9/v0="; + }; }; r3efe2eb9 = buildECTesterStandalone { - boringssl = { rev="3efe2eb9e3dfb49cb110c53e3430caeae4599f52"; hash="sha256-i2xw3iE1EGNxWd43qKDum0z7Krfp30WqIoICQD4R45I="; }; + boringssl = { + rev = "3efe2eb9e3dfb49cb110c53e3430caeae4599f52"; + hash = "sha256-i2xw3iE1EGNxWd43qKDum0z7Krfp30WqIoICQD4R45I="; + }; }; r35a91094 = buildECTesterStandalone { - boringssl = { rev="35a910949d684aea8b86a8c42db76c4f43e31a96"; hash="sha256-vgtsVwEspe5gUDOwOHrchvwjfVC9lM4Ks0eFFQrzDMw="; }; + boringssl = { + rev = "35a910949d684aea8b86a8c42db76c4f43e31a96"; + hash = "sha256-vgtsVwEspe5gUDOwOHrchvwjfVC9lM4Ks0eFFQrzDMw="; + }; }; r8e6aa7f3 = buildECTesterStandalone { - boringssl = { rev="8e6aa7f39f4357a6ad15944884f72db8d25b9dff"; hash="sha256-Tdm9SExUr/YsxIbV9GsUqlTZpFZMAAlbUv/u7+GuE+M="; }; + boringssl = { + rev = "8e6aa7f39f4357a6ad15944884f72db8d25b9dff"; + hash = "sha256-Tdm9SExUr/YsxIbV9GsUqlTZpFZMAAlbUv/u7+GuE+M="; + }; }; r7c44f450 = buildECTesterStandalone { - boringssl = { rev="7c44f450547cc777229462c2ac864a9326c0106c"; hash="sha256-snkPY4R9RKdCI0yUS3ICn4CHyXE9DKaYaHAggD2UAOk="; }; + boringssl = { + rev = "7c44f450547cc777229462c2ac864a9326c0106c"; + hash = "sha256-snkPY4R9RKdCI0yUS3ICn4CHyXE9DKaYaHAggD2UAOk="; + }; }; r6ab7c148 = buildECTesterStandalone { - boringssl = { rev="6ab7c1482bf4cdc91c87bc512aaf68ffb18975ec"; hash="sha256-+5ICkcKZRXCSC/y5d5Oo9WtcgdfkLZL/goGXE6V/9hE="; }; + boringssl = { + rev = "6ab7c1482bf4cdc91c87bc512aaf68ffb18975ec"; + hash = "sha256-+5ICkcKZRXCSC/y5d5Oo9WtcgdfkLZL/goGXE6V/9hE="; + }; }; rb17231cd = buildECTesterStandalone { - boringssl = { rev="b17231cdb9ec4e877b470c57d3280d9195811cd9"; hash="sha256-5G/wh35qlfGi6vHEj51QFyIryzKeTiGthfTe7tCWK8s="; }; + boringssl = { + rev = "b17231cdb9ec4e877b470c57d3280d9195811cd9"; + hash = "sha256-5G/wh35qlfGi6vHEj51QFyIryzKeTiGthfTe7tCWK8s="; + }; }; r3e89a7e8 = buildECTesterStandalone { - boringssl = { rev="3e89a7e8db8139db356b892ca9993172346c80cf"; hash="sha256-VsTll0A8FfNbObOnoFLah4BMuCzlLNbqOEgSbppQo7k="; }; + boringssl = { + rev = "3e89a7e8db8139db356b892ca9993172346c80cf"; + hash = "sha256-VsTll0A8FfNbObOnoFLah4BMuCzlLNbqOEgSbppQo7k="; + }; }; r8de798be = buildECTesterStandalone { - boringssl = { rev="8de798be4b850cf88ad2c50602abe2ca3bb285df"; hash="sha256-pQ8BTRMOjxLu8UoyTH23wYwy2pC29yZoCyl1c+94hyM="; }; + boringssl = { + rev = "8de798be4b850cf88ad2c50602abe2ca3bb285df"; + hash = "sha256-pQ8BTRMOjxLu8UoyTH23wYwy2pC29yZoCyl1c+94hyM="; + }; }; rd2e3212d = buildECTesterStandalone { - boringssl = { rev="d2e3212de29bac1ceed33ca8ab8bbff3f41a2459"; hash="sha256-HRa+IdVwchzjJh1Unx8wmu++eiFtY7ctdmwgjJqkx9Y="; }; + boringssl = { + rev = "d2e3212de29bac1ceed33ca8ab8bbff3f41a2459"; + hash = "sha256-HRa+IdVwchzjJh1Unx8wmu++eiFtY7ctdmwgjJqkx9Y="; + }; }; r783ae722 = buildECTesterStandalone { - boringssl = { rev="783ae722ed307a3b3782cd253fd4ffb387f38767"; hash="sha256-bdhCbLFmXOl07F/yjeYpnoM41F7EkaWDRG45cNOSnVo="; }; + boringssl = { + rev = "783ae722ed307a3b3782cd253fd4ffb387f38767"; + hash = "sha256-bdhCbLFmXOl07F/yjeYpnoM41F7EkaWDRG45cNOSnVo="; + }; }; r2db0eb3f = buildECTesterStandalone { - boringssl = { rev="2db0eb3f96a5756298dcd7f9319e56a98585bd10"; hash="sha256-+G7BcdtU8AeNMY4NLQgKpgF28/CS9FIjf+vaOd+Wf6o="; }; + boringssl = { + rev = "2db0eb3f96a5756298dcd7f9319e56a98585bd10"; + hash = "sha256-+G7BcdtU8AeNMY4NLQgKpgF28/CS9FIjf+vaOd+Wf6o="; + }; }; r70d05d5a = buildECTesterStandalone { - boringssl = { rev="70d05d5a34f6366116e2b0a530ea8d0186bb2a8e"; hash="sha256-aEtH4Efvt+zRGvUD9JAsBU+EfZySk8gU05fek5rbcbM="; }; + boringssl = { + rev = "70d05d5a34f6366116e2b0a530ea8d0186bb2a8e"; + hash = "sha256-aEtH4Efvt+zRGvUD9JAsBU+EfZySk8gU05fek5rbcbM="; + }; }; } diff --git a/nix/boringsslshim.nix b/nix/boringsslshim.nix index 3969381..a5e7fbd 100644 --- a/nix/boringsslshim.nix +++ b/nix/boringsslshim.nix @@ -1,8 +1,6 @@ -{ - pkgs - , boringssl -}: -with pkgs; stdenv.mkDerivation { +{ pkgs, boringssl }: +with pkgs; +stdenv.mkDerivation { name = "BoringSSLShim"; src = ../standalone/src/main/resources/cz/crcs/ectester/standalone/libs/jni; diff --git a/nix/botan_pkg_versions.nix b/nix/botan_pkg_versions.nix index 66b0db5..254bca9 100644 --- a/nix/botan_pkg_versions.nix +++ b/nix/botan_pkg_versions.nix @@ -1,122 +1,276 @@ +{ buildECTesterStandalone }: { - buildECTesterStandalone -}: -{ v200 = buildECTesterStandalone { - botan = { version="2.0.0"; source_extension="tgz"; hash="sha256-AxZZzKD4CGnp2XogkX7b4hZM7bwHnoxT4Oe9m+oVNxo="; }; - }; + botan = { + version = "2.0.0"; + source_extension = "tgz"; + hash = "sha256-AxZZzKD4CGnp2XogkX7b4hZM7bwHnoxT4Oe9m+oVNxo="; + }; + }; v201 = buildECTesterStandalone { - botan = { version="2.0.1"; source_extension="tgz"; hash="sha256-oTjtMW0RRQqEBUUbnJZkuOZAqbethNPzrTToBx82Tgs="; }; - }; + botan = { + version = "2.0.1"; + source_extension = "tgz"; + hash = "sha256-oTjtMW0RRQqEBUUbnJZkuOZAqbethNPzrTToBx82Tgs="; + }; + }; v210 = buildECTesterStandalone { - botan = { version="2.1.0"; source_extension="tgz"; hash="sha256-Rg8tcgWu0RP4mN9JR7H2bM+NCA7sfawinvC3VMmtYpQ="; }; - }; + botan = { + version = "2.1.0"; + source_extension = "tgz"; + hash = "sha256-Rg8tcgWu0RP4mN9JR7H2bM+NCA7sfawinvC3VMmtYpQ="; + }; + }; v2100 = buildECTesterStandalone { - botan = { version="2.10.0"; source_extension="tgz"; hash="sha256-iEgZl1eMJ5JHJP6nZhDUPZ9ZyZ7f5WHUGAO7yYhxrTE="; }; - }; + botan = { + version = "2.10.0"; + source_extension = "tgz"; + hash = "sha256-iEgZl1eMJ5JHJP6nZhDUPZ9ZyZ7f5WHUGAO7yYhxrTE="; + }; + }; v2110 = buildECTesterStandalone { - botan = { version="2.11.0"; source_extension="tar.xz"; hash="sha256-94dNoq64wBj9d99AshN4eb+Qtm9ViUkMmR6D+z6AlL4="; }; - }; + botan = { + version = "2.11.0"; + source_extension = "tar.xz"; + hash = "sha256-94dNoq64wBj9d99AshN4eb+Qtm9ViUkMmR6D+z6AlL4="; + }; + }; v2120 = buildECTesterStandalone { - botan = { version="2.12.0"; source_extension="tar.xz"; hash="sha256-Hq79RZ1S8n3hgFz/jGh5LgYQkZZI7pjhAZgOlO25CmM="; }; - }; + botan = { + version = "2.12.0"; + source_extension = "tar.xz"; + hash = "sha256-Hq79RZ1S8n3hgFz/jGh5LgYQkZZI7pjhAZgOlO25CmM="; + }; + }; v2121 = buildECTesterStandalone { - botan = { version="2.12.1"; source_extension="tar.xz"; hash="sha256-fgNfFCpR/KE1lwV5JieigkVtSXSb9io3qOSDddQbqqk="; }; - }; + botan = { + version = "2.12.1"; + source_extension = "tar.xz"; + hash = "sha256-fgNfFCpR/KE1lwV5JieigkVtSXSb9io3qOSDddQbqqk="; + }; + }; v2130 = buildECTesterStandalone { - botan = { version="2.13.0"; source_extension="tar.xz"; hash="sha256-9XrkKkHhCRvKWPRPQa3evZo5C2UWA5UsiB7InVAYfpA="; }; - }; + botan = { + version = "2.13.0"; + source_extension = "tar.xz"; + hash = "sha256-9XrkKkHhCRvKWPRPQa3evZo5C2UWA5UsiB7InVAYfpA="; + }; + }; v2140 = buildECTesterStandalone { - botan = { version="2.14.0"; source_extension="tar.xz"; hash="sha256-DBDxK0JKQO4ZveACkgmOIB10mFNcBi2NW1htB4YaVLU="; }; - }; + botan = { + version = "2.14.0"; + source_extension = "tar.xz"; + hash = "sha256-DBDxK0JKQO4ZveACkgmOIB10mFNcBi2NW1htB4YaVLU="; + }; + }; v2150 = buildECTesterStandalone { - botan = { version="2.15.0"; source_extension="tar.xz"; hash="sha256-2IrxMH8f76x5qk8vUkaZR41pzhWoV88tCpCsa/KlAAk="; }; - }; + botan = { + version = "2.15.0"; + source_extension = "tar.xz"; + hash = "sha256-2IrxMH8f76x5qk8vUkaZR41pzhWoV88tCpCsa/KlAAk="; + }; + }; v2160 = buildECTesterStandalone { - botan = { version="2.16.0"; source_extension="tar.xz"; hash="sha256-ku1uvJGNhr0bBCIcpRivTPKcwybEdgdAvS0i5hzqJig="; }; - }; + botan = { + version = "2.16.0"; + source_extension = "tar.xz"; + hash = "sha256-ku1uvJGNhr0bBCIcpRivTPKcwybEdgdAvS0i5hzqJig="; + }; + }; v2170 = buildECTesterStandalone { - botan = { version="2.17.0"; source_extension="tar.xz"; hash="sha256-uXBEsxKqcYNJr3hRMxsGS8e9U1JADV+AeTus5CfQE0M="; }; - }; + botan = { + version = "2.17.0"; + source_extension = "tar.xz"; + hash = "sha256-uXBEsxKqcYNJr3hRMxsGS8e9U1JADV+AeTus5CfQE0M="; + }; + }; v2171 = buildECTesterStandalone { - botan = { version="2.17.1"; source_extension="tar.xz"; hash="sha256-dBNYs/FjjtfZsvWbTjRKpG9JZrFZWLVDTArBWA3wwME="; }; - }; + botan = { + version = "2.17.1"; + source_extension = "tar.xz"; + hash = "sha256-dBNYs/FjjtfZsvWbTjRKpG9JZrFZWLVDTArBWA3wwME="; + }; + }; v2172 = buildECTesterStandalone { - botan = { version="2.17.2"; source_extension="tar.xz"; hash="sha256-6+J9/itV1+Ar9SDpJmBsSLdrIvrLSDJWsTqzjgGOHmw="; }; - }; + botan = { + version = "2.17.2"; + source_extension = "tar.xz"; + hash = "sha256-6+J9/itV1+Ar9SDpJmBsSLdrIvrLSDJWsTqzjgGOHmw="; + }; + }; v2173 = buildECTesterStandalone { - botan = { version="2.17.3"; source_extension="tar.xz"; hash="sha256-eRI7ZURFpKu6SG4JpDF4hUXHCCNzgqPnZWZMn1WwO4g="; }; - }; + botan = { + version = "2.17.3"; + source_extension = "tar.xz"; + hash = "sha256-eRI7ZURFpKu6SG4JpDF4hUXHCCNzgqPnZWZMn1WwO4g="; + }; + }; v2180 = buildECTesterStandalone { - botan = { version="2.18.0"; source_extension="tar.xz"; hash="sha256-zGSFLh4MW7MOzQUuShLVE2ElqM5cO+LvtvsGHIZ34yc="; }; - }; + botan = { + version = "2.18.0"; + source_extension = "tar.xz"; + hash = "sha256-zGSFLh4MW7MOzQUuShLVE2ElqM5cO+LvtvsGHIZ34yc="; + }; + }; v2181 = buildECTesterStandalone { - botan = { version="2.18.1"; source_extension="tar.xz"; hash="sha256-+Me0YiKoVxaKdUpcwym7eAUEEisnABjdpTBMmNsorik="; }; - }; + botan = { + version = "2.18.1"; + source_extension = "tar.xz"; + hash = "sha256-+Me0YiKoVxaKdUpcwym7eAUEEisnABjdpTBMmNsorik="; + }; + }; v2182 = buildECTesterStandalone { - botan = { version="2.18.2"; source_extension="tar.xz"; hash="sha256-VBo7E/G50w+XfGwa5Me/39p2PNpuRN6Ac2nc559CMH4="; }; - }; + botan = { + version = "2.18.2"; + source_extension = "tar.xz"; + hash = "sha256-VBo7E/G50w+XfGwa5Me/39p2PNpuRN6Ac2nc559CMH4="; + }; + }; v2190 = buildECTesterStandalone { - botan = { version="2.19.0"; source_extension="tar.xz"; hash="sha256-JA2eVuasuR70zwaoocbA8QHGHUDPSMzPE5+u+CHXBAs="; }; - }; + botan = { + version = "2.19.0"; + source_extension = "tar.xz"; + hash = "sha256-JA2eVuasuR70zwaoocbA8QHGHUDPSMzPE5+u+CHXBAs="; + }; + }; v2191 = buildECTesterStandalone { - botan = { version="2.19.1"; source_extension="tar.xz"; hash="sha256-4m4Az+/aZAgq/dVA08U3kk9kXWpnSv7SzRcQBd7/VWA="; }; - }; + botan = { + version = "2.19.1"; + source_extension = "tar.xz"; + hash = "sha256-4m4Az+/aZAgq/dVA08U3kk9kXWpnSv7SzRcQBd7/VWA="; + }; + }; v2192 = buildECTesterStandalone { - botan = { version="2.19.2"; source_extension="tar.xz"; hash="sha256-OvXxdhXGtc2Lgy0mn7bLTVTsZPnrCd2/Gt1Qk5QbTXU="; }; - }; + botan = { + version = "2.19.2"; + source_extension = "tar.xz"; + hash = "sha256-OvXxdhXGtc2Lgy0mn7bLTVTsZPnrCd2/Gt1Qk5QbTXU="; + }; + }; v2193 = buildECTesterStandalone { - botan = { version="2.19.3"; source_extension="tar.xz"; hash="sha256-2uBH85nFpH8IfbXT2dno8RrkmF0UySjXHaGv+AGALVU="; }; - }; + botan = { + version = "2.19.3"; + source_extension = "tar.xz"; + hash = "sha256-2uBH85nFpH8IfbXT2dno8RrkmF0UySjXHaGv+AGALVU="; + }; + }; v2194 = buildECTesterStandalone { - botan = { version="2.19.4"; source_extension="tar.xz"; hash="sha256-WjqI72Qz6XvKsO+h7WDGGX5K2p2dMLwcR0N7+JuX8nY="; }; - }; + botan = { + version = "2.19.4"; + source_extension = "tar.xz"; + hash = "sha256-WjqI72Qz6XvKsO+h7WDGGX5K2p2dMLwcR0N7+JuX8nY="; + }; + }; v2195 = buildECTesterStandalone { - botan = { version="2.19.5"; source_extension="tar.xz"; hash="sha256-3+6g4KbybWckxK8B2pp7iEh62y2Bunxy/K9S21IsmtQ="; }; - }; + botan = { + version = "2.19.5"; + source_extension = "tar.xz"; + hash = "sha256-3+6g4KbybWckxK8B2pp7iEh62y2Bunxy/K9S21IsmtQ="; + }; + }; v220 = buildECTesterStandalone { - botan = { version="2.2.0"; source_extension="tgz"; hash="sha256-x5TbLsRvb/iPN652gl8MJY8HiAuGW2cHsmrPzEVnuCQ="; }; - }; + botan = { + version = "2.2.0"; + source_extension = "tgz"; + hash = "sha256-x5TbLsRvb/iPN652gl8MJY8HiAuGW2cHsmrPzEVnuCQ="; + }; + }; v230 = buildECTesterStandalone { - botan = { version="2.3.0"; source_extension="tgz"; hash="sha256-Oflw/uWYakw+QlAwrvUKwoTaGFlsAE0anM52iMTm1Hw="; }; - }; + botan = { + version = "2.3.0"; + source_extension = "tgz"; + hash = "sha256-Oflw/uWYakw+QlAwrvUKwoTaGFlsAE0anM52iMTm1Hw="; + }; + }; v240 = buildECTesterStandalone { - botan = { version="2.4.0"; source_extension="tgz"; hash="sha256-7ZRk4qXP7kzT2b16j4BnO0XIoHGNshgac/VGWmBmCKU="; }; - }; + botan = { + version = "2.4.0"; + source_extension = "tgz"; + hash = "sha256-7ZRk4qXP7kzT2b16j4BnO0XIoHGNshgac/VGWmBmCKU="; + }; + }; v250 = buildECTesterStandalone { - botan = { version="2.5.0"; source_extension="tgz"; hash="sha256-uKMf4D5/BIpb05Z+zQS2pIlmIV54eS3wbjM7Du3k+xs="; }; - }; + botan = { + version = "2.5.0"; + source_extension = "tgz"; + hash = "sha256-uKMf4D5/BIpb05Z+zQS2pIlmIV54eS3wbjM7Du3k+xs="; + }; + }; v260 = buildECTesterStandalone { - botan = { version="2.6.0"; source_extension="tgz"; hash="sha256-wfJhVVu6cCxzYI3ee9dD7y1jd6QaHClZFbJcW6uvXMU="; }; - }; + botan = { + version = "2.6.0"; + source_extension = "tgz"; + hash = "sha256-wfJhVVu6cCxzYI3ee9dD7y1jd6QaHClZFbJcW6uvXMU="; + }; + }; v270 = buildECTesterStandalone { - botan = { version="2.7.0"; source_extension="tgz"; hash="sha256-5C35FVYxdYjGyg5Bv3lvm9XsXHDgZo5sl8YIxpfCSpA="; }; - }; + botan = { + version = "2.7.0"; + source_extension = "tgz"; + hash = "sha256-5C35FVYxdYjGyg5Bv3lvm9XsXHDgZo5sl8YIxpfCSpA="; + }; + }; v280 = buildECTesterStandalone { - botan = { version="2.8.0"; source_extension="tgz"; hash="sha256-5xWbEn6R4MFYJF1hxjjFDUQ+x7RAtrAWEyjEezq6OWA="; }; - }; + botan = { + version = "2.8.0"; + source_extension = "tgz"; + hash = "sha256-5xWbEn6R4MFYJF1hxjjFDUQ+x7RAtrAWEyjEezq6OWA="; + }; + }; v290 = buildECTesterStandalone { - botan = { version="2.9.0"; source_extension="tgz"; hash="sha256-MFVkNSM03WOuY9sDkHfZauUt+lejJIhxCBcZtqny0Rk="; }; - }; + botan = { + version = "2.9.0"; + source_extension = "tgz"; + hash = "sha256-MFVkNSM03WOuY9sDkHfZauUt+lejJIhxCBcZtqny0Rk="; + }; + }; v300 = buildECTesterStandalone { - botan = { version="3.0.0"; source_extension="tar.xz"; hash="sha256-XaVS4A+hwEepDCLrXwJH7CfnQytot44Qp84JVSacytc="; }; - }; + botan = { + version = "3.0.0"; + source_extension = "tar.xz"; + hash = "sha256-XaVS4A+hwEepDCLrXwJH7CfnQytot44Qp84JVSacytc="; + }; + }; v310 = buildECTesterStandalone { - botan = { version="3.1.0"; source_extension="tar.xz"; hash="sha256-ThjnVai7xr+W+skW+/By7NBnQMcqcgF8JxYuTAtHJf4="; }; - }; + botan = { + version = "3.1.0"; + source_extension = "tar.xz"; + hash = "sha256-ThjnVai7xr+W+skW+/By7NBnQMcqcgF8JxYuTAtHJf4="; + }; + }; v311 = buildECTesterStandalone { - botan = { version="3.1.1"; source_extension="tar.xz"; hash="sha256-MMhP6RmTapj+9TMfJGxiqiwOTSCFstRREgf2ogr6Oms="; }; - }; + botan = { + version = "3.1.1"; + source_extension = "tar.xz"; + hash = "sha256-MMhP6RmTapj+9TMfJGxiqiwOTSCFstRREgf2ogr6Oms="; + }; + }; v320 = buildECTesterStandalone { - botan = { version="3.2.0"; source_extension="tar.xz"; hash="sha256-BJyEeDX89u86niBrM94F3TiZnDJeJHSCdypVmNnl7OM="; }; - }; + botan = { + version = "3.2.0"; + source_extension = "tar.xz"; + hash = "sha256-BJyEeDX89u86niBrM94F3TiZnDJeJHSCdypVmNnl7OM="; + }; + }; v330 = buildECTesterStandalone { - botan = { version="3.3.0"; source_extension="tar.xz"; hash="sha256-No8R9CbxIFrtuenjI2ihZTXcEb1gNRBm5vZmTsNrhbk="; }; - }; + botan = { + version = "3.3.0"; + source_extension = "tar.xz"; + hash = "sha256-No8R9CbxIFrtuenjI2ihZTXcEb1gNRBm5vZmTsNrhbk="; + }; + }; v340 = buildECTesterStandalone { - botan = { version="3.4.0"; source_extension="tar.xz"; hash="sha256-cYQ6/MCixYX48z+jBPC1iuS5xdgwb4lGZ7N0YEQndVc="; }; - }; + botan = { + version = "3.4.0"; + source_extension = "tar.xz"; + hash = "sha256-cYQ6/MCixYX48z+jBPC1iuS5xdgwb4lGZ7N0YEQndVc="; + }; + }; v350 = buildECTesterStandalone { - botan = { version="3.5.0"; source_extension="tar.xz"; hash="sha256-Z+ja4cokaNkN5OYByH1fMf9JKzjoq4vL0C3fcQTtip8="; }; - }; -}
\ No newline at end of file + botan = { + version = "3.5.0"; + source_extension = "tar.xz"; + hash = "sha256-Z+ja4cokaNkN5OYByH1fMf9JKzjoq4vL0C3fcQTtip8="; + }; + }; +} diff --git a/nix/botanshim.nix b/nix/botanshim.nix index 3711d1d..8688b20 100644 --- a/nix/botanshim.nix +++ b/nix/botanshim.nix @@ -1,9 +1,9 @@ -{ - stdenv - , botan2 - , pkg-config +{ + stdenv, + botan2, + pkg-config, # NOTE change to jdk17? - , jdk11_headless + jdk11_headless, }: stdenv.mkDerivation { name = "BotanShim"; diff --git a/nix/commonlibs.nix b/nix/commonlibs.nix index 525d4aa..dde4cca 100644 --- a/nix/commonlibs.nix +++ b/nix/commonlibs.nix @@ -1,7 +1,6 @@ -{ - pkgs -}: -with pkgs; stdenv.mkDerivation rec { +{ pkgs }: +with pkgs; +stdenv.mkDerivation rec { name = "Common Libraries"; src = ../standalone/src/main/resources/cz/crcs/ectester/standalone/libs/jni; diff --git a/nix/cryptopp_pkg_versions.nix b/nix/cryptopp_pkg_versions.nix index 781135b..a4b01e5 100644 --- a/nix/cryptopp_pkg_versions.nix +++ b/nix/cryptopp_pkg_versions.nix @@ -1,53 +1,99 @@ +{ buildECTesterStandalone }: { - buildECTesterStandalone -}: -{ v890 = buildECTesterStandalone { - cryptopp = { version="8_9_0"; hash="sha256-HV+afSFkiXdy840JbHBTR8lLL0GMwsN3QdwaoQmicpQ="; }; - }; + cryptopp = { + version = "8_9_0"; + hash = "sha256-HV+afSFkiXdy840JbHBTR8lLL0GMwsN3QdwaoQmicpQ="; + }; + }; v880 = buildECTesterStandalone { - cryptopp = { version="8_8_0"; hash="sha256-hg7g56bIYaXxB28nAmSQ7EP9NEwd1Psf/2GUtbC27oU="; }; - }; + cryptopp = { + version = "8_8_0"; + hash = "sha256-hg7g56bIYaXxB28nAmSQ7EP9NEwd1Psf/2GUtbC27oU="; + }; + }; v870 = buildECTesterStandalone { - cryptopp = { version="8_7_0"; hash="sha256-KtZXW7+J9a4uKHnK8sqj5WVaIjG3d6tzBBDxa7Wv4AE="; }; - }; + cryptopp = { + version = "8_7_0"; + hash = "sha256-KtZXW7+J9a4uKHnK8sqj5WVaIjG3d6tzBBDxa7Wv4AE="; + }; + }; v860 = buildECTesterStandalone { - cryptopp = { version="8_6_0"; hash="sha256-a3TYaK34WvKEXN7LKAfGwQ3ZL6a3k/zMZyyVfnkQqO4="; }; - }; + cryptopp = { + version = "8_6_0"; + hash = "sha256-a3TYaK34WvKEXN7LKAfGwQ3ZL6a3k/zMZyyVfnkQqO4="; + }; + }; v850 = buildECTesterStandalone { - cryptopp = { version="8_5_0"; hash="sha256-A7eoJNwIOSCrO7vXyA6JER4E18k8vRRKdDsk/BXNx0Y="; }; - }; + cryptopp = { + version = "8_5_0"; + hash = "sha256-A7eoJNwIOSCrO7vXyA6JER4E18k8vRRKdDsk/BXNx0Y="; + }; + }; v840 = buildECTesterStandalone { - cryptopp = { version="8_4_0"; hash="sha256-gxd3LtvtgwgE1bUQc9pXLT8/WFrQPm3ghIHAGqBHlr8="; }; - }; + cryptopp = { + version = "8_4_0"; + hash = "sha256-gxd3LtvtgwgE1bUQc9pXLT8/WFrQPm3ghIHAGqBHlr8="; + }; + }; v830 = buildECTesterStandalone { - cryptopp = { version="8_3_0"; hash="sha256-PHQol8Q7R0b63wiAf43nq+l+FcGItBzw65JZYSMf1ng="; }; - }; + cryptopp = { + version = "8_3_0"; + hash = "sha256-PHQol8Q7R0b63wiAf43nq+l+FcGItBzw65JZYSMf1ng="; + }; + }; v820 = buildECTesterStandalone { - cryptopp = { version="8_2_0"; hash="sha256-sg7MrjzuAfWRK0RNZ6xR6cUD6z6F/u/SmtCTYOXP+Qc="; }; - }; + cryptopp = { + version = "8_2_0"; + hash = "sha256-sg7MrjzuAfWRK0RNZ6xR6cUD6z6F/u/SmtCTYOXP+Qc="; + }; + }; v810 = buildECTesterStandalone { - cryptopp = { version="8_1_0"; hash="sha256-6SRr0Kv+iJrtEixJjb7Rbj/YdVa7vhW7u476FZLTymI="; }; - }; + cryptopp = { + version = "8_1_0"; + hash = "sha256-6SRr0Kv+iJrtEixJjb7Rbj/YdVa7vhW7u476FZLTymI="; + }; + }; v800 = buildECTesterStandalone { - cryptopp = { version="8_0_0"; hash="sha256-mq8xhse5xXbP0VcnNbnNz6xxLxJDIj8Gm3Pn/DEOt4w="; }; - }; + cryptopp = { + version = "8_0_0"; + hash = "sha256-mq8xhse5xXbP0VcnNbnNz6xxLxJDIj8Gm3Pn/DEOt4w="; + }; + }; v700 = buildECTesterStandalone { - cryptopp = { version="7_0_0"; hash="sha256-6m7ZnIBbOqthlX7I4uj/UvUgh1BEopNE02BC4pyMuU4="; }; - }; + cryptopp = { + version = "7_0_0"; + hash = "sha256-6m7ZnIBbOqthlX7I4uj/UvUgh1BEopNE02BC4pyMuU4="; + }; + }; v610 = buildECTesterStandalone { - cryptopp = { version="6_1_0"; hash="sha256-ZbercC0i/XhMhCYv54GwyIJuTygezD89/8HGeSKgkTo="; }; - }; + cryptopp = { + version = "6_1_0"; + hash = "sha256-ZbercC0i/XhMhCYv54GwyIJuTygezD89/8HGeSKgkTo="; + }; + }; v600 = buildECTesterStandalone { - cryptopp = { version="6_0_0"; hash="sha256-3IZpDOzlljFmYRfkw/Kxe8BiBxYkqM4zIF03FyNqC/E="; }; - }; + cryptopp = { + version = "6_0_0"; + hash = "sha256-3IZpDOzlljFmYRfkw/Kxe8BiBxYkqM4zIF03FyNqC/E="; + }; + }; v565 = buildECTesterStandalone { - cryptopp = { version="5_6_5"; hash="sha256-h+7LK8nzk1NlkVB4Loc9VQpN79SUFvBYESSpTZyXZ/o="; }; - }; + cryptopp = { + version = "5_6_5"; + hash = "sha256-h+7LK8nzk1NlkVB4Loc9VQpN79SUFvBYESSpTZyXZ/o="; + }; + }; v564 = buildECTesterStandalone { - cryptopp = { version="5_6_4"; hash="sha256-IgSRJAF+4lEFSXeboxktfG0iW+a72ZFp6Vibk5/qgz4="; }; - }; + cryptopp = { + version = "5_6_4"; + hash = "sha256-IgSRJAF+4lEFSXeboxktfG0iW+a72ZFp6Vibk5/qgz4="; + }; + }; v563 = buildECTesterStandalone { - cryptopp = { version="5_6_3"; hash="sha256-FDskGxaeACp7x3ZbgYXDr6PpFcPO0d6SEKVsOLIXbN0="; }; - }; -}
\ No newline at end of file + cryptopp = { + version = "5_6_3"; + hash = "sha256-FDskGxaeACp7x3ZbgYXDr6PpFcPO0d6SEKVsOLIXbN0="; + }; + }; +} diff --git a/nix/cryptoppshim.nix b/nix/cryptoppshim.nix index 1c3532c..8c735d7 100644 --- a/nix/cryptoppshim.nix +++ b/nix/cryptoppshim.nix @@ -1,8 +1,6 @@ -{ - pkgs - , cryptopp -}: -with pkgs; stdenv.mkDerivation { +{ pkgs, cryptopp }: +with pkgs; +stdenv.mkDerivation { name = "Crypto++ Shim"; src = ../standalone/src/main/resources/cz/crcs/ectester/standalone/libs/jni; diff --git a/nix/gcrypt_pkg_versions.nix b/nix/gcrypt_pkg_versions.nix index b0be7d7..d27bfae 100644 --- a/nix/gcrypt_pkg_versions.nix +++ b/nix/gcrypt_pkg_versions.nix @@ -1,180 +1,352 @@ +{ buildECTesterStandalone }: { - buildECTesterStandalone -}: -{ v1110 = buildECTesterStandalone { - gcrypt = { version="1.11.0"; hash="sha256-CRIMmGfOfyCB1qqhd1OGuYwvLyRhNXYarkfYH1hoW5w="; }; - }; + gcrypt = { + version = "1.11.0"; + hash = "sha256-CRIMmGfOfyCB1qqhd1OGuYwvLyRhNXYarkfYH1hoW5w="; + }; + }; v1103 = buildECTesterStandalone { - gcrypt = { version="1.10.3"; hash="sha256-iwhwiXrFrGfe1Wjc+t9Flpz6imvrD9YK8qnq3Coycqo="; }; - }; + gcrypt = { + version = "1.10.3"; + hash = "sha256-iwhwiXrFrGfe1Wjc+t9Flpz6imvrD9YK8qnq3Coycqo="; + }; + }; v1102 = buildECTesterStandalone { - gcrypt = { version="1.10.2"; hash="sha256-O5wCoAS2jCVq3ZlwHeALODrMzPNxd+DWxYKJZkzODAM="; }; - }; + gcrypt = { + version = "1.10.2"; + hash = "sha256-O5wCoAS2jCVq3ZlwHeALODrMzPNxd+DWxYKJZkzODAM="; + }; + }; v1101 = buildECTesterStandalone { - gcrypt = { version="1.10.1"; hash="sha256-7xSuVGsAhM2EJZ9hpV4Ho4w7U6/A9Ua//O8vAbr/6d4="; }; - }; + gcrypt = { + version = "1.10.1"; + hash = "sha256-7xSuVGsAhM2EJZ9hpV4Ho4w7U6/A9Ua//O8vAbr/6d4="; + }; + }; v1100 = buildECTesterStandalone { - gcrypt = { version="1.10.0"; hash="sha256-agD1wFyqTErMEgxGtjhX2g1P9h3EtLA5M/qNRgE/roE="; }; - }; + gcrypt = { + version = "1.10.0"; + hash = "sha256-agD1wFyqTErMEgxGtjhX2g1P9h3EtLA5M/qNRgE/roE="; + }; + }; v194 = buildECTesterStandalone { - gcrypt = { version="1.9.4"; hash="sha256-6oScg6ckVOPtQmdpfoygM5Cu6XKrQh599p3+QrZcqvc="; }; - }; + gcrypt = { + version = "1.9.4"; + hash = "sha256-6oScg6ckVOPtQmdpfoygM5Cu6XKrQh599p3+QrZcqvc="; + }; + }; v193 = buildECTesterStandalone { - gcrypt = { version="1.9.3"; hash="sha256-l+vk+U4vfjW3UhlM4VoPPGYyTg/2ryZlm7+1/y7DKP0="; }; - }; + gcrypt = { + version = "1.9.3"; + hash = "sha256-l+vk+U4vfjW3UhlM4VoPPGYyTg/2ryZlm7+1/y7DKP0="; + }; + }; v192 = buildECTesterStandalone { - gcrypt = { version="1.9.2"; hash="sha256-ssENCRUTsnHkcXcnRgex/7o9lbGIu/qHl/lIrskFPFo="; }; - }; + gcrypt = { + version = "1.9.2"; + hash = "sha256-ssENCRUTsnHkcXcnRgex/7o9lbGIu/qHl/lIrskFPFo="; + }; + }; v191 = buildECTesterStandalone { - gcrypt = { version="1.9.1"; hash="sha256-xaZ6i5sr03D7QV7R7jHHFy5Wgwdkk89KNnig+98CZdk="; }; - }; + gcrypt = { + version = "1.9.1"; + hash = "sha256-xaZ6i5sr03D7QV7R7jHHFy5Wgwdkk89KNnig+98CZdk="; + }; + }; # NOTE Do not use copied from the source https://gnupg.org/ftp/gcrypt/libgcrypt/ v190_do_not_use = buildECTesterStandalone { - gcrypt = { version="1.9.0"; hash="sha256-TZzKpfmdtZ68tk1z9iglsFzoprf4bRkXhVnvhN4Tgcs="; }; - }; + gcrypt = { + version = "1.9.0"; + hash = "sha256-TZzKpfmdtZ68tk1z9iglsFzoprf4bRkXhVnvhN4Tgcs="; + }; + }; v1811 = buildECTesterStandalone { - gcrypt = { version="1.8.11"; hash="sha256-yYJJ+1ux9gF/X5v0hDJ6lAtZB1vKfEb6aeu1QJgkmGA="; }; - }; + gcrypt = { + version = "1.8.11"; + hash = "sha256-yYJJ+1ux9gF/X5v0hDJ6lAtZB1vKfEb6aeu1QJgkmGA="; + }; + }; v1810 = buildECTesterStandalone { - gcrypt = { version="1.8.10"; hash="sha256-aJaRVQH5UeI9AtywRTRpwswiqk13oAH/c6JkfC0p590="; }; - }; + gcrypt = { + version = "1.8.10"; + hash = "sha256-aJaRVQH5UeI9AtywRTRpwswiqk13oAH/c6JkfC0p590="; + }; + }; v189 = buildECTesterStandalone { - gcrypt = { version="1.8.9"; hash="sha256-K9pHkKpfCJXTQHz3v2vXcn/ZkvJaRaY9kv7xB2f6N2k="; }; - }; + gcrypt = { + version = "1.8.9"; + hash = "sha256-K9pHkKpfCJXTQHz3v2vXcn/ZkvJaRaY9kv7xB2f6N2k="; + }; + }; v188 = buildECTesterStandalone { - gcrypt = { version="1.8.8"; hash="sha256-iV3iu5gd0Sfwgh0c4T+t99dg+fp3N2SLFfLB/hPMWvU="; }; - }; + gcrypt = { + version = "1.8.8"; + hash = "sha256-iV3iu5gd0Sfwgh0c4T+t99dg+fp3N2SLFfLB/hPMWvU="; + }; + }; v187 = buildECTesterStandalone { - gcrypt = { version="1.8.7"; hash="sha256-A7cPAoKZVhtwNLiWbX3XfvFu0TnENECSX+h4JWGXR0g="; }; - }; + gcrypt = { + version = "1.8.7"; + hash = "sha256-A7cPAoKZVhtwNLiWbX3XfvFu0TnENECSX+h4JWGXR0g="; + }; + }; v186 = buildECTesterStandalone { - gcrypt = { version="1.8.6"; hash="sha256-DLonAGF7mfwzhkoMFrH6f9+XgdntNQn112cXjl/XuXU="; }; - }; + gcrypt = { + version = "1.8.6"; + hash = "sha256-DLonAGF7mfwzhkoMFrH6f9+XgdntNQn112cXjl/XuXU="; + }; + }; v185 = buildECTesterStandalone { - gcrypt = { version="1.8.5"; hash="sha256-O0oqlMtjfv9b3rvK9G9NlcTyUgb0WYCTOc2toOtXesM="; }; - }; + gcrypt = { + version = "1.8.5"; + hash = "sha256-O0oqlMtjfv9b3rvK9G9NlcTyUgb0WYCTOc2toOtXesM="; + }; + }; v184 = buildECTesterStandalone { - gcrypt = { version="1.8.4"; hash="sha256-9jgUOgZyYo/eDK10XpsU3rhd/7F1cJyswfT+JLk/Iic="; }; - }; + gcrypt = { + version = "1.8.4"; + hash = "sha256-9jgUOgZyYo/eDK10XpsU3rhd/7F1cJyswfT+JLk/Iic="; + }; + }; v183 = buildECTesterStandalone { - gcrypt = { version="1.8.3"; hash="sha256-ZuyQvgNnR2AvK0j5gxI2GpGAyXxoppCl83b6D2fQr3w="; }; - }; + gcrypt = { + version = "1.8.3"; + hash = "sha256-ZuyQvgNnR2AvK0j5gxI2GpGAyXxoppCl83b6D2fQr3w="; + }; + }; v182 = buildECTesterStandalone { - gcrypt = { version="1.8.2"; hash="sha256-yAZMrnVYFEsT7w64cJNBI4DvoWxO4wrRLstUiGpSTAc="; }; - }; + gcrypt = { + version = "1.8.2"; + hash = "sha256-yAZMrnVYFEsT7w64cJNBI4DvoWxO4wrRLstUiGpSTAc="; + }; + }; v181 = buildECTesterStandalone { - gcrypt = { version="1.8.1"; hash="sha256-eih1+LGuAwFzLoeMDMoslmT/Ce9xQI8IXFDjMmVqeLM="; }; - }; + gcrypt = { + version = "1.8.1"; + hash = "sha256-eih1+LGuAwFzLoeMDMoslmT/Ce9xQI8IXFDjMmVqeLM="; + }; + }; v180 = buildECTesterStandalone { - gcrypt = { version="1.8.0"; hash="sha256-I+SWl7h8xBc7A7R1fI30MU4xSQWPoYvcT4IJjxA9iRs="; }; - }; + gcrypt = { + version = "1.8.0"; + hash = "sha256-I+SWl7h8xBc7A7R1fI30MU4xSQWPoYvcT4IJjxA9iRs="; + }; + }; v1710 = buildECTesterStandalone { - gcrypt = { version="1.7.10"; hash="sha256-ifBaQj3WaiXls4MICX4jhuZA0c+DUWDRmlx1NQBx2Uw="; }; - }; + gcrypt = { + version = "1.7.10"; + hash = "sha256-ifBaQj3WaiXls4MICX4jhuZA0c+DUWDRmlx1NQBx2Uw="; + }; + }; v179 = buildECTesterStandalone { - gcrypt = { version="1.7.9"; hash="sha256-v+m7cDwRJsNkfaKBD9IwOcLwnUaWn3FhLCBl3D+pNzs="; }; - }; + gcrypt = { + version = "1.7.9"; + hash = "sha256-v+m7cDwRJsNkfaKBD9IwOcLwnUaWn3FhLCBl3D+pNzs="; + }; + }; v178 = buildECTesterStandalone { - gcrypt = { version="1.7.8"; hash="sha256-lIJ26kfmugJE82oXtR3N1Sz9HmZLChrDvIITT7bOwZk="; }; - }; + gcrypt = { + version = "1.7.8"; + hash = "sha256-lIJ26kfmugJE82oXtR3N1Sz9HmZLChrDvIITT7bOwZk="; + }; + }; v177 = buildECTesterStandalone { - gcrypt = { version="1.7.7"; hash="sha256-ubheugeT6j5uZriW6wMfoF4aRRcnfMmrEIFrNZJUzZo="; }; - }; + gcrypt = { + version = "1.7.7"; + hash = "sha256-ubheugeT6j5uZriW6wMfoF4aRRcnfMmrEIFrNZJUzZo="; + }; + }; v176 = buildECTesterStandalone { - gcrypt = { version="1.7.6"; hash="sha256-Ymqv7oSvnSziU9LBQ9wcCQLdoEV4DMJB85lw/GC+Bbw="; }; - }; + gcrypt = { + version = "1.7.6"; + hash = "sha256-Ymqv7oSvnSziU9LBQ9wcCQLdoEV4DMJB85lw/GC+Bbw="; + }; + }; v175 = buildECTesterStandalone { - gcrypt = { version="1.7.5"; hash="sha256-0f6kEovu8rswpHCva6+rzMUDztNQU0+53Y9aU/+66AA="; }; - }; + gcrypt = { + version = "1.7.5"; + hash = "sha256-0f6kEovu8rswpHCva6+rzMUDztNQU0+53Y9aU/+66AA="; + }; + }; v174 = buildECTesterStandalone { - gcrypt = { version="1.7.4"; hash="sha256-O2eGLi9HEeJcTOPMS0jVKlijr9zR2Malf5OhwO8D5cY="; }; - }; + gcrypt = { + version = "1.7.4"; + hash = "sha256-O2eGLi9HEeJcTOPMS0jVKlijr9zR2Malf5OhwO8D5cY="; + }; + }; v173 = buildECTesterStandalone { - gcrypt = { version="1.7.3"; hash="sha256-3axhEQd9ChYSJHWHviOMUpTdDuTXbce6eDzFX7AzcHE="; }; - }; + gcrypt = { + version = "1.7.3"; + hash = "sha256-3axhEQd9ChYSJHWHviOMUpTdDuTXbce6eDzFX7AzcHE="; + }; + }; v172 = buildECTesterStandalone { - gcrypt = { version="1.7.2"; hash="sha256-PTXfkG1uqzVFBMBddJqbAhlEyyn/X2XI75w91fe2aJ8="; }; - }; + gcrypt = { + version = "1.7.2"; + hash = "sha256-PTXfkG1uqzVFBMBddJqbAhlEyyn/X2XI75w91fe2aJ8="; + }; + }; v171 = buildECTesterStandalone { - gcrypt = { version="1.7.1"; hash="sha256-RQ2c/L8WEcZNvjvQS2J7gzee+J8RQG2UyLujBeNtepU="; }; - }; + gcrypt = { + version = "1.7.1"; + hash = "sha256-RQ2c/L8WEcZNvjvQS2J7gzee+J8RQG2UyLujBeNtepU="; + }; + }; v170 = buildECTesterStandalone { - gcrypt = { version="1.7.0"; hash="sha256-sOZ+p0R0k5kTxNnZ70717DeO++K+vjY4ne4xnHm/+pI="; }; - }; + gcrypt = { + version = "1.7.0"; + hash = "sha256-sOZ+p0R0k5kTxNnZ70717DeO++K+vjY4ne4xnHm/+pI="; + }; + }; v166 = buildECTesterStandalone { - gcrypt = { version="1.6.6"; hash="sha256-+UYbRhm7eLJzqI1GiRV1DUGOiaPqO2QbqwVjqa9LBNA="; }; - }; + gcrypt = { + version = "1.6.6"; + hash = "sha256-+UYbRhm7eLJzqI1GiRV1DUGOiaPqO2QbqwVjqa9LBNA="; + }; + }; v165 = buildECTesterStandalone { - gcrypt = { version="1.6.5"; hash="sha256-9J68WELUVa5wGd7zPrWgFKDweiqDU9w6pQp2/R2vqSQ="; }; - }; + gcrypt = { + version = "1.6.5"; + hash = "sha256-9J68WELUVa5wGd7zPrWgFKDweiqDU9w6pQp2/R2vqSQ="; + }; + }; v164 = buildECTesterStandalone { - gcrypt = { version="1.6.4"; hash="sha256-ybwsf+Ll9OoTsMdPnSS8uxrYibs5KX2Agq6/I/QzYCY="; }; - }; + gcrypt = { + version = "1.6.4"; + hash = "sha256-ybwsf+Ll9OoTsMdPnSS8uxrYibs5KX2Agq6/I/QzYCY="; + }; + }; v163 = buildECTesterStandalone { - gcrypt = { version="1.6.3"; hash="sha256-QbSRe5OuNMag4hJzeNek1m2AWiqGoJkR1Pm9hx23Al8="; }; - }; + gcrypt = { + version = "1.6.3"; + hash = "sha256-QbSRe5OuNMag4hJzeNek1m2AWiqGoJkR1Pm9hx23Al8="; + }; + }; v162 = buildECTesterStandalone { - gcrypt = { version="1.6.2"; hash="sha256-3ghEkqazjNsntn6vdJzrp2v3Ap9jqcDDwbBciMmIXEw="; }; - }; + gcrypt = { + version = "1.6.2"; + hash = "sha256-3ghEkqazjNsntn6vdJzrp2v3Ap9jqcDDwbBciMmIXEw="; + }; + }; v161 = buildECTesterStandalone { - gcrypt = { version="1.6.1"; hash="sha256-ocPv6mn4/+dp9IizAM4ZDu6www3iSlPxwbbkIC/cIHA="; }; - }; + gcrypt = { + version = "1.6.1"; + hash = "sha256-ocPv6mn4/+dp9IizAM4ZDu6www3iSlPxwbbkIC/cIHA="; + }; + }; v160 = buildECTesterStandalone { - gcrypt = { version="1.6.0"; hash="sha256-Zi1QhgCtlMwzTmZbcBYTf+7fzKUiaZjGXd1Wvfyilwg="; }; - }; + gcrypt = { + version = "1.6.0"; + hash = "sha256-Zi1QhgCtlMwzTmZbcBYTf+7fzKUiaZjGXd1Wvfyilwg="; + }; + }; v156 = buildECTesterStandalone { - gcrypt = { version="1.5.6"; hash="sha256-MBgmteUhyGcFb9Ywqtbwpg4XbRigF9prwksWld86vnk="; }; - }; + gcrypt = { + version = "1.5.6"; + hash = "sha256-MBgmteUhyGcFb9Ywqtbwpg4XbRigF9prwksWld86vnk="; + }; + }; v155 = buildECTesterStandalone { - gcrypt = { version="1.5.5"; hash="sha256-2JWCA+eGvKR5zXyQOQaSXop+AzzLlZv1Mxe1fPEaBlU="; }; - }; + gcrypt = { + version = "1.5.5"; + hash = "sha256-2JWCA+eGvKR5zXyQOQaSXop+AzzLlZv1Mxe1fPEaBlU="; + }; + }; v154 = buildECTesterStandalone { - gcrypt = { version="1.5.4"; hash="sha256-1fiNn0GkaVPcJQzbhXUSmzfuIghAG3+jOMiX9mfH+zM="; }; - }; + gcrypt = { + version = "1.5.4"; + hash = "sha256-1fiNn0GkaVPcJQzbhXUSmzfuIghAG3+jOMiX9mfH+zM="; + }; + }; v153 = buildECTesterStandalone { - gcrypt = { version="1.5.3"; hash="sha256-vPUzTn2jUsRd5q7F0ghM6aHTACn/SkpdoT8YSIdHWdE="; }; - }; + gcrypt = { + version = "1.5.3"; + hash = "sha256-vPUzTn2jUsRd5q7F0ghM6aHTACn/SkpdoT8YSIdHWdE="; + }; + }; v152 = buildECTesterStandalone { - gcrypt = { version="1.5.2"; hash="sha256-5BpDOfUClPPJJfL3Gq8kJ+sWLSmU2pFmbfwyYhr+lj8="; }; - }; + gcrypt = { + version = "1.5.2"; + hash = "sha256-5BpDOfUClPPJJfL3Gq8kJ+sWLSmU2pFmbfwyYhr+lj8="; + }; + }; v151 = buildECTesterStandalone { - gcrypt = { version="1.5.1"; hash="sha256-rZ6xWAjnaZmMC9jBgayIFCORn08QVYaRPcy8Dfv65Sc="; }; - }; + gcrypt = { + version = "1.5.1"; + hash = "sha256-rZ6xWAjnaZmMC9jBgayIFCORn08QVYaRPcy8Dfv65Sc="; + }; + }; v150 = buildECTesterStandalone { - gcrypt = { version="1.5.0"; hash="sha256-S2L8UWAElAoFcQJUAaBYHUkZnxp237XOb9Y/UNuBc/o="; }; - }; + gcrypt = { + version = "1.5.0"; + hash = "sha256-S2L8UWAElAoFcQJUAaBYHUkZnxp237XOb9Y/UNuBc/o="; + }; + }; v146 = buildECTesterStandalone { - gcrypt = { version="1.4.6"; hash="sha256-Pksw2ms1e1ZTM9AiITO2SgQUvpm6cnMwgRZcjqm8a4U="; }; - }; + gcrypt = { + version = "1.4.6"; + hash = "sha256-Pksw2ms1e1ZTM9AiITO2SgQUvpm6cnMwgRZcjqm8a4U="; + }; + }; v145 = buildECTesterStandalone { - gcrypt = { version="1.4.5"; hash="sha256-SW+QfFMk3nU2fsYcY7/u0TCe8LxkhF3CCzWXcxq9nkA="; }; - }; + gcrypt = { + version = "1.4.5"; + hash = "sha256-SW+QfFMk3nU2fsYcY7/u0TCe8LxkhF3CCzWXcxq9nkA="; + }; + }; v144 = buildECTesterStandalone { - gcrypt = { version="1.4.4"; hash="sha256-MhK4gIDPj6AGFk04/Bdvr6XClZHIOE8oSriA2w2/MG8="; }; - }; + gcrypt = { + version = "1.4.4"; + hash = "sha256-MhK4gIDPj6AGFk04/Bdvr6XClZHIOE8oSriA2w2/MG8="; + }; + }; v143 = buildECTesterStandalone { - gcrypt = { version="1.4.3"; hash="sha256-iMgZvZ8B19SBiJjhM6USBE54w0MHqmBrapTuznwLIws="; }; - }; + gcrypt = { + version = "1.4.3"; + hash = "sha256-iMgZvZ8B19SBiJjhM6USBE54w0MHqmBrapTuznwLIws="; + }; + }; v142 = buildECTesterStandalone { - gcrypt = { version="1.4.2"; hash="sha256-unQUhG9/O6IrIs842hug6dXCJjixxArAh85RZJgRUsM="; }; - }; + gcrypt = { + version = "1.4.2"; + hash = "sha256-unQUhG9/O6IrIs842hug6dXCJjixxArAh85RZJgRUsM="; + }; + }; v141 = buildECTesterStandalone { - gcrypt = { version="1.4.1"; hash="sha256-/jsyvfDJLWs7t7Pks8Gaaomanetl8bNvCliC0wjJH6M="; }; - }; + gcrypt = { + version = "1.4.1"; + hash = "sha256-/jsyvfDJLWs7t7Pks8Gaaomanetl8bNvCliC0wjJH6M="; + }; + }; v140 = buildECTesterStandalone { - gcrypt = { version="1.4.0"; hash="sha256-1/hV92aUSltuf/7i1v/fgoq3CazURTsOZK6oCM4nYOw="; }; - }; + gcrypt = { + version = "1.4.0"; + hash = "sha256-1/hV92aUSltuf/7i1v/fgoq3CazURTsOZK6oCM4nYOw="; + }; + }; v124 = buildECTesterStandalone { - gcrypt = { version="1.2.4"; hash="sha256-fWFVxNCkD7o9ug8hqVnHhIxzS6ZzTejifuomrlPAyIA="; }; - }; + gcrypt = { + version = "1.2.4"; + hash = "sha256-fWFVxNCkD7o9ug8hqVnHhIxzS6ZzTejifuomrlPAyIA="; + }; + }; v123 = buildECTesterStandalone { - gcrypt = { version="1.2.3"; hash="sha256-6OKRFjlRFIIHWAeSWILQBlYRPDHgqJAV1ITcFsbYD7Q="; }; - }; + gcrypt = { + version = "1.2.3"; + hash = "sha256-6OKRFjlRFIIHWAeSWILQBlYRPDHgqJAV1ITcFsbYD7Q="; + }; + }; v122 = buildECTesterStandalone { - gcrypt = { version="1.2.2"; hash="sha256-espQrfRId1XGHAWQ1286k1Lie9s908DcDP+Py0Eq5iQ="; }; - }; + gcrypt = { + version = "1.2.2"; + hash = "sha256-espQrfRId1XGHAWQ1286k1Lie9s908DcDP+Py0Eq5iQ="; + }; + }; v121 = buildECTesterStandalone { - gcrypt = { version="1.2.1"; hash="sha256-E3hqJqQgH8CfiPqiSDDRYxnJKrKPlJIcKu8JDq8Xp7I="; }; - }; + gcrypt = { + version = "1.2.1"; + hash = "sha256-E3hqJqQgH8CfiPqiSDDRYxnJKrKPlJIcKu8JDq8Xp7I="; + }; + }; } diff --git a/nix/gcryptshim.nix b/nix/gcryptshim.nix index bfe027b..764b03c 100644 --- a/nix/gcryptshim.nix +++ b/nix/gcryptshim.nix @@ -1,9 +1,10 @@ { - pkgs - , libgcrypt - , libgpg-error + pkgs, + libgcrypt, + libgpg-error, }: -with pkgs; stdenv.mkDerivation { +with pkgs; +stdenv.mkDerivation { name = "Gcrypt Shim"; src = ../standalone/src/main/resources/cz/crcs/ectester/standalone/libs/jni; diff --git a/nix/ippcp_pkg_versions.nix b/nix/ippcp_pkg_versions.nix index ac97208..a3140cf 100644 --- a/nix/ippcp_pkg_versions.nix +++ b/nix/ippcp_pkg_versions.nix @@ -1,77 +1,147 @@ +{ buildECTesterStandalone }: { - buildECTesterStandalone -}: -{ v2021_12_1 = buildECTesterStandalone { - ippcp = { version="2021.12.1"; hash="sha256-voxjx9Np/8jy9XS6EvUK4aW18/DGQGaPpTKm9RzuCU8="; }; - }; + ippcp = { + version = "2021.12.1"; + hash = "sha256-voxjx9Np/8jy9XS6EvUK4aW18/DGQGaPpTKm9RzuCU8="; + }; + }; v2021_12_0 = buildECTesterStandalone { - ippcp = { version="2021.12.0"; hash="sha256-FeCfiXwOUM3cL4Ah3IjLa/2SKo9WHTZFUfg/w8WTNcc="; }; - }; + ippcp = { + version = "2021.12.0"; + hash = "sha256-FeCfiXwOUM3cL4Ah3IjLa/2SKo9WHTZFUfg/w8WTNcc="; + }; + }; v2021_11_1 = buildECTesterStandalone { - ippcp = { version="2021.11.1"; hash="sha256-OgNrrPE8jFVD/hcv7A43Bno96r4Z/lb7/SE6TEL7RDI="; }; - }; + ippcp = { + version = "2021.11.1"; + hash = "sha256-OgNrrPE8jFVD/hcv7A43Bno96r4Z/lb7/SE6TEL7RDI="; + }; + }; v2021_11_0 = buildECTesterStandalone { - ippcp = { version="2021.11.0"; hash="sha256-MVhiKEJxYa1HaicPbkzrAlZxFqIEP7eDLusC/T52gXI="; }; - }; + ippcp = { + version = "2021.11.0"; + hash = "sha256-MVhiKEJxYa1HaicPbkzrAlZxFqIEP7eDLusC/T52gXI="; + }; + }; v2021_10_0 = buildECTesterStandalone { - ippcp = { version="2021.10.0"; hash="sha256-DfXsJ+4XqyjCD+79LUD53Cx8D46o1a4fAZa2UxGI1Xg="; }; - }; + ippcp = { + version = "2021.10.0"; + hash = "sha256-DfXsJ+4XqyjCD+79LUD53Cx8D46o1a4fAZa2UxGI1Xg="; + }; + }; v2021_9_0 = buildECTesterStandalone { - ippcp = { version="2021.9.0"; hash="sha256-+ITnxyrkDQp4xRa+PVzXdYsSkI5sMNwQGfGU+lFJ6co="; }; - }; + ippcp = { + version = "2021.9.0"; + hash = "sha256-+ITnxyrkDQp4xRa+PVzXdYsSkI5sMNwQGfGU+lFJ6co="; + }; + }; v2021_8 = buildECTesterStandalone { - ippcp = { version="2021.8"; hash="sha256-Iz1Pql+cf2DdPe7KoNpxQ7H76SFwWkUbtL4bJxr7D4w="; }; - }; + ippcp = { + version = "2021.8"; + hash = "sha256-Iz1Pql+cf2DdPe7KoNpxQ7H76SFwWkUbtL4bJxr7D4w="; + }; + }; v2021_7_1 = buildECTesterStandalone { - ippcp = { version="2021.7.1"; hash="sha256-iyg4ja7tsbpng7XOZwISri+x8knwEeyh/aP9ldhQY60="; }; - }; + ippcp = { + version = "2021.7.1"; + hash = "sha256-iyg4ja7tsbpng7XOZwISri+x8knwEeyh/aP9ldhQY60="; + }; + }; v2021_7 = buildECTesterStandalone { - ippcp = { version="2021.7"; hash="sha256-3W0LlJgmrp2Rk7xQ+0GQfkF2UpH4htx9R7IL86smtnY="; }; - }; + ippcp = { + version = "2021.7"; + hash = "sha256-3W0LlJgmrp2Rk7xQ+0GQfkF2UpH4htx9R7IL86smtnY="; + }; + }; v2021_6 = buildECTesterStandalone { - ippcp = { version="2021.6"; hash="sha256-lr6oiJTaTQhTrxhdY5dTfOrl/ZBwOYbuyuNU3tJbEe0="; }; - }; + ippcp = { + version = "2021.6"; + hash = "sha256-lr6oiJTaTQhTrxhdY5dTfOrl/ZBwOYbuyuNU3tJbEe0="; + }; + }; v2021_5 = buildECTesterStandalone { - ippcp = { version="2021.5"; hash="sha256-xc44XvGz9KnbLKKMmSJQ2Eq8IhEFVb0tYIWVW4oJRuo="; }; - }; + ippcp = { + version = "2021.5"; + hash = "sha256-xc44XvGz9KnbLKKMmSJQ2Eq8IhEFVb0tYIWVW4oJRuo="; + }; + }; v2021_4 = buildECTesterStandalone { - ippcp = { version="2021.4"; hash="sha256-SyRY3BoHY7zQIFA6j0U0W0oD5PZhp3vsvFQVBw4/AXY="; }; - }; + ippcp = { + version = "2021.4"; + hash = "sha256-SyRY3BoHY7zQIFA6j0U0W0oD5PZhp3vsvFQVBw4/AXY="; + }; + }; v2021_3 = buildECTesterStandalone { - ippcp = { version="2021.3"; hash="sha256-QEJXvQ//zhQqibFxXwPMdS1MHewgyb24LRmkycVSGrM="; }; - }; + ippcp = { + version = "2021.3"; + hash = "sha256-QEJXvQ//zhQqibFxXwPMdS1MHewgyb24LRmkycVSGrM="; + }; + }; v2021_2 = buildECTesterStandalone { - ippcp = { version="2021.2"; hash="sha256-8I3y//LK5TcyC71fdX1biF588rdK2AplO6eh9GUHx9U="; }; - }; + ippcp = { + version = "2021.2"; + hash = "sha256-8I3y//LK5TcyC71fdX1biF588rdK2AplO6eh9GUHx9U="; + }; + }; v2020u3 = buildECTesterStandalone { - ippcp = { version="2020u3"; hash="sha256-i/iPOSTKR02pHzxBRn3odZJ+6SzGtS+pCG1BWo1qdAs="; }; - }; + ippcp = { + version = "2020u3"; + hash = "sha256-i/iPOSTKR02pHzxBRn3odZJ+6SzGtS+pCG1BWo1qdAs="; + }; + }; v2020u2 = buildECTesterStandalone { - ippcp = { version="2020u2"; hash="sha256-cn76ju41RdEJxH9SmF75Z38V3e9vnLXGdyjh4hISpr8="; }; - }; + ippcp = { + version = "2020u2"; + hash = "sha256-cn76ju41RdEJxH9SmF75Z38V3e9vnLXGdyjh4hISpr8="; + }; + }; v2020u1 = buildECTesterStandalone { - ippcp = { version="2020u1"; hash="sha256-4h5Zrx4hvsvZkXpHu0ZXJftoLFms34PstTRN0gHCXrM="; }; - }; + ippcp = { + version = "2020u1"; + hash = "sha256-4h5Zrx4hvsvZkXpHu0ZXJftoLFms34PstTRN0gHCXrM="; + }; + }; v2020 = buildECTesterStandalone { - ippcp = { version="2020"; hash="sha256-k4CuLLtNX+wrEGRgoIP9e0wp42U1VRF96nhDE8qNkMk="; }; - }; + ippcp = { + version = "2020"; + hash = "sha256-k4CuLLtNX+wrEGRgoIP9e0wp42U1VRF96nhDE8qNkMk="; + }; + }; v2019u4 = buildECTesterStandalone { - ippcp = { version="2019u4"; hash="sha256-Xi3I0frlR/OjX4IRJyBuFcSkrCaxL9ABRZ1w8FUAseg="; }; - }; + ippcp = { + version = "2019u4"; + hash = "sha256-Xi3I0frlR/OjX4IRJyBuFcSkrCaxL9ABRZ1w8FUAseg="; + }; + }; v2019u3 = buildECTesterStandalone { - ippcp = { version="2019u3"; hash="sha256-8sdPlRNfdjMkc061e6EFpJMMA1QKK5/SpKlMV2E5TH4="; }; - }; + ippcp = { + version = "2019u3"; + hash = "sha256-8sdPlRNfdjMkc061e6EFpJMMA1QKK5/SpKlMV2E5TH4="; + }; + }; v2019u2 = buildECTesterStandalone { - ippcp = { version="2019u2"; hash="sha256-WoiO1pXA6UTRdKCcn9ckMk4/6IvbQAK4k7d8P3rGbqc="; }; - }; + ippcp = { + version = "2019u2"; + hash = "sha256-WoiO1pXA6UTRdKCcn9ckMk4/6IvbQAK4k7d8P3rGbqc="; + }; + }; v2019u1 = buildECTesterStandalone { - ippcp = { version="2019u1"; hash="sha256-2KcZz+7NrhbvRVLXtdME73uMBrhw+4q0ajiXeWwZdJs="; }; - }; + ippcp = { + version = "2019u1"; + hash = "sha256-2KcZz+7NrhbvRVLXtdME73uMBrhw+4q0ajiXeWwZdJs="; + }; + }; v2019 = buildECTesterStandalone { - ippcp = { version="2019"; hash="sha256-iTupt9pRN+6ze3Hf/dmtve9u15iVL0g2kujUpyGgums="; }; - }; + ippcp = { + version = "2019"; + hash = "sha256-iTupt9pRN+6ze3Hf/dmtve9u15iVL0g2kujUpyGgums="; + }; + }; v2019b = buildECTesterStandalone { - ippcp = { version="2019b"; hash="sha256-5zoY/nad8tQosX8EBxrebbupkFRRbWB8vf33xNAKTH8="; }; - }; -}
\ No newline at end of file + ippcp = { + version = "2019b"; + hash = "sha256-5zoY/nad8tQosX8EBxrebbupkFRRbWB8vf33xNAKTH8="; + }; + }; +} diff --git a/nix/ippcpshim.nix b/nix/ippcpshim.nix index 43ec4d6..2b1d676 100644 --- a/nix/ippcpshim.nix +++ b/nix/ippcpshim.nix @@ -1,8 +1,6 @@ -{ - pkgs - , ipp-crypto -}: - with pkgs; stdenv.mkDerivation rec { +{ pkgs, ipp-crypto }: +with pkgs; +stdenv.mkDerivation rec { name = "IppCryptoShim"; src = ../standalone/src/main/resources/cz/crcs/ectester/standalone/libs/jni; diff --git a/nix/libressl_pkg_versions.nix b/nix/libressl_pkg_versions.nix index 1621521..d723778 100644 --- a/nix/libressl_pkg_versions.nix +++ b/nix/libressl_pkg_versions.nix @@ -1,362 +1,717 @@ +{ buildECTesterStandalone }: { - buildECTesterStandalone -}: -{ v200 = buildECTesterStandalone { - libressl = { version="2.0.0"; hash="sha256-E5rIHJR4rM04qetmdiPXWZeiGXzsNvGEzY0j6Yp+R1s="; }; - }; + libressl = { + version = "2.0.0"; + hash = "sha256-E5rIHJR4rM04qetmdiPXWZeiGXzsNvGEzY0j6Yp+R1s="; + }; + }; v201 = buildECTesterStandalone { - libressl = { version="2.0.1"; hash="sha256-lZb2yz6Lr+NddJ3722yYTxu9hiM1mOtf20q/hUpXkro="; }; - }; + libressl = { + version = "2.0.1"; + hash = "sha256-lZb2yz6Lr+NddJ3722yYTxu9hiM1mOtf20q/hUpXkro="; + }; + }; v202 = buildECTesterStandalone { - libressl = { version="2.0.2"; hash="sha256-TRa2hSy9iV7VVzeBnSwEKzc3Hx2A/LpPskI566Kl1ys="; }; - }; + libressl = { + version = "2.0.2"; + hash = "sha256-TRa2hSy9iV7VVzeBnSwEKzc3Hx2A/LpPskI566Kl1ys="; + }; + }; v203 = buildECTesterStandalone { - libressl = { version="2.0.3"; hash="sha256-39U7eIA8JctQCD3R+PdzqSTcMc3Z3jlu6uQSDBSq4tQ="; }; - }; + libressl = { + version = "2.0.3"; + hash = "sha256-39U7eIA8JctQCD3R+PdzqSTcMc3Z3jlu6uQSDBSq4tQ="; + }; + }; v204 = buildECTesterStandalone { - libressl = { version="2.0.4"; hash="sha256-XMZ9F5AqMiu7iBEE4HyGITwBSqa1LmZRmG1Ct2/P7Tw="; }; - }; + libressl = { + version = "2.0.4"; + hash = "sha256-XMZ9F5AqMiu7iBEE4HyGITwBSqa1LmZRmG1Ct2/P7Tw="; + }; + }; v205 = buildECTesterStandalone { - libressl = { version="2.0.5"; hash="sha256-P1Rjtd65Pv0qxOI6IGEqHM8ymaVp0DiAuyBMkGR9/Jo="; }; - }; + libressl = { + version = "2.0.5"; + hash = "sha256-P1Rjtd65Pv0qxOI6IGEqHM8ymaVp0DiAuyBMkGR9/Jo="; + }; + }; v206 = buildECTesterStandalone { - libressl = { version="2.0.6"; hash="sha256-dlKjYV2uCsML2KZWbyhb2u4NzLc8E9f6h2ce2PV0y2Y="; }; - }; + libressl = { + version = "2.0.6"; + hash = "sha256-dlKjYV2uCsML2KZWbyhb2u4NzLc8E9f6h2ce2PV0y2Y="; + }; + }; v210 = buildECTesterStandalone { - libressl = { version="2.1.0"; hash="sha256-oy2XthqYw180RYS5hcr0mj/D4ObiTQu7vjT+Yd0mJ6w="; }; - }; + libressl = { + version = "2.1.0"; + hash = "sha256-oy2XthqYw180RYS5hcr0mj/D4ObiTQu7vjT+Yd0mJ6w="; + }; + }; v211 = buildECTesterStandalone { - libressl = { version="2.1.1"; hash="sha256-+1raQadbMcjdn/AT2spXslMEetFOQ/Zdi0GHm3uOPBc="; }; - }; + libressl = { + version = "2.1.1"; + hash = "sha256-+1raQadbMcjdn/AT2spXslMEetFOQ/Zdi0GHm3uOPBc="; + }; + }; v2110 = buildECTesterStandalone { - libressl = { version="2.1.10"; hash="sha256-im2jGORME8lhgI0WgMf/vm2v8o5uRlbAmi00D6+HnkE="; }; - }; + libressl = { + version = "2.1.10"; + hash = "sha256-im2jGORME8lhgI0WgMf/vm2v8o5uRlbAmi00D6+HnkE="; + }; + }; v212 = buildECTesterStandalone { - libressl = { version="2.1.2"; hash="sha256-B8BfEuXUnb/Pgt0jtrSHe3zbHI5MjdJ8tNnldYpsr1I="; }; - }; + libressl = { + version = "2.1.2"; + hash = "sha256-B8BfEuXUnb/Pgt0jtrSHe3zbHI5MjdJ8tNnldYpsr1I="; + }; + }; v213 = buildECTesterStandalone { - libressl = { version="2.1.3"; hash="sha256-6y83CXFAj7EK9kU+VWRlyO7nKKwzO/HrR+waURIwT3w="; }; - }; + libressl = { + version = "2.1.3"; + hash = "sha256-6y83CXFAj7EK9kU+VWRlyO7nKKwzO/HrR+waURIwT3w="; + }; + }; v214 = buildECTesterStandalone { - libressl = { version="2.1.4"; hash="sha256-6OCFNZKHdBGal5QS7o4wdES3oaQsjEesBu4JQjypoE4="; }; - }; + libressl = { + version = "2.1.4"; + hash = "sha256-6OCFNZKHdBGal5QS7o4wdES3oaQsjEesBu4JQjypoE4="; + }; + }; v215 = buildECTesterStandalone { - libressl = { version="2.1.5"; hash="sha256-qCN5kT/X9OJuBF/PAhqpKh9oOVSBa/gXs7aW3mLpw7s="; }; - }; + libressl = { + version = "2.1.5"; + hash = "sha256-qCN5kT/X9OJuBF/PAhqpKh9oOVSBa/gXs7aW3mLpw7s="; + }; + }; v216 = buildECTesterStandalone { - libressl = { version="2.1.6"; hash="sha256-T4Jt2Xs7gAFwcHO96EAUk/nNRmhGW0gcBC0o45c2U6g="; }; - }; + libressl = { + version = "2.1.6"; + hash = "sha256-T4Jt2Xs7gAFwcHO96EAUk/nNRmhGW0gcBC0o45c2U6g="; + }; + }; v217 = buildECTesterStandalone { - libressl = { version="2.1.7"; hash="sha256-HcS/wD++FHMnBCkdbZy3o8xwV1lXyVin4taGkI6c248="; }; - }; + libressl = { + version = "2.1.7"; + hash = "sha256-HcS/wD++FHMnBCkdbZy3o8xwV1lXyVin4taGkI6c248="; + }; + }; v218 = buildECTesterStandalone { - libressl = { version="2.1.8"; hash="sha256-c1rkgktuqgyiqfwd1HEX9wCeMQ2ee8+e22a+Rb2EDbM="; }; - }; + libressl = { + version = "2.1.8"; + hash = "sha256-c1rkgktuqgyiqfwd1HEX9wCeMQ2ee8+e22a+Rb2EDbM="; + }; + }; v219 = buildECTesterStandalone { - libressl = { version="2.1.9"; hash="sha256-Ycva8umWMj5HMzRS7HHNbn8D7dToJQGo8Jy+KZk7654="; }; - }; + libressl = { + version = "2.1.9"; + hash = "sha256-Ycva8umWMj5HMzRS7HHNbn8D7dToJQGo8Jy+KZk7654="; + }; + }; v220 = buildECTesterStandalone { - libressl = { version="2.2.0"; hash="sha256-lpDY84pdSEJTlUUu6zBbBbsPVgzZbg7jDzcNTxZWMEA="; }; - }; + libressl = { + version = "2.2.0"; + hash = "sha256-lpDY84pdSEJTlUUu6zBbBbsPVgzZbg7jDzcNTxZWMEA="; + }; + }; v221 = buildECTesterStandalone { - libressl = { version="2.2.1"; hash="sha256-TzMXUKv8O2BbAu7KHomU+g0mKZhbw/YpJDeBl/v+Vy0="; }; - }; + libressl = { + version = "2.2.1"; + hash = "sha256-TzMXUKv8O2BbAu7KHomU+g0mKZhbw/YpJDeBl/v+Vy0="; + }; + }; v222 = buildECTesterStandalone { - libressl = { version="2.2.2"; hash="sha256-4JSwnzPUaFRe27KxbcF4+VjsL2beGi/HzCogvSSJoRQ="; }; - }; + libressl = { + version = "2.2.2"; + hash = "sha256-4JSwnzPUaFRe27KxbcF4+VjsL2beGi/HzCogvSSJoRQ="; + }; + }; v223 = buildECTesterStandalone { - libressl = { version="2.2.3"; hash="sha256-oczCGt+R1g6ZJGAxuZyTDJr14bG1phsb7Ie+728W2II="; }; - }; + libressl = { + version = "2.2.3"; + hash = "sha256-oczCGt+R1g6ZJGAxuZyTDJr14bG1phsb7Ie+728W2II="; + }; + }; v224 = buildECTesterStandalone { - libressl = { version="2.2.4"; hash="sha256-a0CYWb6GVK/DhiVJSU4JcBfmTI0WfxJYQ4NYYwbvmn4="; }; - }; + libressl = { + version = "2.2.4"; + hash = "sha256-a0CYWb6GVK/DhiVJSU4JcBfmTI0WfxJYQ4NYYwbvmn4="; + }; + }; v225 = buildECTesterStandalone { - libressl = { version="2.2.5"; hash="sha256-48re0EadjcZPTKL+jkma2k3QFOhNHFpxgY055U5skUs="; }; - }; + libressl = { + version = "2.2.5"; + hash = "sha256-48re0EadjcZPTKL+jkma2k3QFOhNHFpxgY055U5skUs="; + }; + }; v226 = buildECTesterStandalone { - libressl = { version="2.2.6"; hash="sha256-HuGZlM/9BH1A9juhSRFduhimgbDMkjvuwwG/QktY1k8="; }; - }; + libressl = { + version = "2.2.6"; + hash = "sha256-HuGZlM/9BH1A9juhSRFduhimgbDMkjvuwwG/QktY1k8="; + }; + }; v227 = buildECTesterStandalone { - libressl = { version="2.2.7"; hash="sha256-fixos4O7qO+33OXqHsz9p3BIVH0dKnNVwHLv18zYk80="; }; - }; + libressl = { + version = "2.2.7"; + hash = "sha256-fixos4O7qO+33OXqHsz9p3BIVH0dKnNVwHLv18zYk80="; + }; + }; v228 = buildECTesterStandalone { - libressl = { version="2.2.8"; hash="sha256-0QUUd9vF3DbxSLU6qVnD4qCqpZROsEyJ3VSSVIJfuws="; }; - }; + libressl = { + version = "2.2.8"; + hash = "sha256-0QUUd9vF3DbxSLU6qVnD4qCqpZROsEyJ3VSSVIJfuws="; + }; + }; v229 = buildECTesterStandalone { - libressl = { version="2.2.9"; hash="sha256-cQ/zd+qDY3I51QEPTSYfX5HH/c6Ro4l0FJrNA+RcTEQ="; }; - }; + libressl = { + version = "2.2.9"; + hash = "sha256-cQ/zd+qDY3I51QEPTSYfX5HH/c6Ro4l0FJrNA+RcTEQ="; + }; + }; v230 = buildECTesterStandalone { - libressl = { version="2.3.0"; hash="sha256-BFFJjZmcz/R1Im9c+uB6N1SnsoxQfGvaAH4xb8kNkqA="; }; - }; + libressl = { + version = "2.3.0"; + hash = "sha256-BFFJjZmcz/R1Im9c+uB6N1SnsoxQfGvaAH4xb8kNkqA="; + }; + }; v231 = buildECTesterStandalone { - libressl = { version="2.3.1"; hash="sha256-QQtY2067yrQ8M1dhLlkQlPZPuTOSacqi5oco42+NWJ4="; }; - }; + libressl = { + version = "2.3.1"; + hash = "sha256-QQtY2067yrQ8M1dhLlkQlPZPuTOSacqi5oco42+NWJ4="; + }; + }; v2310 = buildECTesterStandalone { - libressl = { version="2.3.10"; hash="sha256-LQtareDF7TGjwZT61fjdcc3SGLcCBTQnOdJKYlpUxNM="; }; - }; + libressl = { + version = "2.3.10"; + hash = "sha256-LQtareDF7TGjwZT61fjdcc3SGLcCBTQnOdJKYlpUxNM="; + }; + }; v232 = buildECTesterStandalone { - libressl = { version="2.3.2"; hash="sha256-gPRfrkhZ8WGxmAythG1CF0F9DIkAatKcDqjIjaVkqWo="; }; - }; + libressl = { + version = "2.3.2"; + hash = "sha256-gPRfrkhZ8WGxmAythG1CF0F9DIkAatKcDqjIjaVkqWo="; + }; + }; v233 = buildECTesterStandalone { - libressl = { version="2.3.3"; hash="sha256-dnMxZhh8yFh+Dr4eg5Ze8lcmKhpnajaAbt07bVG1Cqk="; }; - }; + libressl = { + version = "2.3.3"; + hash = "sha256-dnMxZhh8yFh+Dr4eg5Ze8lcmKhpnajaAbt07bVG1Cqk="; + }; + }; v234 = buildECTesterStandalone { - libressl = { version="2.3.4"; hash="sha256-ehE1smIPeJKOiVOMIRpN8dlBWZQAHR58kXjGttct5qk="; }; - }; + libressl = { + version = "2.3.4"; + hash = "sha256-ehE1smIPeJKOiVOMIRpN8dlBWZQAHR58kXjGttct5qk="; + }; + }; v235 = buildECTesterStandalone { - libressl = { version="2.3.5"; hash="sha256-9CUnXOfevMcoLJ3LRr1u67r0GsYBNuL9Mtj9YL6LdTs="; }; - }; + libressl = { + version = "2.3.5"; + hash = "sha256-9CUnXOfevMcoLJ3LRr1u67r0GsYBNuL9Mtj9YL6LdTs="; + }; + }; v236 = buildECTesterStandalone { - libressl = { version="2.3.6"; hash="sha256-NYpHeeaBO9BvB9sM8PD+UxQB7Qxu2ViXPUBEFsPVN/o="; }; - }; + libressl = { + version = "2.3.6"; + hash = "sha256-NYpHeeaBO9BvB9sM8PD+UxQB7Qxu2ViXPUBEFsPVN/o="; + }; + }; v237 = buildECTesterStandalone { - libressl = { version="2.3.7"; hash="sha256-9Z9dhZzkhnzEdhoT0CAk9plJHid9VKn+duBT5bX3CGA="; }; - }; + libressl = { + version = "2.3.7"; + hash = "sha256-9Z9dhZzkhnzEdhoT0CAk9plJHid9VKn+duBT5bX3CGA="; + }; + }; v238 = buildECTesterStandalone { - libressl = { version="2.3.8"; hash="sha256-rmqk7Sx9IBMQ/vGEMQqFyIoxVQb2M+k/zequwNWlT8I="; }; - }; + libressl = { + version = "2.3.8"; + hash = "sha256-rmqk7Sx9IBMQ/vGEMQqFyIoxVQb2M+k/zequwNWlT8I="; + }; + }; v239 = buildECTesterStandalone { - libressl = { version="2.3.9"; hash="sha256-pv8TZk6xOvbboAJZz7VaMGsyt2iP7vUgpS/A9guBlvw="; }; - }; + libressl = { + version = "2.3.9"; + hash = "sha256-pv8TZk6xOvbboAJZz7VaMGsyt2iP7vUgpS/A9guBlvw="; + }; + }; v240 = buildECTesterStandalone { - libressl = { version="2.4.0"; hash="sha256-fmAAz7lDj7/H/n/gVyr1h+Lyo2u9uVQI6YdHWNDDOC4="; }; - }; + libressl = { + version = "2.4.0"; + hash = "sha256-fmAAz7lDj7/H/n/gVyr1h+Lyo2u9uVQI6YdHWNDDOC4="; + }; + }; v241 = buildECTesterStandalone { - libressl = { version="2.4.1"; hash="sha256-EhkisTFpzUeoXj538LwSn40EJHGTtCSRyx+rkHToBHc="; }; - }; + libressl = { + version = "2.4.1"; + hash = "sha256-EhkisTFpzUeoXj538LwSn40EJHGTtCSRyx+rkHToBHc="; + }; + }; v242 = buildECTesterStandalone { - libressl = { version="2.4.2"; hash="sha256-X4fXeOXWKCLWDjj6liHBxWSPxVnRmLoxS9nYnL9n2eM="; }; - }; + libressl = { + version = "2.4.2"; + hash = "sha256-X4fXeOXWKCLWDjj6liHBxWSPxVnRmLoxS9nYnL9n2eM="; + }; + }; v243 = buildECTesterStandalone { - libressl = { version="2.4.3"; hash="sha256-vVcm8+JH56fTDOaZRtF0uPuS2ZnSJxDGXxdslpgSlg4="; }; - }; + libressl = { + version = "2.4.3"; + hash = "sha256-vVcm8+JH56fTDOaZRtF0uPuS2ZnSJxDGXxdslpgSlg4="; + }; + }; v244 = buildECTesterStandalone { - libressl = { version="2.4.4"; hash="sha256-b8+vaTRzPqHcsvak1FnZYA4vSIeT5Rwtr0m3BRjuv9E="; }; - }; + libressl = { + version = "2.4.4"; + hash = "sha256-b8+vaTRzPqHcsvak1FnZYA4vSIeT5Rwtr0m3BRjuv9E="; + }; + }; v245 = buildECTesterStandalone { - libressl = { version="2.4.5"; hash="sha256-0wDE41iu6VGvbf0WhO8MA0dYtHFxVEIw88z2ziT+Q0c="; }; - }; + libressl = { + version = "2.4.5"; + hash = "sha256-0wDE41iu6VGvbf0WhO8MA0dYtHFxVEIw88z2ziT+Q0c="; + }; + }; v250 = buildECTesterStandalone { - libressl = { version="2.5.0"; hash="sha256-hlK/a1WrUfs3toaj9gSiZD4Oj94sVuapNgJ9Eq/abq4="; }; - }; + libressl = { + version = "2.5.0"; + hash = "sha256-hlK/a1WrUfs3toaj9gSiZD4Oj94sVuapNgJ9Eq/abq4="; + }; + }; v251 = buildECTesterStandalone { - libressl = { version="2.5.1"; hash="sha256-9xrgqCS3j7Gkf/ojycJunZbFybKSNOrO3Oa0x3QCh80="; }; - }; + libressl = { + version = "2.5.1"; + hash = "sha256-9xrgqCS3j7Gkf/ojycJunZbFybKSNOrO3Oa0x3QCh80="; + }; + }; v252 = buildECTesterStandalone { - libressl = { version="2.5.2"; hash="sha256-D/p9cICShKSslullkYphwdeTC8qGVFen2w/wr8ggHII="; }; - }; + libressl = { + version = "2.5.2"; + hash = "sha256-D/p9cICShKSslullkYphwdeTC8qGVFen2w/wr8ggHII="; + }; + }; v253 = buildECTesterStandalone { - libressl = { version="2.5.3"; hash="sha256-FONMxYbsTOV2P3YEbc82bEUQSyzHHXe2O+VQVgjmijA="; }; - }; + libressl = { + version = "2.5.3"; + hash = "sha256-FONMxYbsTOV2P3YEbc82bEUQSyzHHXe2O+VQVgjmijA="; + }; + }; v254 = buildECTesterStandalone { - libressl = { version="2.5.4"; hash="sha256-EHpbUi+7gxjUw75mgHXl5gcpbwqSVdcWdMqpRXEzbvo="; }; - }; + libressl = { + version = "2.5.4"; + hash = "sha256-EHpbUi+7gxjUw75mgHXl5gcpbwqSVdcWdMqpRXEzbvo="; + }; + }; v255 = buildECTesterStandalone { - libressl = { version="2.5.5"; hash="sha256-5X9ePVhCqB/pNRtugX/K8KdJyk7zWpFGXtup4HHc58Q="; }; - }; + libressl = { + version = "2.5.5"; + hash = "sha256-5X9ePVhCqB/pNRtugX/K8KdJyk7zWpFGXtup4HHc58Q="; + }; + }; v260 = buildECTesterStandalone { - libressl = { version="2.6.0"; hash="sha256-5I1VdHRXF5JpkADDKul9zvNCB9E+2T5BJvIT1dy+ilM="; }; - }; + libressl = { + version = "2.6.0"; + hash = "sha256-5I1VdHRXF5JpkADDKul9zvNCB9E+2T5BJvIT1dy+ilM="; + }; + }; v261 = buildECTesterStandalone { - libressl = { version="2.6.1"; hash="sha256-wpOztfH8HWNJwBnDkFNV1XffMnNLYx1+ZWUDiU4JEn4="; }; - }; + libressl = { + version = "2.6.1"; + hash = "sha256-wpOztfH8HWNJwBnDkFNV1XffMnNLYx1+ZWUDiU4JEn4="; + }; + }; v262 = buildECTesterStandalone { - libressl = { version="2.6.2"; hash="sha256-sCnSSStyqbpbX82fPWAsn9C6oIeRLyquzCj1L1Z+xHg="; }; - }; + libressl = { + version = "2.6.2"; + hash = "sha256-sCnSSStyqbpbX82fPWAsn9C6oIeRLyquzCj1L1Z+xHg="; + }; + }; v263 = buildECTesterStandalone { - libressl = { version="2.6.3"; hash="sha256-rq1lmCYxcblpcNoNiB5hbQgTtps169xZkfh/8up/XJg="; }; - }; + libressl = { + version = "2.6.3"; + hash = "sha256-rq1lmCYxcblpcNoNiB5hbQgTtps169xZkfh/8up/XJg="; + }; + }; v264 = buildECTesterStandalone { - libressl = { version="2.6.4"; hash="sha256-Y4ogwvnpnuKDqEHNeHq02EbRiA4YDE6WkE/DJ9QZ0R8="; }; - }; + libressl = { + version = "2.6.4"; + hash = "sha256-Y4ogwvnpnuKDqEHNeHq02EbRiA4YDE6WkE/DJ9QZ0R8="; + }; + }; v265 = buildECTesterStandalone { - libressl = { version="2.6.5"; hash="sha256-hZ7fxxAZ0nxEj+FI5nmv3ZcqC6qRsh8CsrL1+KhN3So="; }; - }; + libressl = { + version = "2.6.5"; + hash = "sha256-hZ7fxxAZ0nxEj+FI5nmv3ZcqC6qRsh8CsrL1+KhN3So="; + }; + }; v270 = buildECTesterStandalone { - libressl = { version="2.7.0"; hash="sha256-UM5tb4jepzo+/KYrCp5sp1KSve5skpPv1qdxz9soze4="; }; - }; + libressl = { + version = "2.7.0"; + hash = "sha256-UM5tb4jepzo+/KYrCp5sp1KSve5skpPv1qdxz9soze4="; + }; + }; v271 = buildECTesterStandalone { - libressl = { version="2.7.1"; hash="sha256-k3UH4ja6c3Csq6aJREUV1Oj0KRNvTn42IwgzktlrcHA="; }; - }; + libressl = { + version = "2.7.1"; + hash = "sha256-k3UH4ja6c3Csq6aJREUV1Oj0KRNvTn42IwgzktlrcHA="; + }; + }; v272 = buildECTesterStandalone { - libressl = { version="2.7.2"; hash="sha256-kXqHecNCF3/zdRor+VXQJi0diRaktAiTDEXO8yZwCZU="; }; - }; + libressl = { + version = "2.7.2"; + hash = "sha256-kXqHecNCF3/zdRor+VXQJi0diRaktAiTDEXO8yZwCZU="; + }; + }; v273 = buildECTesterStandalone { - libressl = { version="2.7.3"; hash="sha256-FscNj+Hebpvt6g1ngEtV84lHF2k6Be1F4V4OL5OcJ5U="; }; - }; + libressl = { + version = "2.7.3"; + hash = "sha256-FscNj+Hebpvt6g1ngEtV84lHF2k6Be1F4V4OL5OcJ5U="; + }; + }; v274 = buildECTesterStandalone { - libressl = { version="2.7.4"; hash="sha256-HjqfraBsHAYAEUcK0P+WDeKPmgUVJ31zNvfgk2JRfaY="; }; - }; + libressl = { + version = "2.7.4"; + hash = "sha256-HjqfraBsHAYAEUcK0P+WDeKPmgUVJ31zNvfgk2JRfaY="; + }; + }; v275 = buildECTesterStandalone { - libressl = { version="2.7.5"; hash="sha256-vuUDjYXvAWCkK5CWs1Fg6fee9dKb9MtbOEGceTpbwEA="; }; - }; + libressl = { + version = "2.7.5"; + hash = "sha256-vuUDjYXvAWCkK5CWs1Fg6fee9dKb9MtbOEGceTpbwEA="; + }; + }; v280 = buildECTesterStandalone { - libressl = { version="2.8.0"; hash="sha256-ryu6llsGBjUY7sbxktQRYx3+HQdxN2DGfDwp00h4ncM="; }; - }; + libressl = { + version = "2.8.0"; + hash = "sha256-ryu6llsGBjUY7sbxktQRYx3+HQdxN2DGfDwp00h4ncM="; + }; + }; v281 = buildECTesterStandalone { - libressl = { version="2.8.1"; hash="sha256-M0v3BQ8dtAh/7rswVx7BPZ+pdb8F1gA846ttfSRSz0I="; }; - }; + libressl = { + version = "2.8.1"; + hash = "sha256-M0v3BQ8dtAh/7rswVx7BPZ+pdb8F1gA846ttfSRSz0I="; + }; + }; v282 = buildECTesterStandalone { - libressl = { version="2.8.2"; hash="sha256-uMsx5Z8SlFV7/IDypmKWm8Bk6DAGzu8FdOJVOhwlT9U="; }; - }; + libressl = { + version = "2.8.2"; + hash = "sha256-uMsx5Z8SlFV7/IDypmKWm8Bk6DAGzu8FdOJVOhwlT9U="; + }; + }; v283 = buildECTesterStandalone { - libressl = { version="2.8.3"; hash="sha256-m2QLEwRxgnYamc4+TwAL6Wh1ZuCCi0pycJ6eaj75hHc="; }; - }; + libressl = { + version = "2.8.3"; + hash = "sha256-m2QLEwRxgnYamc4+TwAL6Wh1ZuCCi0pycJ6eaj75hHc="; + }; + }; v290 = buildECTesterStandalone { - libressl = { version="2.9.0"; hash="sha256-618phAi3I/EaDKAZLBIuy3m0hVv99+6hg6YmQpahPPQ="; }; - }; + libressl = { + version = "2.9.0"; + hash = "sha256-618phAi3I/EaDKAZLBIuy3m0hVv99+6hg6YmQpahPPQ="; + }; + }; v291 = buildECTesterStandalone { - libressl = { version="2.9.1"; hash="sha256-OeTdhWaU3BDVZCAeRUnEbSQxYBorEPNCJQfiTMyPYvg="; }; - }; + libressl = { + version = "2.9.1"; + hash = "sha256-OeTdhWaU3BDVZCAeRUnEbSQxYBorEPNCJQfiTMyPYvg="; + }; + }; v292 = buildECTesterStandalone { - libressl = { version="2.9.2"; hash="sha256-xMeBZ/rjJbR669i+tUtgQdb2pWs3Q/S9XXmxVkL51dQ="; }; - }; + libressl = { + version = "2.9.2"; + hash = "sha256-xMeBZ/rjJbR669i+tUtgQdb2pWs3Q/S9XXmxVkL51dQ="; + }; + }; v300 = buildECTesterStandalone { - libressl = { version="3.0.0"; hash="sha256-AdkQBFfTc5R9MWSnPMKFQ4uxL+KKsGXL4oNa1k3MPHY="; }; - }; + libressl = { + version = "3.0.0"; + hash = "sha256-AdkQBFfTc5R9MWSnPMKFQ4uxL+KKsGXL4oNa1k3MPHY="; + }; + }; v301 = buildECTesterStandalone { - libressl = { version="3.0.1"; hash="sha256-ZGrbEZf746dULxiEPStK34V7d+ULuHi1j0593ltzQ8s="; }; - }; + libressl = { + version = "3.0.1"; + hash = "sha256-ZGrbEZf746dULxiEPStK34V7d+ULuHi1j0593ltzQ8s="; + }; + }; v302 = buildECTesterStandalone { - libressl = { version="3.0.2"; hash="sha256-33sXK/eblX3SfvNtyqH7FiViwOiZnhlKqMGj3y8VOY4="; }; - }; + libressl = { + version = "3.0.2"; + hash = "sha256-33sXK/eblX3SfvNtyqH7FiViwOiZnhlKqMGj3y8VOY4="; + }; + }; v310 = buildECTesterStandalone { - libressl = { version="3.1.0"; hash="sha256-+RqtDI+5y8Z8kQrW3P+0AagZtP0SIAfqf5eGONsETPY="; }; - }; + libressl = { + version = "3.1.0"; + hash = "sha256-+RqtDI+5y8Z8kQrW3P+0AagZtP0SIAfqf5eGONsETPY="; + }; + }; v311 = buildECTesterStandalone { - libressl = { version="3.1.1"; hash="sha256-vcbOXrs6Lq/ExHX37qpfCo5g2b6tAe+3bi4lQkK22wA="; }; - }; + libressl = { + version = "3.1.1"; + hash = "sha256-vcbOXrs6Lq/ExHX37qpfCo5g2b6tAe+3bi4lQkK22wA="; + }; + }; v312 = buildECTesterStandalone { - libressl = { version="3.1.2"; hash="sha256-+IovfqYXFJo05AwCLZkSlj8A6qYQmvQhMXUl5sl42JI="; }; - }; + libressl = { + version = "3.1.2"; + hash = "sha256-+IovfqYXFJo05AwCLZkSlj8A6qYQmvQhMXUl5sl42JI="; + }; + }; v313 = buildECTesterStandalone { - libressl = { version="3.1.3"; hash="sha256-x2sDFqz2Euy2L1ywFKINlypmO9nkCr+VKobzuZi2n6A="; }; - }; + libressl = { + version = "3.1.3"; + hash = "sha256-x2sDFqz2Euy2L1ywFKINlypmO9nkCr+VKobzuZi2n6A="; + }; + }; v314 = buildECTesterStandalone { - libressl = { version="3.1.4"; hash="sha256-QUwUnJljmD+AWggdtb067BRrX4LVKbtjh1rJQbJdy7Y="; }; - }; + libressl = { + version = "3.1.4"; + hash = "sha256-QUwUnJljmD+AWggdtb067BRrX4LVKbtjh1rJQbJdy7Y="; + }; + }; v315 = buildECTesterStandalone { - libressl = { version="3.1.5"; hash="sha256-LBPdzsUIHA57p/k9g3CpGREXMJDxkiAH4dkN4nRQBJQ="; }; - }; + libressl = { + version = "3.1.5"; + hash = "sha256-LBPdzsUIHA57p/k9g3CpGREXMJDxkiAH4dkN4nRQBJQ="; + }; + }; v320 = buildECTesterStandalone { - libressl = { version="3.2.0"; hash="sha256-R70utLRQPkfALvp+Z9L82Vx+rGvJ0Gs0OhtHBXk+0dU="; }; - }; + libressl = { + version = "3.2.0"; + hash = "sha256-R70utLRQPkfALvp+Z9L82Vx+rGvJ0Gs0OhtHBXk+0dU="; + }; + }; v321 = buildECTesterStandalone { - libressl = { version="3.2.1"; hash="sha256-0o2yJM+20YAJsqfoyyE81clDu+yHVQBi/vajhHklAxU="; }; - }; + libressl = { + version = "3.2.1"; + hash = "sha256-0o2yJM+20YAJsqfoyyE81clDu+yHVQBi/vajhHklAxU="; + }; + }; v322 = buildECTesterStandalone { - libressl = { version="3.2.2"; hash="sha256-qdHh0DC4vMZ79kKLjA//FKVgLiI2JXuePXesrxLip6E="; }; - }; + libressl = { + version = "3.2.2"; + hash = "sha256-qdHh0DC4vMZ79kKLjA//FKVgLiI2JXuePXesrxLip6E="; + }; + }; v323 = buildECTesterStandalone { - libressl = { version="3.2.3"; hash="sha256-QS3Cuqc5Iox3eek+sHzWRdXJZNLy2Dep/VbbdJhGPXM="; }; - }; + libressl = { + version = "3.2.3"; + hash = "sha256-QS3Cuqc5Iox3eek+sHzWRdXJZNLy2Dep/VbbdJhGPXM="; + }; + }; v324 = buildECTesterStandalone { - libressl = { version="3.2.4"; hash="sha256-rB27ngWmSRCFZZmxrGERj97Bs9DHAOQkRNgcDV9Qelo="; }; - }; + libressl = { + version = "3.2.4"; + hash = "sha256-rB27ngWmSRCFZZmxrGERj97Bs9DHAOQkRNgcDV9Qelo="; + }; + }; v325 = buildECTesterStandalone { - libressl = { version="3.2.5"; hash="sha256-eYpl/WHTheCdVZgQzfpGUS+N71kZJkz+8kGnsIbOfP4="; }; - }; + libressl = { + version = "3.2.5"; + hash = "sha256-eYpl/WHTheCdVZgQzfpGUS+N71kZJkz+8kGnsIbOfP4="; + }; + }; v326 = buildECTesterStandalone { - libressl = { version="3.2.6"; hash="sha256-sENkBSDS7sVr0WrmOc5TAX7srMPYY4i1T4OKVI3jMls="; }; - }; + libressl = { + version = "3.2.6"; + hash = "sha256-sENkBSDS7sVr0WrmOc5TAX7srMPYY4i1T4OKVI3jMls="; + }; + }; v327 = buildECTesterStandalone { - libressl = { version="3.2.7"; hash="sha256-fDL/A3WXzkccfP2dy4RxzaOgKYOuujMVBZNizrOTS4Q="; }; - }; + libressl = { + version = "3.2.7"; + hash = "sha256-fDL/A3WXzkccfP2dy4RxzaOgKYOuujMVBZNizrOTS4Q="; + }; + }; v330 = buildECTesterStandalone { - libressl = { version="3.3.0"; hash="sha256-cope3GPMtBjpFmvtEdS0PpYp/xxNQqObZJNHogQW+tY="; }; - }; + libressl = { + version = "3.3.0"; + hash = "sha256-cope3GPMtBjpFmvtEdS0PpYp/xxNQqObZJNHogQW+tY="; + }; + }; v331 = buildECTesterStandalone { - libressl = { version="3.3.1"; hash="sha256-ptMxhl4BZKE6yFoijlJRf3z4+EiPL5XzTnhXMC+Xz9s="; }; - }; + libressl = { + version = "3.3.1"; + hash = "sha256-ptMxhl4BZKE6yFoijlJRf3z4+EiPL5XzTnhXMC+Xz9s="; + }; + }; v332 = buildECTesterStandalone { - libressl = { version="3.3.2"; hash="sha256-hDQKxXDz7o6RBp3DoKzXpvbur8BZTZXzrhA0xdvCFlQ="; }; - }; + libressl = { + version = "3.3.2"; + hash = "sha256-hDQKxXDz7o6RBp3DoKzXpvbur8BZTZXzrhA0xdvCFlQ="; + }; + }; v333 = buildECTesterStandalone { - libressl = { version="3.3.3"; hash="sha256-pHFWWzbM0acNC9fTfG6VxDompigptIfZ0s3r/li+MGY="; }; - }; + libressl = { + version = "3.3.3"; + hash = "sha256-pHFWWzbM0acNC9fTfG6VxDompigptIfZ0s3r/li+MGY="; + }; + }; v334 = buildECTesterStandalone { - libressl = { version="3.3.4"; hash="sha256-vM52ej/tJSv9EhD4p+NQWitU0wCPZuQ9m5Xj8wwHKTE="; }; - }; + libressl = { + version = "3.3.4"; + hash = "sha256-vM52ej/tJSv9EhD4p+NQWitU0wCPZuQ9m5Xj8wwHKTE="; + }; + }; v335 = buildECTesterStandalone { - libressl = { version="3.3.5"; hash="sha256-ClE5Pw3xzyfgcAVKJ4ik0HMznzY9ec1ZQHahtMSL6aU="; }; - }; + libressl = { + version = "3.3.5"; + hash = "sha256-ClE5Pw3xzyfgcAVKJ4ik0HMznzY9ec1ZQHahtMSL6aU="; + }; + }; v336 = buildECTesterStandalone { - libressl = { version="3.3.6"; hash="sha256-PyiEk2XhGQ2yuvkBT/loYBLCWxym34s6CF94niT+S5o="; }; - }; + libressl = { + version = "3.3.6"; + hash = "sha256-PyiEk2XhGQ2yuvkBT/loYBLCWxym34s6CF94niT+S5o="; + }; + }; v340 = buildECTesterStandalone { - libressl = { version="3.4.0"; hash="sha256-5S6udY1AIGpx12OhqHtxA3IjvxmGrCOaa+Gm0qw5FtI="; }; - }; + libressl = { + version = "3.4.0"; + hash = "sha256-5S6udY1AIGpx12OhqHtxA3IjvxmGrCOaa+Gm0qw5FtI="; + }; + }; v341 = buildECTesterStandalone { - libressl = { version="3.4.1"; hash="sha256-EHzq5sqADoHLVjWEwWr6NtbHE4+t6UorPp2mVFb3xhw="; }; - }; + libressl = { + version = "3.4.1"; + hash = "sha256-EHzq5sqADoHLVjWEwWr6NtbHE4+t6UorPp2mVFb3xhw="; + }; + }; v342 = buildECTesterStandalone { - libressl = { version="3.4.2"; hash="sha256-y4LKfVRzNpFzUvvSPbL8SDxsRNNRV7MngCFOx0GXs84="; }; - }; + libressl = { + version = "3.4.2"; + hash = "sha256-y4LKfVRzNpFzUvvSPbL8SDxsRNNRV7MngCFOx0GXs84="; + }; + }; v343 = buildECTesterStandalone { - libressl = { version="3.4.3"; hash="sha256-/4i//jVIGLPM9UXjyv5FTFAxx6dyFwdPUzJx1jw38I0="; }; - }; + libressl = { + version = "3.4.3"; + hash = "sha256-/4i//jVIGLPM9UXjyv5FTFAxx6dyFwdPUzJx1jw38I0="; + }; + }; v350 = buildECTesterStandalone { - libressl = { version="3.5.0"; hash="sha256-8B1PdhkVWBWKBq+9wkBf79WwJUChl6slRshA4GpcD7c="; }; - }; + libressl = { + version = "3.5.0"; + hash = "sha256-8B1PdhkVWBWKBq+9wkBf79WwJUChl6slRshA4GpcD7c="; + }; + }; v351 = buildECTesterStandalone { - libressl = { version="3.5.1"; hash="sha256-p9ACb2diInXsj4I53tQiplPVzMhN9V3qKs1AYBcYVgg="; }; - }; + libressl = { + version = "3.5.1"; + hash = "sha256-p9ACb2diInXsj4I53tQiplPVzMhN9V3qKs1AYBcYVgg="; + }; + }; v352 = buildECTesterStandalone { - libressl = { version="3.5.2"; hash="sha256-Vv6rjiHD+mVJ+LfXURZYuOmFGBYoOKeVMUcyZUrfPl8="; }; - }; + libressl = { + version = "3.5.2"; + hash = "sha256-Vv6rjiHD+mVJ+LfXURZYuOmFGBYoOKeVMUcyZUrfPl8="; + }; + }; v353 = buildECTesterStandalone { - libressl = { version="3.5.3"; hash="sha256-OrXl6u9pziDGsXDuZNeFtCI19I8uYrCV/KXXtmcriyg="; }; - }; + libressl = { + version = "3.5.3"; + hash = "sha256-OrXl6u9pziDGsXDuZNeFtCI19I8uYrCV/KXXtmcriyg="; + }; + }; v354 = buildECTesterStandalone { - libressl = { version="3.5.4"; hash="sha256-A3naE0Si9xrUpOO+MO+dgu7N3Of43CrmZjGh3+FDQ6w="; }; - }; + libressl = { + version = "3.5.4"; + hash = "sha256-A3naE0Si9xrUpOO+MO+dgu7N3Of43CrmZjGh3+FDQ6w="; + }; + }; v360 = buildECTesterStandalone { - libressl = { version="3.6.0"; hash="sha256-GxLe/Lvb2+2oaSnkIQAK8PQjM63UgX/SbA2aGuxHhAQ="; }; - }; + libressl = { + version = "3.6.0"; + hash = "sha256-GxLe/Lvb2+2oaSnkIQAK8PQjM63UgX/SbA2aGuxHhAQ="; + }; + }; v361 = buildECTesterStandalone { - libressl = { version="3.6.1"; hash="sha256-rPrGExbpO5GcKNYtUwN8pzTehcRrTXA/Gf2Dlc8AZ3Q="; }; - }; + libressl = { + version = "3.6.1"; + hash = "sha256-rPrGExbpO5GcKNYtUwN8pzTehcRrTXA/Gf2Dlc8AZ3Q="; + }; + }; v362 = buildECTesterStandalone { - libressl = { version="3.6.2"; hash="sha256-S+gP/wc3Rs9QtKjlur4nlayumMaxMqngJRm0Rd+/0DM="; }; - }; + libressl = { + version = "3.6.2"; + hash = "sha256-S+gP/wc3Rs9QtKjlur4nlayumMaxMqngJRm0Rd+/0DM="; + }; + }; v363 = buildECTesterStandalone { - libressl = { version="3.6.3"; hash="sha256-h7G7426e7I0K5fBMg9NrLFsOWBeEx+sIFwJe0p6t6jc="; }; - }; + libressl = { + version = "3.6.3"; + hash = "sha256-h7G7426e7I0K5fBMg9NrLFsOWBeEx+sIFwJe0p6t6jc="; + }; + }; v370 = buildECTesterStandalone { - libressl = { version="3.7.0"; hash="sha256-P8EpD0AH7HX26azsuyVRJjDRuauMU7p5hE45WGjD4AY="; }; - }; + libressl = { + version = "3.7.0"; + hash = "sha256-P8EpD0AH7HX26azsuyVRJjDRuauMU7p5hE45WGjD4AY="; + }; + }; v371 = buildECTesterStandalone { - libressl = { version="3.7.1"; hash="sha256-mAhpYaK4tlftD+owVvstsUKUtr+hk8FaUjago1yEPe0="; }; - }; + libressl = { + version = "3.7.1"; + hash = "sha256-mAhpYaK4tlftD+owVvstsUKUtr+hk8FaUjago1yEPe0="; + }; + }; v372 = buildECTesterStandalone { - libressl = { version="3.7.2"; hash="sha256-sGqlOP78nGszxNtJMaCaX1LZ0jVyGa/L/32T/hLr9vc="; }; - }; + libressl = { + version = "3.7.2"; + hash = "sha256-sGqlOP78nGszxNtJMaCaX1LZ0jVyGa/L/32T/hLr9vc="; + }; + }; v373 = buildECTesterStandalone { - libressl = { version="3.7.3"; hash="sha256-eUjIVqkMglvXJotvhWdKjc0lS65C4iF4GyTj+NwzXbM="; }; - }; + libressl = { + version = "3.7.3"; + hash = "sha256-eUjIVqkMglvXJotvhWdKjc0lS65C4iF4GyTj+NwzXbM="; + }; + }; v380 = buildECTesterStandalone { - libressl = { version="3.8.0"; hash="sha256-ElMcHsgIxcar6zEYmWZLDP7QTUZI9FbclZu5PF8hrKw="; }; - }; + libressl = { + version = "3.8.0"; + hash = "sha256-ElMcHsgIxcar6zEYmWZLDP7QTUZI9FbclZu5PF8hrKw="; + }; + }; v381 = buildECTesterStandalone { - libressl = { version="3.8.1"; hash="sha256-wpvW2VInRnc8ueQSbVqaLDXqVQX2/Um2eRc/K0blc3I="; }; - }; + libressl = { + version = "3.8.1"; + hash = "sha256-wpvW2VInRnc8ueQSbVqaLDXqVQX2/Um2eRc/K0blc3I="; + }; + }; v382 = buildECTesterStandalone { - libressl = { version="3.8.2"; hash="sha256-bUuNW7slofgzZjnlbsUIgFLUOpUlZpeoXEzpEyPCWVQ="; }; - }; + libressl = { + version = "3.8.2"; + hash = "sha256-bUuNW7slofgzZjnlbsUIgFLUOpUlZpeoXEzpEyPCWVQ="; + }; + }; v383 = buildECTesterStandalone { - libressl = { version="3.8.3"; hash="sha256-pl9A4+9uPJRRyDGObyxFTDZ+Z/CcDN4YSXMaTW7McnI="; }; - }; + libressl = { + version = "3.8.3"; + hash = "sha256-pl9A4+9uPJRRyDGObyxFTDZ+Z/CcDN4YSXMaTW7McnI="; + }; + }; v384 = buildECTesterStandalone { - libressl = { version="3.8.4"; hash="sha256-wM75z+F0rDZs5IL1Qv3bB3Ief6DK+s40tJqHIPo3/n0="; }; - }; + libressl = { + version = "3.8.4"; + hash = "sha256-wM75z+F0rDZs5IL1Qv3bB3Ief6DK+s40tJqHIPo3/n0="; + }; + }; v390 = buildECTesterStandalone { - libressl = { version="3.9.0"; hash="sha256-HMIyQYSY3jBebVy4DJShZBXAHcs82Y8ujDoiAgkaNCA="; }; - }; + libressl = { + version = "3.9.0"; + hash = "sha256-HMIyQYSY3jBebVy4DJShZBXAHcs82Y8ujDoiAgkaNCA="; + }; + }; v391 = buildECTesterStandalone { - libressl = { version="3.9.1"; hash="sha256-baC5VGlffuYrA/ZCAKik8Cr5Nxe2DM4Eq2yN8mLAelE="; }; - }; + libressl = { + version = "3.9.1"; + hash = "sha256-baC5VGlffuYrA/ZCAKik8Cr5Nxe2DM4Eq2yN8mLAelE="; + }; + }; v392 = buildECTesterStandalone { - libressl = { version="3.9.2"; hash="sha256-ewMdrGSlnrbuMwT3/7ddrTOrjJ0nnIR/ksifuEYGj5c="; }; - }; + libressl = { + version = "3.9.2"; + hash = "sha256-ewMdrGSlnrbuMwT3/7ddrTOrjJ0nnIR/ksifuEYGj5c="; + }; + }; } diff --git a/nix/libresslshim.nix b/nix/libresslshim.nix index 97bc3d9..9d23f4b 100644 --- a/nix/libresslshim.nix +++ b/nix/libresslshim.nix @@ -1,8 +1,6 @@ -{ - pkgs - , libressl -}: -with pkgs; stdenv.mkDerivation rec { +{ pkgs, libressl }: +with pkgs; +stdenv.mkDerivation rec { name = "LibreSSLShim"; src = ../standalone/src/main/resources/cz/crcs/ectester/standalone/libs/jni; diff --git a/nix/mbedtls_pkg_versions.nix b/nix/mbedtls_pkg_versions.nix index e429a4a..6877800 100644 --- a/nix/mbedtls_pkg_versions.nix +++ b/nix/mbedtls_pkg_versions.nix @@ -1,95 +1,183 @@ -{ - buildECTesterStandalone -}: +{ buildECTesterStandalone }: { v360 = buildECTesterStandalone { - mbedtls = { version="v3.6.0"; hash="sha256-yzGBkrqh+T/5GS66xL5zJstCmvcfG09TfxqA3F8UPJg="; }; + mbedtls = { + version = "v3.6.0"; + hash = "sha256-yzGBkrqh+T/5GS66xL5zJstCmvcfG09TfxqA3F8UPJg="; + }; }; v2288 = buildECTesterStandalone { - mbedtls = { version="v2.28.8"; hash="sha256-A1DYZrvJ8SRujroVwqPfcTOSgLnT5xRat/RVdq2fL/o="; }; + mbedtls = { + version = "v2.28.8"; + hash = "sha256-A1DYZrvJ8SRujroVwqPfcTOSgLnT5xRat/RVdq2fL/o="; + }; }; v352 = buildECTesterStandalone { - mbedtls = { version="v3.5.2"; hash="sha256-lVGmnSYccNmRS6vfF/fDiny5cYRPc/wJBpgciFLPUvM="; }; + mbedtls = { + version = "v3.5.2"; + hash = "sha256-lVGmnSYccNmRS6vfF/fDiny5cYRPc/wJBpgciFLPUvM="; + }; }; v2287 = buildECTesterStandalone { - mbedtls = { version="v2.28.7"; hash="sha256-JI0Frbz4HkPqrLQNrSIj1ikN8201h4kd1wTwyPotERw="; }; + mbedtls = { + version = "v2.28.7"; + hash = "sha256-JI0Frbz4HkPqrLQNrSIj1ikN8201h4kd1wTwyPotERw="; + }; }; v351 = buildECTesterStandalone { - mbedtls = { version="v3.5.1"; hash="sha256-HxsHcGbSExp1aG5yMR/J3kPL4zqnmNoN5T5wfV3APaw="; }; + mbedtls = { + version = "v3.5.1"; + hash = "sha256-HxsHcGbSExp1aG5yMR/J3kPL4zqnmNoN5T5wfV3APaw="; + }; }; v2286 = buildECTesterStandalone { - mbedtls = { version="v2.28.6"; hash="sha256-1YyA3O0/u7Tcf8rhNmrMGF64/tnitQH65THpXa7N7P8="; }; + mbedtls = { + version = "v2.28.6"; + hash = "sha256-1YyA3O0/u7Tcf8rhNmrMGF64/tnitQH65THpXa7N7P8="; + }; }; mbedtls-350 = buildECTesterStandalone { - mbedtls = { version="mbedtls-3.5.0"; hash="sha256-uHHQmaAmFS8Vd7PrAfRpK+aNi3pJ76XBC7rFWcd16NU="; }; + mbedtls = { + version = "mbedtls-3.5.0"; + hash = "sha256-uHHQmaAmFS8Vd7PrAfRpK+aNi3pJ76XBC7rFWcd16NU="; + }; }; mbedtls-2285 = buildECTesterStandalone { - mbedtls = { version="mbedtls-2.28.5"; hash="sha256-Gl4UQMSvAwYbOi2b/AUMz+zgkOl1o0UA2VveF/3ek8o="; }; + mbedtls = { + version = "mbedtls-2.28.5"; + hash = "sha256-Gl4UQMSvAwYbOi2b/AUMz+zgkOl1o0UA2VveF/3ek8o="; + }; }; v341 = buildECTesterStandalone { - mbedtls = { version="v3.4.1"; hash="sha256-NIjyRcVbg6lT6+RlTz5Jt6V9T85mvta5grOSLIAK9Ts="; }; + mbedtls = { + version = "v3.4.1"; + hash = "sha256-NIjyRcVbg6lT6+RlTz5Jt6V9T85mvta5grOSLIAK9Ts="; + }; }; v2284 = buildECTesterStandalone { - mbedtls = { version="v2.28.4"; hash="sha256-88Lnj9NgS5PWg2hydvb9cwi6s6BG3UMvkUH2Ny1jmtE="; }; + mbedtls = { + version = "v2.28.4"; + hash = "sha256-88Lnj9NgS5PWg2hydvb9cwi6s6BG3UMvkUH2Ny1jmtE="; + }; }; v340 = buildECTesterStandalone { - mbedtls = { version="v3.4.0"; hash="sha256-1YA4hp/VEjph5k0qJqhhH4nBbTP3Qu2pl7WpuvPkVfg="; }; + mbedtls = { + version = "v3.4.0"; + hash = "sha256-1YA4hp/VEjph5k0qJqhhH4nBbTP3Qu2pl7WpuvPkVfg="; + }; }; v2283 = buildECTesterStandalone { - mbedtls = { version="v2.28.3"; hash="sha256-w5bJErCNRZLE8rHcuZlK3bOqel97gPPMKH2cPGUR6Zw="; }; + mbedtls = { + version = "v2.28.3"; + hash = "sha256-w5bJErCNRZLE8rHcuZlK3bOqel97gPPMKH2cPGUR6Zw="; + }; }; v330 = buildECTesterStandalone { - mbedtls = { version="v3.3.0"; hash="sha256-yb5migP5Tcw99XHFzJkCct4f5R6ztxPR43VQcfTGRtE="; }; + mbedtls = { + version = "v3.3.0"; + hash = "sha256-yb5migP5Tcw99XHFzJkCct4f5R6ztxPR43VQcfTGRtE="; + }; }; v2282 = buildECTesterStandalone { - mbedtls = { version="v2.28.2"; hash="sha256-rbWvPrFoY31QyW/TbMndPXTzAJS6qT/bo6J0IL6jRvQ="; }; + mbedtls = { + version = "v2.28.2"; + hash = "sha256-rbWvPrFoY31QyW/TbMndPXTzAJS6qT/bo6J0IL6jRvQ="; + }; }; v321 = buildECTesterStandalone { - mbedtls = { version="v3.2.1"; hash="sha256-+M36NvFe4gw2PRbld/2JV3yBGrqK6soWcmrSEkUNcrc="; }; + mbedtls = { + version = "v3.2.1"; + hash = "sha256-+M36NvFe4gw2PRbld/2JV3yBGrqK6soWcmrSEkUNcrc="; + }; }; v320 = buildECTesterStandalone { - mbedtls = { version="v3.2.0"; hash="sha256-b0c8E3eFwHw2bbvAOQY55RRkXVcx9hUCmkZA9QlRodQ="; }; + mbedtls = { + version = "v3.2.0"; + hash = "sha256-b0c8E3eFwHw2bbvAOQY55RRkXVcx9hUCmkZA9QlRodQ="; + }; }; v2281 = buildECTesterStandalone { - mbedtls = { version="v2.28.1"; hash="sha256-brbZB3fINDeVWXf50ct4bxYkoBVyD6bBBijZyFQSnyw="; }; + mbedtls = { + version = "v2.28.1"; + hash = "sha256-brbZB3fINDeVWXf50ct4bxYkoBVyD6bBBijZyFQSnyw="; + }; }; v310 = buildECTesterStandalone { - mbedtls = { version="v3.1.0"; hash="sha256-esQe1qnM1yBzNPpd+qog3/8guttt6CKUiyzIQ1nMfJs="; }; + mbedtls = { + version = "v3.1.0"; + hash = "sha256-esQe1qnM1yBzNPpd+qog3/8guttt6CKUiyzIQ1nMfJs="; + }; }; v2280 = buildECTesterStandalone { - mbedtls = { version="v2.28.0"; hash="sha256-VDoIUBaK2e0E5nkwU1u3Wvxc+s6OzBSdIeHsJKJuZ2g="; }; + mbedtls = { + version = "v2.28.0"; + hash = "sha256-VDoIUBaK2e0E5nkwU1u3Wvxc+s6OzBSdIeHsJKJuZ2g="; + }; }; v21612 = buildECTesterStandalone { - mbedtls = { version="v2.16.12"; hash="sha256-EjIbPWiqq0Xif1sXV59mM0qfDjsHuOomDlRWrFKlt6Q="; }; + mbedtls = { + version = "v2.16.12"; + hash = "sha256-EjIbPWiqq0Xif1sXV59mM0qfDjsHuOomDlRWrFKlt6Q="; + }; }; v300 = buildECTesterStandalone { - mbedtls = { version="v3.0.0"; hash="sha256-M4PQwsa856Hy3QXKwnNRp4alk5oVJBGkDEjZWf6vT4s="; }; + mbedtls = { + version = "v3.0.0"; + hash = "sha256-M4PQwsa856Hy3QXKwnNRp4alk5oVJBGkDEjZWf6vT4s="; + }; }; v2270 = buildECTesterStandalone { - mbedtls = { version="v2.27.0"; hash="sha256-vlZZnN/XAlmoDhRJTZUcrToeCiGaQrKe6k2t3G1My0M="; }; + mbedtls = { + version = "v2.27.0"; + hash = "sha256-vlZZnN/XAlmoDhRJTZUcrToeCiGaQrKe6k2t3G1My0M="; + }; }; v21611 = buildECTesterStandalone { - mbedtls = { version="v2.16.11"; hash="sha256-sas6xdOUM8cTomXEBpvi6eCOLcCO9vvRmvUIu4kEdRg="; }; + mbedtls = { + version = "v2.16.11"; + hash = "sha256-sas6xdOUM8cTomXEBpvi6eCOLcCO9vvRmvUIu4kEdRg="; + }; }; v2260 = buildECTesterStandalone { - mbedtls = { version="v2.26.0"; hash="sha256-VbgYI7I6BxcuW9EvRr0CXVPsRBNlsIl3Pti8/XK9nGk="; }; + mbedtls = { + version = "v2.26.0"; + hash = "sha256-VbgYI7I6BxcuW9EvRr0CXVPsRBNlsIl3Pti8/XK9nGk="; + }; }; v21610 = buildECTesterStandalone { - mbedtls = { version="v2.16.10"; hash="sha256-ar1JVepzNjD6jgp9V0G/YNajO7s0sxYe3t0v8O0sVs4="; }; + mbedtls = { + version = "v2.16.10"; + hash = "sha256-ar1JVepzNjD6jgp9V0G/YNajO7s0sxYe3t0v8O0sVs4="; + }; }; v2719 = buildECTesterStandalone { - mbedtls = { version="v2.7.19"; hash="sha256-0GAoJMq6O0j8WwwhknD486XcaCALZ3TW5mxKcliISmY="; }; + mbedtls = { + version = "v2.7.19"; + hash = "sha256-0GAoJMq6O0j8WwwhknD486XcaCALZ3TW5mxKcliISmY="; + }; }; v2250 = buildECTesterStandalone { - mbedtls = { version="v2.25.0"; hash="sha256-UQ0z374ptC1m7Ezomj7BuMG2+yYg+ByOGYI9zKzlceQ="; }; + mbedtls = { + version = "v2.25.0"; + hash = "sha256-UQ0z374ptC1m7Ezomj7BuMG2+yYg+ByOGYI9zKzlceQ="; + }; }; v2169 = buildECTesterStandalone { - mbedtls = { version="v2.16.9"; hash="sha256-jhWJh4gKU0JOERANiYSI3me0oMDTRJ7ZQaKhNc6w51c="; }; + mbedtls = { + version = "v2.16.9"; + hash = "sha256-jhWJh4gKU0JOERANiYSI3me0oMDTRJ7ZQaKhNc6w51c="; + }; }; v2718 = buildECTesterStandalone { - mbedtls = { version="v2.7.18"; hash="sha256-SkAK9lTqdc3VbJyu8VNHR1PPUlt/+swIJl/R5l7zhUg="; }; + mbedtls = { + version = "v2.7.18"; + hash = "sha256-SkAK9lTqdc3VbJyu8VNHR1PPUlt/+swIJl/R5l7zhUg="; + }; }; v2240 = buildECTesterStandalone { - mbedtls = { version="v2.24.0"; hash="sha256-zO65lsM/nw0NfqvRGT+n8sRT2hpdvMzcJR4nve7F0SM="; }; + mbedtls = { + version = "v2.24.0"; + hash = "sha256-zO65lsM/nw0NfqvRGT+n8sRT2hpdvMzcJR4nve7F0SM="; + }; }; } diff --git a/nix/mbedtlsshim.nix b/nix/mbedtlsshim.nix index cbb850c..d1f5434 100644 --- a/nix/mbedtlsshim.nix +++ b/nix/mbedtlsshim.nix @@ -1,8 +1,6 @@ -{ - pkgs - , mbedtls -}: -with pkgs; stdenv.mkDerivation rec { +{ pkgs, mbedtls }: +with pkgs; +stdenv.mkDerivation rec { name = "MbedTLSShim"; src = ../standalone/src/main/resources/cz/crcs/ectester/standalone/libs/jni; diff --git a/nix/nettle_pkg_versions.nix b/nix/nettle_pkg_versions.nix index c5d7270..8350f88 100644 --- a/nix/nettle_pkg_versions.nix +++ b/nix/nettle_pkg_versions.nix @@ -1,59 +1,129 @@ +{ buildECTesterStandalone }: { - buildECTesterStandalone -}: -{ v3_8_1 = buildECTesterStandalone { - nettle = { version="3.8.1"; tag="nettle_3.8.1_release_20220727"; hash="sha256-Nk8+K3fNfc3oP9fEUhnINOVLDHXkKLb4lKI9Et1By/4="; }; - }; + nettle = { + version = "3.8.1"; + tag = "nettle_3.8.1_release_20220727"; + hash = "sha256-Nk8+K3fNfc3oP9fEUhnINOVLDHXkKLb4lKI9Et1By/4="; + }; + }; v3_8 = buildECTesterStandalone { - nettle = { version="3.8"; tag="nettle_3.8_release_20220602"; hash="sha256-dXbGhIHBmPZEsIwWDRpIULqUSeMIBpRVtSEzGfI06OY="; }; - }; + nettle = { + version = "3.8"; + tag = "nettle_3.8_release_20220602"; + hash = "sha256-dXbGhIHBmPZEsIwWDRpIULqUSeMIBpRVtSEzGfI06OY="; + }; + }; v3_7_3 = buildECTesterStandalone { - nettle = { version="3.7.3"; tag="nettle_3.7.3_release_20210606"; hash="sha256-Zh9esD8EijuSTDqK0lFdQGjkD2fndOiiaCdlgAfjvPA="; }; - }; + nettle = { + version = "3.7.3"; + tag = "nettle_3.7.3_release_20210606"; + hash = "sha256-Zh9esD8EijuSTDqK0lFdQGjkD2fndOiiaCdlgAfjvPA="; + }; + }; v3_7_2 = buildECTesterStandalone { - nettle = { version="3.7.2"; tag="nettle_3.7.2_release_20210321"; hash="sha256-jSpgTvHN5M1ft35CJTHqJa0GRnn/Ct+VbnizNS4O8WI="; }; - }; + nettle = { + version = "3.7.2"; + tag = "nettle_3.7.2_release_20210321"; + hash = "sha256-jSpgTvHN5M1ft35CJTHqJa0GRnn/Ct+VbnizNS4O8WI="; + }; + }; v3_7_1 = buildECTesterStandalone { - nettle = { version="3.7.1"; tag="nettle_3.7.1_release_20210217"; hash="sha256-FWYhQnx7AKdf+bNLdwuV00+A73pVw0B96UsWy/Q2xC4="; }; - }; + nettle = { + version = "3.7.1"; + tag = "nettle_3.7.1_release_20210217"; + hash = "sha256-FWYhQnx7AKdf+bNLdwuV00+A73pVw0B96UsWy/Q2xC4="; + }; + }; v3_7 = buildECTesterStandalone { - nettle = { version="3.7"; tag="nettle_3.7_release_20210104"; hash="sha256-8AH2TrREvxPdkbzsy8IKy8YMQxHW4rIIeEUuuanOx1o="; }; - }; + nettle = { + version = "3.7"; + tag = "nettle_3.7_release_20210104"; + hash = "sha256-8AH2TrREvxPdkbzsy8IKy8YMQxHW4rIIeEUuuanOx1o="; + }; + }; v3_6 = buildECTesterStandalone { - nettle = { version="3.6"; tag="nettle_3.6_release_20200429"; hash="sha256-0kwNDyq/+8j0803PEUsPEx7Dd0iV81VZIv4vQPPV4/E="; }; - }; + nettle = { + version = "3.6"; + tag = "nettle_3.6_release_20200429"; + hash = "sha256-0kwNDyq/+8j0803PEUsPEx7Dd0iV81VZIv4vQPPV4/E="; + }; + }; v3_5_1 = buildECTesterStandalone { - nettle = { version="3.5.1"; tag="nettle_3.5.1_release_20190627"; hash="sha256-dcyhmYdhsC4W8ttW2lKZKu9iK/VaO0XsU4vC7trclBk="; }; - }; + nettle = { + version = "3.5.1"; + tag = "nettle_3.5.1_release_20190627"; + hash = "sha256-dcyhmYdhsC4W8ttW2lKZKu9iK/VaO0XsU4vC7trclBk="; + }; + }; v3_5 = buildECTesterStandalone { - nettle = { version="3.5"; tag="nettle_3.5_release_20190626"; hash="sha256-Qy2Y3NNBy9BjqWMCVSQSI2jB8u6cchu2jXcdXjRnS08="; }; - }; + nettle = { + version = "3.5"; + tag = "nettle_3.5_release_20190626"; + hash = "sha256-Qy2Y3NNBy9BjqWMCVSQSI2jB8u6cchu2jXcdXjRnS08="; + }; + }; v3_4_1 = buildECTesterStandalone { - nettle = { version="3.4.1"; tag="nettle_3.4.1_release_20181204"; hash="sha256-+UHPFTXNXRgZvlzK5bq+8B9tthH5tad3uunHYEuKkq0="; }; - }; + nettle = { + version = "3.4.1"; + tag = "nettle_3.4.1_release_20181204"; + hash = "sha256-+UHPFTXNXRgZvlzK5bq+8B9tthH5tad3uunHYEuKkq0="; + }; + }; v3_4 = buildECTesterStandalone { - nettle = { version="3.4"; tag="nettle_3.4_release_20171119"; hash="sha256-rnpC3wJlULhdrKg4m2pgumMTsFZ/N0OS5UkYWIpBHpQ="; }; - }; + nettle = { + version = "3.4"; + tag = "nettle_3.4_release_20171119"; + hash = "sha256-rnpC3wJlULhdrKg4m2pgumMTsFZ/N0OS5UkYWIpBHpQ="; + }; + }; v3_3 = buildECTesterStandalone { - nettle = { version="3.3"; tag="nettle_3.3_release_20161001"; hash="sha256-RpQmJ9XQyhFyD+wY2B/Dj374N+pBl8H2MOcc4NRwsR4="; }; - }; + nettle = { + version = "3.3"; + tag = "nettle_3.3_release_20161001"; + hash = "sha256-RpQmJ9XQyhFyD+wY2B/Dj374N+pBl8H2MOcc4NRwsR4="; + }; + }; v3_2 = buildECTesterStandalone { - nettle = { version="3.2"; tag="nettle_3.2_release_20160128"; hash="sha256-6kKD3vI2QT7ataTPnPMq31QMjfG5tnZBz8IwL8qEnZc="; }; - }; + nettle = { + version = "3.2"; + tag = "nettle_3.2_release_20160128"; + hash = "sha256-6kKD3vI2QT7ataTPnPMq31QMjfG5tnZBz8IwL8qEnZc="; + }; + }; v3_1_1 = buildECTesterStandalone { - nettle = { version="3.1.1"; tag="nettle_3.1.1_release_20150424"; hash="sha256-X9TSXWTY3cuF0NiXVyr3OwW00WPGzElDilv7uP8pPUw="; }; - }; + nettle = { + version = "3.1.1"; + tag = "nettle_3.1.1_release_20150424"; + hash = "sha256-X9TSXWTY3cuF0NiXVyr3OwW00WPGzElDilv7uP8pPUw="; + }; + }; v3_1 = buildECTesterStandalone { - nettle = { version="3.1"; tag="nettle_3.1_release_20150407"; hash="sha256-9oWdTsiOcIBVkK+YYrS4xDotH8eZHfCnpxGx58qfydM="; }; - }; + nettle = { + version = "3.1"; + tag = "nettle_3.1_release_20150407"; + hash = "sha256-9oWdTsiOcIBVkK+YYrS4xDotH8eZHfCnpxGx58qfydM="; + }; + }; v3_0 = buildECTesterStandalone { - nettle = { version="3.0"; tag="nettle_3.0_release_20140607"; hash="sha256-llHAvSMm63N9DtnrQDREcSQHwBolsP6BNDLvMb682RM="; }; - }; + nettle = { + version = "3.0"; + tag = "nettle_3.0_release_20140607"; + hash = "sha256-llHAvSMm63N9DtnrQDREcSQHwBolsP6BNDLvMb682RM="; + }; + }; v2_7_1 = buildECTesterStandalone { - nettle = { version="2.7.1"; tag="nettle_2.7.1_release_20130528"; hash="sha256-vHHr1DQ1U312d5nkFPzojlIbcnjUjIYGUSFuH8ZVW0A="; }; - }; + nettle = { + version = "2.7.1"; + tag = "nettle_2.7.1_release_20130528"; + hash = "sha256-vHHr1DQ1U312d5nkFPzojlIbcnjUjIYGUSFuH8ZVW0A="; + }; + }; v2_7 = buildECTesterStandalone { - nettle = { version="2.7"; tag="nettle_2.7_release_20130424"; hash="sha256-wpTqEzwFOCzC7/sXNNSfSr6xrYUVVDozPeSaEUIs1NY="; }; - }; + nettle = { + version = "2.7"; + tag = "nettle_2.7_release_20130424"; + hash = "sha256-wpTqEzwFOCzC7/sXNNSfSr6xrYUVVDozPeSaEUIs1NY="; + }; + }; } diff --git a/nix/nettleshim.nix b/nix/nettleshim.nix index b431a2a..f968357 100644 --- a/nix/nettleshim.nix +++ b/nix/nettleshim.nix @@ -1,9 +1,10 @@ { - pkgs - , nettle - , gmp + pkgs, + nettle, + gmp, }: -with pkgs; stdenv.mkDerivation rec { +with pkgs; +stdenv.mkDerivation rec { name = "NettleShim"; src = ../standalone/src/main/resources/cz/crcs/ectester/standalone/libs/jni; diff --git a/nix/openssl_pkg_versions.nix b/nix/openssl_pkg_versions.nix index a702e61..61c6306 100644 --- a/nix/openssl_pkg_versions.nix +++ b/nix/openssl_pkg_versions.nix @@ -1,65 +1,123 @@ +{ buildECTesterStandalone }: { - buildECTesterStandalone -}: -{ v331 = buildECTesterStandalone { - openssl = { version="3.3.1"; hash="sha256-Ezvzm40WNayUqEgwQsxEglG3cKDRLHrwwF6old3Zjx0="; }; - }; + openssl = { + version = "3.3.1"; + hash = "sha256-Ezvzm40WNayUqEgwQsxEglG3cKDRLHrwwF6old3Zjx0="; + }; + }; v322 = buildECTesterStandalone { - openssl = { version="3.2.2"; hash="sha256-QYFzZZxh7gSRWwtSaV8JHgF6w+ZjePgTT9b4H+CjB6s="; }; - }; + openssl = { + version = "3.2.2"; + hash = "sha256-QYFzZZxh7gSRWwtSaV8JHgF6w+ZjePgTT9b4H+CjB6s="; + }; + }; v316 = buildECTesterStandalone { - openssl = { version="3.1.6"; hash="sha256-QrArZza3vMRME4/iAy+K4mwtCyErH9mklYkRrZciPrM="; }; - }; + openssl = { + version = "3.1.6"; + hash = "sha256-QrArZza3vMRME4/iAy+K4mwtCyErH9mklYkRrZciPrM="; + }; + }; v3014 = buildECTesterStandalone { - openssl = { version="3.0.14"; hash="sha256-DwwWLusMcv1Zz9t8KsV3pFVtFDvfAJTXCJDSfg6jAh8="; }; - }; + openssl = { + version = "3.0.14"; + hash = "sha256-DwwWLusMcv1Zz9t8KsV3pFVtFDvfAJTXCJDSfg6jAh8="; + }; + }; v330 = buildECTesterStandalone { - openssl = { version="3.3.0"; hash="sha256-Gke9xG+sJWoNyO+2lvf3b6X5YEm6G2D97VR4vTFlxtI="; }; - }; + openssl = { + version = "3.3.0"; + hash = "sha256-Gke9xG+sJWoNyO+2lvf3b6X5YEm6G2D97VR4vTFlxtI="; + }; + }; v321 = buildECTesterStandalone { - openssl = { version="3.2.1"; hash="sha256-dcxoA/+skmJcBuo8Z3+zLvINFaG0HsyN3bxrnWotqEw="; }; - }; + openssl = { + version = "3.2.1"; + hash = "sha256-dcxoA/+skmJcBuo8Z3+zLvINFaG0HsyN3bxrnWotqEw="; + }; + }; v315 = buildECTesterStandalone { - openssl = { version="3.1.5"; hash="sha256-KZ3f0KUGptN95WOG0VzjDTRNkYhN/JirMzC3wAkCmTE="; }; - }; + openssl = { + version = "3.1.5"; + hash = "sha256-KZ3f0KUGptN95WOG0VzjDTRNkYhN/JirMzC3wAkCmTE="; + }; + }; v3013 = buildECTesterStandalone { - openssl = { version="3.0.13"; hash="sha256-50UE7XA1KV7HBisdoWwVtX/yoDzSBkoo2MOUWMrMRfw="; }; - }; + openssl = { + version = "3.0.13"; + hash = "sha256-50UE7XA1KV7HBisdoWwVtX/yoDzSBkoo2MOUWMrMRfw="; + }; + }; v320 = buildECTesterStandalone { - openssl = { version="3.2.0"; hash="sha256-qS9tvKl1ZngOyV4ro9SKqNqgkEiqyDksfHxYzJwDx2I="; }; - }; + openssl = { + version = "3.2.0"; + hash = "sha256-qS9tvKl1ZngOyV4ro9SKqNqgkEiqyDksfHxYzJwDx2I="; + }; + }; v314 = buildECTesterStandalone { - openssl = { version="3.1.4"; hash="sha256-cnwwVD/kCugEwZ5tZbB+PlfWRIJtpUtutOveOsQHfZc="; }; - }; + openssl = { + version = "3.1.4"; + hash = "sha256-cnwwVD/kCugEwZ5tZbB+PlfWRIJtpUtutOveOsQHfZc="; + }; + }; v3012 = buildECTesterStandalone { - openssl = { version="3.0.12"; hash="sha256-mnpzVfPUtz9DtXMM6ANx+dH5eET/yMSwHHI7oGJdaq0="; }; - }; + openssl = { + version = "3.0.12"; + hash = "sha256-mnpzVfPUtz9DtXMM6ANx+dH5eET/yMSwHHI7oGJdaq0="; + }; + }; v313 = buildECTesterStandalone { - openssl = { version="3.1.3"; hash="sha256-+0zy03Hvld8NyiqoXxHgrivbyG95gcv5MM6O/hrKDyg="; }; - }; + openssl = { + version = "3.1.3"; + hash = "sha256-+0zy03Hvld8NyiqoXxHgrivbyG95gcv5MM6O/hrKDyg="; + }; + }; v3011 = buildECTesterStandalone { - openssl = { version="3.0.11"; hash="sha256-n6TUFXzWgxk1pUJ5ZxzCDF5U6VlDOOEJy5h5+giV0Qw="; }; - }; + openssl = { + version = "3.0.11"; + hash = "sha256-n6TUFXzWgxk1pUJ5ZxzCDF5U6VlDOOEJy5h5+giV0Qw="; + }; + }; v312 = buildECTesterStandalone { - openssl = { version="3.1.2"; hash="sha256-jHdpkxVGUtC7OT9QbYULgRUXyL2NJLEAiu9X++VdPzE="; }; - }; + openssl = { + version = "3.1.2"; + hash = "sha256-jHdpkxVGUtC7OT9QbYULgRUXyL2NJLEAiu9X++VdPzE="; + }; + }; v3010 = buildECTesterStandalone { - openssl = { version="3.0.10"; hash="sha256-II8ngfBapaRVxpMOIKXPe5eGoZh7Qlhb4BN/tF4rimQ="; }; - }; + openssl = { + version = "3.0.10"; + hash = "sha256-II8ngfBapaRVxpMOIKXPe5eGoZh7Qlhb4BN/tF4rimQ="; + }; + }; v311 = buildECTesterStandalone { - openssl = { version="3.1.1"; hash="sha256-aLQF6mRSHJhTd3lbW3BdEWwc87+TOE0bvngkf3YBCCI="; }; - }; + openssl = { + version = "3.1.1"; + hash = "sha256-aLQF6mRSHJhTd3lbW3BdEWwc87+TOE0bvngkf3YBCCI="; + }; + }; v309 = buildECTesterStandalone { - openssl = { version="3.0.9"; hash="sha256-Luwx8qwOEm/2jYEHiR71NBWcT8+wlTZdTNTcV9gmFu4="; }; - }; + openssl = { + version = "3.0.9"; + hash = "sha256-Luwx8qwOEm/2jYEHiR71NBWcT8+wlTZdTNTcV9gmFu4="; + }; + }; v310 = buildECTesterStandalone { - openssl = { version="3.1.0"; hash="sha256-qG6tXD4lm/F1FN7LMLKQ4L86Y2aDFobP+6z3UN9EFSc="; }; - }; + openssl = { + version = "3.1.0"; + hash = "sha256-qG6tXD4lm/F1FN7LMLKQ4L86Y2aDFobP+6z3UN9EFSc="; + }; + }; v308 = buildECTesterStandalone { - openssl = { version="3.0.8"; hash="sha256-aTPi8dpvI6UOoibuxukbVD0nfSCYAldjtZMc9qfgmcc="; }; - }; + openssl = { + version = "3.0.8"; + hash = "sha256-aTPi8dpvI6UOoibuxukbVD0nfSCYAldjtZMc9qfgmcc="; + }; + }; v307 = buildECTesterStandalone { - openssl = { version="3.0.7"; hash="sha256-6Pc1kIFYRtsobSFZUP3vm4grtriG1QrLQxwChXgv41s="; }; - }; -}
\ No newline at end of file + openssl = { + version = "3.0.7"; + hash = "sha256-6Pc1kIFYRtsobSFZUP3vm4grtriG1QrLQxwChXgv41s="; + }; + }; +} diff --git a/nix/opensslshim.nix b/nix/opensslshim.nix index 6260b71..1c79e94 100644 --- a/nix/opensslshim.nix +++ b/nix/opensslshim.nix @@ -1,8 +1,6 @@ -{ - pkgs - , openssl -}: -with pkgs; stdenv.mkDerivation { +{ pkgs, openssl }: +with pkgs; +stdenv.mkDerivation { name = "OpenSSL Shim"; src = ../standalone/src/main/resources/cz/crcs/ectester/standalone/libs/jni; diff --git a/nix/tomcrypt_pkg_versions.nix b/nix/tomcrypt_pkg_versions.nix index fcd0883..c3ccc19 100644 --- a/nix/tomcrypt_pkg_versions.nix +++ b/nix/tomcrypt_pkg_versions.nix @@ -1,26 +1,48 @@ +{ buildECTesterStandalone }: { - buildECTesterStandalone -}: -{ v1182 = buildECTesterStandalone { - tomcrypt = { version = "1.18.2"; hash = "sha256-MEU+u54aXKGSAMPYsh+L9axowzIHiew1uWq8wDsEBmw=";}; - tommath = { version = "1.3.0"; hash = "sha256-KWJy2TQ1mRMI63NgdgDANLVYgHoH6CnnURQuZcz6nQg="; }; + tomcrypt = { + version = "1.18.2"; + hash = "sha256-MEU+u54aXKGSAMPYsh+L9axowzIHiew1uWq8wDsEBmw="; + }; + tommath = { + version = "1.3.0"; + hash = "sha256-KWJy2TQ1mRMI63NgdgDANLVYgHoH6CnnURQuZcz6nQg="; + }; }; v1181 = buildECTesterStandalone { - tomcrypt = { version = "1.18.1"; hash = "sha256-P00koc4+mAHQ/L5iCuPoiOeI/msZscO5KHZrqmbotRo=";}; - tommath = { version = "1.3.0"; hash = "sha256-KWJy2TQ1mRMI63NgdgDANLVYgHoH6CnnURQuZcz6nQg="; }; + tomcrypt = { + version = "1.18.1"; + hash = "sha256-P00koc4+mAHQ/L5iCuPoiOeI/msZscO5KHZrqmbotRo="; + }; + tommath = { + version = "1.3.0"; + hash = "sha256-KWJy2TQ1mRMI63NgdgDANLVYgHoH6CnnURQuZcz6nQg="; + }; }; v1180 = buildECTesterStandalone { - tomcrypt = { version = "1.18.0"; hash = "sha256-Y7U+updJI/f3zD6k84DTZDQZh6vhfqR0W8HyizlUZcU=";}; - tommath = { version = "1.3.0"; hash = "sha256-KWJy2TQ1mRMI63NgdgDANLVYgHoH6CnnURQuZcz6nQg="; }; + tomcrypt = { + version = "1.18.0"; + hash = "sha256-Y7U+updJI/f3zD6k84DTZDQZh6vhfqR0W8HyizlUZcU="; + }; + tommath = { + version = "1.3.0"; + hash = "sha256-KWJy2TQ1mRMI63NgdgDANLVYgHoH6CnnURQuZcz6nQg="; + }; }; # v101 = buildECTesterStandalone { # tomcrypt = { version = "1.01"; hash = "sha256-lVAPxgkAcBivzZmWfqu0sEh8yGo7Ji2hIYwx4/g0GzM=";}; # tommath = { version = "1.3.0"; hash = "sha256-KWJy2TQ1mRMI63NgdgDANLVYgHoH6CnnURQuZcz6nQg="; }; # }; v117 = buildECTesterStandalone { - tomcrypt = { version = "1.17"; hash = "sha256-NWWAs6p27UC64nDL0MwMvzU5aWNe8LZu7DC06d/8isA=";}; + tomcrypt = { + version = "1.17"; + hash = "sha256-NWWAs6p27UC64nDL0MwMvzU5aWNe8LZu7DC06d/8isA="; + }; # NOTE: which is the correct version of libtommath for a particular version of libtomcryp? - tommath = { version = "1.3.0"; hash = "sha256-KWJy2TQ1mRMI63NgdgDANLVYgHoH6CnnURQuZcz6nQg="; }; - }; + tommath = { + version = "1.3.0"; + hash = "sha256-KWJy2TQ1mRMI63NgdgDANLVYgHoH6CnnURQuZcz6nQg="; + }; + }; } diff --git a/nix/tomcryptshim.nix b/nix/tomcryptshim.nix index 64e22b4..bcdc984 100644 --- a/nix/tomcryptshim.nix +++ b/nix/tomcryptshim.nix @@ -1,9 +1,10 @@ { - pkgs - , libtomcrypt - , libtommath + pkgs, + libtomcrypt, + libtommath, }: -with pkgs; stdenv.mkDerivation { +with pkgs; +stdenv.mkDerivation { name = "TomCryptShim"; src = ../standalone/src/main/resources/cz/crcs/ectester/standalone/libs/jni; @@ -0,0 +1,21 @@ +{ pkgs, libressl }: +with pkgs; +stdenv.mkDerivation rec { + name = "LibreSSLShim"; + src = ../standalone/src/main/resources/cz/crcs/ectester/standalone/libs/jni; + + buildInputs = [ + libressl + pkg-config + jdk11_headless + ]; + + buildPhase = '' + make libressl + ''; + + installPhase = '' + mkdir --parents $out/lib + cp libressl_provider.so $out/lib + ''; +} diff --git a/standalone/src/main/resources/cz/crcs/ectester/standalone/libs/jni/Makefile b/standalone/src/main/resources/cz/crcs/ectester/standalone/libs/jni/Makefile index 0ee834c..3ceb718 100644 --- a/standalone/src/main/resources/cz/crcs/ectester/standalone/libs/jni/Makefile +++ b/standalone/src/main/resources/cz/crcs/ectester/standalone/libs/jni/Makefile @@ -97,10 +97,10 @@ openssl.o: openssl.c boringssl: boringssl_provider.so boringssl_provider.so: boringssl.o c_utils.o | lib_timing.so lib_csignals.so - NIX_CFLAGS_COMPILE= $(CC) $(CFLAGS) $(LFLAGS) -o $@ -Wl,-rpath,'$$ORIGIN/lib' $^ -L. -Wl,-Bstatic -l:lib_boringssl.a -Wl,-Bdynamic -l:lib_timing.so -l:lib_csignals.so + $(CC) $(CFLAGS) $(LFLAGS) -o $@ -Wl,-rpath,'$$ORIGIN/lib' $^ -L. -Wl,-Bstatic -l:lib_boringssl.a -Wl,-Bdynamic -l:lib_timing.so -l:lib_csignals.so boringssl.o: boringssl.c - NIX_CFLAGS_COMPILE= $(CC) -I$(BORINGSSL_CFLAGS) $(CFLAGS) -c $< + $(CC) -I$(BORINGSSL_CFLAGS) $(CFLAGS) -c $< # libgcrypt shim @@ -183,10 +183,10 @@ nettle.o: nettle.c libressl: libressl_provider.so libressl_provider.so: libressl.o c_utils.o | lib_timing.so lib_csignals.so - NIX_CFLAGS_COMPILE= $(CC) $(LFLAGS) -o $@ -Wl,-rpath,'$$ORIGIN/lib' $^ -L. -Wl,-Bstatic $(shell pkg-config --libs libresslcrypto) -Wl,-Bdynamic -l:lib_timing.so -l:lib_csignals.so + $(CC) $(LFLAGS) -o $@ -Wl,-rpath,'$$ORIGIN/lib' $^ -L. -Wl,-Bstatic $(shell pkg-config --libs libresslcrypto) -Wl,-Bdynamic -l:lib_timing.so -l:lib_csignals.so libressl.o: libressl.c - NIX_CFLAGS_COMPILE= $(CC) $(shell pkg-config --cflags libresslcrypto) $(CFLAGS) -c $< + $(CC) $(shell pkg-config --cflags libresslcrypto) $(CFLAGS) -c $< help: @echo "# This makefile builds the JNI shims necessary to test native libraries." |