BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #85177 from mayflower/sslscan-openssl-ssl3

Browse source 
sslscan: enabling scanning for sslv3
This commit is contained in:
Maximilian Bosch 2020-04-14 15:59:37 +02:00 committed by GitHub
commit 85e15b545a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,6 +1,7 @@
{ stdenv, fetchurl, buildPackages, perl, coreutils { stdenv, fetchurl, buildPackages, perl, coreutils
, withCryptodev ? false, cryptodev , withCryptodev ? false, cryptodev
, enableSSL2 ? false , enableSSL2 ? false
, enableSSL3 ? false
, static ? false , static ? false
}: }:
@ -76,6 +77,7 @@ let
"-DHAVE_CRYPTODEV" "-DHAVE_CRYPTODEV"
"-DUSE_CRYPTODEV_DIGESTS" "-DUSE_CRYPTODEV_DIGESTS"
] ++ stdenv.lib.optional enableSSL2 "enable-ssl2" ] ++ stdenv.lib.optional enableSSL2 "enable-ssl2"
++ stdenv.lib.optional enableSSL3 "enable-ssl3"
++ stdenv.lib.optional (versionAtLeast version "1.1.0" && stdenv.hostPlatform.isAarch64) "no-afalgeng" ++ stdenv.lib.optional (versionAtLeast version "1.1.0" && stdenv.hostPlatform.isAarch64) "no-afalgeng"
# OpenSSL needs a specific `no-shared` configure flag. # OpenSSL needs a specific `no-shared` configure flag.
# See https://wiki.openssl.org/index.php/Compilation_and_Installation#Configure_Options # See https://wiki.openssl.org/index.php/Compilation_and_Installation#Configure_Options
@ -164,5 +166,4 @@ in {
]; ];
withDocs = true; withDocs = true;
}; };
} }

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

@ -6744,7 +6744,10 @@ in
sshpass = callPackage ../tools/networking/sshpass { }; sshpass = callPackage ../tools/networking/sshpass { };
sslscan = callPackage ../tools/security/sslscan { sslscan = callPackage ../tools/security/sslscan {
openssl = openssl_1_0_2.override { enableSSL2 = true; }; openssl = openssl_1_0_2.override {
enableSSL2 = true;
enableSSL3 = true;
};
}; };
sslmate = callPackage ../development/tools/sslmate { }; sslmate = callPackage ../development/tools/sslmate { };