diff --git a/pkgs/development/libraries/openssl/1.0.2/darwin64-arm64.patch b/pkgs/development/libraries/openssl/1.0.2/darwin64-arm64.patch deleted file mode 100644 index 5ecfb4175569..000000000000 --- a/pkgs/development/libraries/openssl/1.0.2/darwin64-arm64.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/Configure b/Configure -index 494e0b3..0b448aa 100755 ---- a/Configure -+++ b/Configure -@@ -652,6 +652,8 @@ my %table=( - "darwin64-x86_64-cc","cc:-arch x86_64 -O3 -DL_ENDIAN -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:".eval{my $asm=$x86_64_asm;$asm=~s/rc4\-[^:]+//;$asm}.":macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch x86_64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", - "debug-darwin64-x86_64-cc","cc:-arch x86_64 -ggdb -g2 -O0 -DL_ENDIAN -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:".eval{my $asm=$x86_64_asm;$asm=~s/rc4\-[^:]+//;$asm}.":macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch x86_64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", - "debug-darwin-ppc-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DB_ENDIAN -g -Wall -O::-D_REENTRANT:MACOSX::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${ppc32_asm}:osx32:dlfcn:darwin-shared:-fPIC:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", -+"darwin64-arm64-cc","cc:-arch arm64 -O3 -DL_ENDIAN -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-arch arm64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", -+"debug-darwin64-arm64-cc","cc:-arch arm64 -ggdb -g2 -O0 -DL_ENDIAN -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-arch arm64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", - # iPhoneOS/iOS - "iphoneos-cross","llvm-gcc:-O3 -isysroot \$(CROSS_TOP)/SDKs/\$(CROSS_SDK) -fomit-frame-pointer -fno-common::-D_REENTRANT:iOS:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", diff --git a/pkgs/development/libraries/openssl/1.0.2/nix-ssl-cert-file.patch b/pkgs/development/libraries/openssl/1.0.2/nix-ssl-cert-file.patch deleted file mode 100644 index 5765409fdd57..000000000000 --- a/pkgs/development/libraries/openssl/1.0.2/nix-ssl-cert-file.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/crypto/x509/by_file.c b/crypto/x509/by_file.c -index e6d0e6e1a6..b89456fd87 100644 ---- a/crypto/x509/by_file.c -+++ b/crypto/x509/by_file.c -@@ -97,7 +97,10 @@ static int by_file_ctrl(X509_LOOKUP *ctx, int cmd, const char *argp, - switch (cmd) { - case X509_L_FILE_LOAD: - if (argl == X509_FILETYPE_DEFAULT) { -- file = ossl_safe_getenv(X509_get_default_cert_file_env()); -+ file = ossl_safe_getenv("NIX_SSL_CERT_FILE"); -+ -+ if (!file) -+ file = ossl_safe_getenv(X509_get_default_cert_file_env()); - - if (file) - ok = (X509_load_cert_crl_file(ctx, file, diff --git a/pkgs/development/libraries/openssl/1.0.2/use-etc-ssl-certs-darwin.patch b/pkgs/development/libraries/openssl/1.0.2/use-etc-ssl-certs-darwin.patch deleted file mode 100644 index 3d9ee7e6a822..000000000000 --- a/pkgs/development/libraries/openssl/1.0.2/use-etc-ssl-certs-darwin.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -ru -x '*~' openssl-1.0.1r-orig/crypto/cryptlib.h openssl-1.0.1r/crypto/cryptlib.h ---- openssl-1.0.1r-orig/crypto/cryptlib.h 2016-01-28 14:38:30.000000000 +0100 -+++ openssl-1.0.1r/crypto/cryptlib.h 2016-02-03 12:54:29.193165176 +0100 -@@ -81,8 +81,8 @@ - - # ifndef OPENSSL_SYS_VMS - # define X509_CERT_AREA OPENSSLDIR - # define X509_CERT_DIR OPENSSLDIR "/certs" --# define X509_CERT_FILE OPENSSLDIR "/cert.pem" -+# define X509_CERT_FILE "/nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt" - # define X509_PRIVATE_DIR OPENSSLDIR "/private" - # else - # define X509_CERT_AREA "SSLROOT:[000000]" diff --git a/pkgs/development/libraries/openssl/1.0.2/use-etc-ssl-certs.patch b/pkgs/development/libraries/openssl/1.0.2/use-etc-ssl-certs.patch deleted file mode 100644 index 813c6bdf44ab..000000000000 --- a/pkgs/development/libraries/openssl/1.0.2/use-etc-ssl-certs.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -ru -x '*~' openssl-1.0.1r-orig/crypto/cryptlib.h openssl-1.0.1r/crypto/cryptlib.h ---- openssl-1.0.1r-orig/crypto/cryptlib.h 2016-01-28 14:38:30.000000000 +0100 -+++ openssl-1.0.1r/crypto/cryptlib.h 2016-02-03 12:54:29.193165176 +0100 -@@ -81,8 +81,8 @@ - - # ifndef OPENSSL_SYS_VMS - # define X509_CERT_AREA OPENSSLDIR - # define X509_CERT_DIR OPENSSLDIR "/certs" --# define X509_CERT_FILE OPENSSLDIR "/cert.pem" -+# define X509_CERT_FILE "/etc/ssl/certs/ca-certificates.crt" - # define X509_PRIVATE_DIR OPENSSLDIR "/private" - # else - # define X509_CERT_AREA "SSLROOT:[000000]" diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 33ddbf7018c5..648357b00cfb 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -170,20 +170,6 @@ let in { - openssl_1_0_2 = common { - version = "1.0.2u"; - sha256 = "ecd0c6ffb493dd06707d38b14bb4d8c2288bb7033735606569d8f90f89669d16"; - patches = [ - ./1.0.2/nix-ssl-cert-file.patch - - (if stdenv.hostPlatform.isDarwin - then ./1.0.2/use-etc-ssl-certs-darwin.patch - else ./1.0.2/use-etc-ssl-certs.patch) - ] ++ lib.optionals (stdenv.hostPlatform.system == "aarch64-darwin") [ - ./1.0.2/darwin64-arm64.patch - ]; - extraMeta.knownVulnerabilities = [ "Support for OpenSSL 1.0.2 ended with 2019." ]; - }; openssl_1_1 = common rec { version = "1.1.1n"; diff --git a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix index dd3cf0309526..2772ca0460d6 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix @@ -1,9 +1,9 @@ { lib, appleDerivation, xcbuildHook -, openssl_1_0_2, Librpcsvc, xnu, libpcap, developer_cmds }: +, openssl, Librpcsvc, xnu, libpcap, developer_cmds }: appleDerivation { nativeBuildInputs = [ xcbuildHook ]; - buildInputs = [ openssl_1_0_2 xnu Librpcsvc libpcap developer_cmds ]; + buildInputs = [ openssl xnu Librpcsvc libpcap developer_cmds ]; NIX_CFLAGS_COMPILE = " -I./unbound -I${xnu}/Library/Frameworks/System.framework/Headers/"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index daea7f2a186c..6ae4b3a39598 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19589,7 +19589,6 @@ with pkgs; openssl = openssl_1_1; inherit (callPackages ../development/libraries/openssl { }) - openssl_1_0_2 openssl_1_1 openssl_3_0;