public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

openssl_1_0_1j: fix after updating the main version

Browse Source
This commit is contained in:
Vladimír Čunát 2015-03-19 20:28:35 +01:00
parent 2fe351c7e3
commit cd97c58110
2 changed files with 42 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/libraries/openssl/1.0.1j.nix
View File

@ -18,7 +18,7 @@ let
# hardcoding something like /etc/ssl/cert.pem is impure and # hardcoding something like /etc/ssl/cert.pem is impure and
# cannot be overriden per-process. For security, the # cannot be overriden per-process. For security, the
# environment variable is ignored for setuid binaries. # environment variable is ignored for setuid binaries.
./cert-file.patch ./cert-file-1.0.1j.patch
# Remove the compilation time from the library # Remove the compilation time from the library
./no-date-in-library.patch ./no-date-in-library.patch
] ]

41
pkgs/development/libraries/openssl/cert-file-1.0.1j.patch Normal file
View File

@ -0,0 +1,41 @@
diff -ru -x '*~' openssl-1.0.0e-orig/crypto/x509/x509_def.c openssl-1.0.0e/crypto/x509/x509_def.c
--- openssl-1.0.0e-orig/crypto/x509/x509_def.c 1999-09-11 19:54:11.000000000 +0200
+++ openssl-1.0.0e/crypto/x509/x509_def.c 2011-09-12 18:30:59.386501609 +0200
@@ -57,6 +57,10 @@
*/
#include <stdio.h>
+#include <stdlib.h>
+#include <limits.h>
+#include <unistd.h>
+#include <sys/types.h>
#include "cryptlib.h"
#include <openssl/crypto.h>
#include <openssl/x509.h>
@@ -71,7 +75,25 @@
{ return(X509_CERT_DIR); }
const char *X509_get_default_cert_file(void)
- { return(X509_CERT_FILE); }
+ {
+ static char buf[PATH_MAX] = X509_CERT_FILE;
+ static int init = 0;
+ if (!init) {
+ init = 1;
+ char * s = getenv("OPENSSL_X509_CERT_FILE");
+ if (s) {
+#ifndef OPENSSL_SYS_WINDOWS
+ if (getuid() == geteuid()) {
+#endif
+ strncpy(buf, s, sizeof(buf));
+ buf[sizeof(buf) - 1] = 0;
+#ifndef OPENSSL_SYS_WINDOWS
+ }
+#endif
+ }
+ }
+ return buf;
+ }
const char *X509_get_default_cert_dir_env(void)
{ return(X509_CERT_DIR_EVP); }