mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-27 08:01:14 +00:00
60a2fc1fec
In Windows there is no get(e)uid() call available, so the build fails. The patch now checks whether OPENSSL_SYS_WINDOWS is defined and only uses those calls if _not_ on Windows. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
42 lines
1.1 KiB
Diff
42 lines
1.1 KiB
Diff
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); }
|