Unverified Commit ef3fd36f authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #190318 from elohmeier/sslscan-tlscompression

parents 313b8493 3278ce10

pkgs/development/libraries/openssl/default.nix

+4 −1
Original line number Diff line number Diff line 
{ lib, stdenv, fetchurl, buildPackages, perl, coreutils

, withCryptodev ? false, cryptodev

, withZlib ? false, zlib

, enableSSL2 ? false

, enableSSL3 ? false

, static ? stdenv.hostPlatform.isStatic
@@ -75,7 +76,8 @@ let 
    buildInputs = lib.optional withCryptodev cryptodev

      # perl is included to allow the interpreter path fixup hook to set the

      # correct interpreter in c_rehash.

      ++ lib.optional withPerl perl;

      ++ lib.optional withPerl perl

      ++ lib.optional withZlib zlib;



    # TODO(@Ericson2314): Improve with mass rebuild

    configurePlatforms = [];
@@ -142,6 +144,7 @@ let 
      # This introduces a reference to the CTLOG_FILE which is undesired when

      # trying to build binaries statically.

      ++ lib.optional static "no-ct"

      ++ lib.optional withZlib "zlib"

      ;



    makeFlags = [

pkgs/top-level/all-packages.nix

+3 −1
Original line number Diff line number Diff line
@@ -12253,7 +12253,9 @@ with pkgs; 














  sshpass = callPackage ../tools/networking/sshpass { };



























  sslscan = callPackage ../tools/security/sslscan { };













  sslscan = callPackage ../tools/security/sslscan {













    openssl = openssl.override { withZlib = true; };













  };





























  sslmate = callPackage ../development/tools/sslmate { };