diff options
author | Robert Scott <code@humanleg.org.uk> | 2023-10-26 20:47:16 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-10-26 20:47:16 +0100 |
commit | 377a39f0a23899132e7fa61eab130547c631896f (patch) | |
tree | 47a88da54e88a4495d45e6255e7d403c8de235e2 /pkgs | |
parent | c679700f2caf7bbdb51a85c0b00e9500eca24492 (diff) | |
parent | 3d808c4aa3e73a5a2bf41b8528b4340a11811034 (diff) |
Merge pull request #262594 from vifino/wolfssl-tweaks
wolfssl: ASM/AES-NI/SP Math support; easier variant override
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/libraries/wolfssl/default.nix | 66 |
1 files changed, 46 insertions, 20 deletions
diff --git a/pkgs/development/libraries/wolfssl/default.nix b/pkgs/development/libraries/wolfssl/default.nix index 4c60ccf6c8ba1..35280e4b5eb3c 100644 --- a/pkgs/development/libraries/wolfssl/default.nix +++ b/pkgs/development/libraries/wolfssl/default.nix @@ -5,37 +5,63 @@ , autoreconfHook , util-linux , openssl +# The primary --enable-XXX variant. 'all' enables most features, but causes build-errors for some software, +# requiring to build a special variant for that software. Example: 'haproxy' +, variant ? "all" +, extraConfigureFlags ? [] +, enableLto ? !(stdenv.isDarwin || stdenv.hostPlatform.isStatic || stdenv.cc.isClang) }: - -stdenv.mkDerivation rec { - pname = "wolfssl"; +stdenv.mkDerivation (finalAttrs: { + pname = "wolfssl-${variant}"; version = "5.6.3"; src = fetchFromGitHub { owner = "wolfSSL"; repo = "wolfssl"; - rev = "refs/tags/v${version}-stable"; + rev = "refs/tags/v${finalAttrs.version}-stable"; hash = "sha256-UN4zs+Rxh/bsLD1BQA+f1YN/UOJ6OB2HduhoetEp10Y="; }; postPatch = '' patchShebangs ./scripts - # ocsp tests require network access - sed -i -e '/ocsp\.test/d' -e '/ocsp-stapling\.test/d' scripts/include.am + # ocsp stapling tests require network access, so skip them + sed -i -e'2s/.*/exit 77/' scripts/ocsp-stapling.test # ensure test detects musl-based systems too substituteInPlace scripts/ocsp-stapling2.test \ --replace '"linux-gnu"' '"linux-"' ''; - # Almost same as Debian but for now using --enable-all --enable-reproducible-build instead of --enable-distro to ensure options.h gets installed configureFlags = [ - "--enable-all" - "--enable-base64encode" + "--enable-${variant}" + "--enable-reproducible-build" + ] ++ lib.optionals (variant == "all") [ + # Extra feature flags to add while building the 'all' variant. + # Since they conflict while building other variants, only specify them for this one. "--enable-pkcs11" "--enable-writedup" - "--enable-reproducible-build" - "--enable-tls13" - ]; + "--enable-base64encode" + ] ++ [ + # We're not on tiny embedded machines. + # Increase TLS session cache from 33 sessions to 20k. + "--enable-bigcache" + + # Use WolfSSL's Single Precision Math with timing-resistant cryptography. + "--enable-sp=yes${lib.optionalString (!stdenv.isx86_32) ",asm"}" + "--enable-sp-math-all" + "--enable-harden" + ] ++ lib.optionals (stdenv.hostPlatform.isx86_64) [ + # Enable AVX/AVX2/AES-NI instructions, gated by runtime detection via CPUID. + "--enable-intelasm" + "--enable-aesni" + ] ++ lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [ + # No runtime detection under ARM and no platform function checks like for X86. + # However, all ARM macOS systems have the supported extensions autodetected in the configure script. + "--enable-armasm=inline" + ] ++ extraConfigureFlags; + + # LTO should help with the C implementations. + env.NIX_CFLAGS_COMPILE = lib.optionalString enableLto "-flto"; + env.NIX_LDFLAGS_COMPILE = lib.optionalString enableLto "-flto"; outputs = [ "dev" @@ -60,19 +86,19 @@ stdenv.mkDerivation rec { ]; postInstall = '' - # fix recursive cycle: - # wolfssl-config points to dev, dev propagates bin - moveToOutput bin/wolfssl-config "$dev" - # moveToOutput also removes "$out" so recreate it - mkdir -p "$out" + # fix recursive cycle: + # wolfssl-config points to dev, dev propagates bin + moveToOutput bin/wolfssl-config "$dev" + # moveToOutput also removes "$out" so recreate it + mkdir -p "$out" ''; meta = with lib; { description = "A small, fast, portable implementation of TLS/SSL for embedded devices"; homepage = "https://www.wolfssl.com/"; - changelog = "https://github.com/wolfSSL/wolfssl/releases/tag/v${version}-stable"; + changelog = "https://github.com/wolfSSL/wolfssl/releases/tag/v${finalAttrs.version}-stable"; platforms = platforms.all; license = licenses.gpl2Plus; - maintainers = with maintainers; [ fab ]; + maintainers = with maintainers; [ fab vifino ]; }; -} +}) |