movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-10 03:23:29 +03:00
Code Issues Projects Releases Packages Wiki Activity

sslscan: enable TLS compression check

Browse source
This commit is contained in:
Enno Richter 2022-09-08 14:06:02 +02:00
parent ad2aac1e24
commit 3278ce100b
2 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
pkgs/development/libraries/openssl/default.nix
View file

@ -1,5 +1,6 @@
{ lib, stdenv, fetchurl, buildPackages, perl, coreutils { lib, stdenv, fetchurl, buildPackages, perl, coreutils
, withCryptodev ? false, cryptodev , withCryptodev ? false, cryptodev
, withZlib ? false, zlib
, enableSSL2 ? false , enableSSL2 ? false
, enableSSL3 ? false , enableSSL3 ? false
, static ? stdenv.hostPlatform.isStatic , static ? stdenv.hostPlatform.isStatic
@ -71,7 +72,8 @@ let
buildInputs = lib.optional withCryptodev cryptodev buildInputs = lib.optional withCryptodev cryptodev
# perl is included to allow the interpreter path fixup hook to set the # perl is included to allow the interpreter path fixup hook to set the
# correct interpreter in c_rehash. # correct interpreter in c_rehash.
++ lib.optional withPerl perl; ++ lib.optional withPerl perl
++ lib.optional withZlib zlib;
# TODO(@Ericson2314): Improve with mass rebuild # TODO(@Ericson2314): Improve with mass rebuild
configurePlatforms = []; configurePlatforms = [];
@ -138,6 +140,7 @@ let
# This introduces a reference to the CTLOG_FILE which is undesired when # This introduces a reference to the CTLOG_FILE which is undesired when
# trying to build binaries statically. # trying to build binaries statically.
++ lib.optional static "no-ct" ++ lib.optional static "no-ct"
++ lib.optional withZlib "zlib"
; ;
makeFlags = [ makeFlags = [

4
pkgs/top-level/all-packages.nix
View file

@ -11216,7 +11216,9 @@ with pkgs;
sshpass = callPackage ../tools/networking/sshpass { }; 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 { }; sslmate = callPackage ../development/tools/sslmate { };