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

openssl: Fix Windows compat in cert-file.patch.

Browse Source 
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>
This commit is contained in:
aszlig 2014-02-24 01:07:57 +01:00
parent ba8b0e8af9
commit 60a2fc1fec
No known key found for this signature in database
GPG Key ID: D0EBD0EC8C2DC961
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/libraries/openssl/cert-file.patch
View File

@ -12,7 +12,7 @@ diff -ru -x '*~' openssl-1.0.0e-orig/crypto/x509/x509_def.c openssl-1.0.0e/crypt
#include "cryptlib.h" #include "cryptlib.h"
#include <openssl/crypto.h> #include <openssl/crypto.h>
#include <openssl/x509.h> #include <openssl/x509.h>
@@ -71,7 +75,19 @@ @@ -71,7 +75,25 @@
{ return(X509_CERT_DIR); } { return(X509_CERT_DIR); }
const char *X509_get_default_cert_file(void) const char *X509_get_default_cert_file(void)
@ -23,9 +23,15 @@ diff -ru -x '*~' openssl-1.0.0e-orig/crypto/x509/x509_def.c openssl-1.0.0e/crypt
+ if (!init) { + if (!init) {
+ init = 1; + init = 1;
+ char * s = getenv("OPENSSL_X509_CERT_FILE"); + char * s = getenv("OPENSSL_X509_CERT_FILE");
+ if (s && getuid() == geteuid()) { + if (s) {
+#ifndef OPENSSL_SYS_WINDOWS
+ if (getuid() == geteuid()) {
+#endif
+ strncpy(buf, s, sizeof(buf)); + strncpy(buf, s, sizeof(buf));
+ buf[sizeof(buf) - 1] = 0; + buf[sizeof(buf) - 1] = 0;
+#ifndef OPENSSL_SYS_WINDOWS
+ }
+#endif
+ } + }
+ } + }
+ return buf; + return buf;