pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #31147 from grahamc/openssl

Upgrade OpenSSL for CVE-2017-3732, CVE-2017-3193

authored by Graham Christensen and committed by GitHub e080b87b 4d7c34fb

+7 -7
unified split
+4 -4
pkgs/development/libraries/openssl/default.nix
··· 107 in { 108 109 openssl_1_0_2 = common { 110 - version = "1.0.2l"; 111 - sha256 = "037kvpisc6qh5dkppcwbm5bg2q800xh2hma3vghz8xcycmdij1yf"; 112 }; 113 114 openssl_1_1_0 = common { 115 - version = "1.1.0f"; 116 - sha256 = "0r97n4n552ns571diz54qsgarihrxvbn7kvyv8wjyfs9ybrldxqj"; 117 }; 118 119 }
··· 107 in { 108 109 openssl_1_0_2 = common { 110 + version = "1.0.2m"; 111 + sha256 = "03vvlfnxx4lhxc83ikfdl6jqph4h52y7lb7li03va6dkqrgg2vwc"; 112 }; 113 114 openssl_1_1_0 = common { 115 + version = "1.1.0g"; 116 + sha256 = "1bvka2wf33w2vxv7yw578nnjqyhz2b3chvfb0l4k2ffscw950kfy"; 117 }; 118 119 }
+3 -3
pkgs/development/libraries/openssl/nix-ssl-cert-file.patch
··· 5 switch (cmd) { 6 case X509_L_FILE_LOAD: 7 if (argl == X509_FILETYPE_DEFAULT) { 8 - - file = (char *)getenv(X509_get_default_cert_file_env()); 9 - + file = (char *)getenv("NIX_SSL_CERT_FILE"); 10 + if (!file) 11 - + file = (char *)getenv(X509_get_default_cert_file_env()); 12 if (file) 13 ok = (X509_load_cert_crl_file(ctx, file, 14 X509_FILETYPE_PEM) != 0);
··· 5 switch (cmd) { 6 case X509_L_FILE_LOAD: 7 if (argl == X509_FILETYPE_DEFAULT) { 8 + - file = getenv(X509_get_default_cert_file_env()); 9 + + file = getenv("NIX_SSL_CERT_FILE"); 10 + if (!file) 11 + + file = getenv(X509_get_default_cert_file_env()); 12 if (file) 13 ok = (X509_load_cert_crl_file(ctx, file, 14 X509_FILETYPE_PEM) != 0);