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

gnutls: respect NIX_SSL_CERT_FILE, same as our openssl

Browse Source 
The patch should work fine, regardless of the Darwin patch being applied.
This commit is contained in:
Vladimír Čunát 2019-04-22 10:49:11 +02:00 committed by Daiderd Jordan
parent 33e7d721b6
commit 39c2b6452c
No known key found for this signature in database
GPG Key ID: D02435D05B810C96
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/libraries/gnutls/default.nix
View File

@ -30,8 +30,9 @@ stdenv.mkDerivation {
outputs = [ "bin" "dev" "out" "man" "devdoc" ]; outputs = [ "bin" "dev" "out" "man" "devdoc" ];
outputInfo = "devdoc"; outputInfo = "devdoc";
patches = [ ./nix-ssl-cert-file.patch ]
# Disable native add_system_trust. # Disable native add_system_trust.
patches = lib.optional (isDarwin && !withSecurity) ./no-security-framework.patch; ++ lib.optional (isDarwin && !withSecurity) ./no-security-framework.patch;
# Skip some tests: # Skip some tests:
# - pkgconfig: building against the result won't work before installing (3.5.11) # - pkgconfig: building against the result won't work before installing (3.5.11)

19
pkgs/development/libraries/gnutls/nix-ssl-cert-file.patch Normal file
View File

@ -0,0 +1,19 @@
allow overriding system trust store location via $NIX_SSL_CERT_FILE
diff --git a/lib/system/certs.c b/lib/system/certs.c
index 611c645..6ef6edb 100644
--- a/lib/system/certs.c
+++ b/lib/system/certs.c
@@ -369,6 +369,11 @@ gnutls_x509_trust_list_add_system_trust(gnutls_x509_trust_list_t list,
unsigned int tl_flags,
unsigned int tl_vflags)
{
- return add_system_trust(list, tl_flags|GNUTLS_TL_NO_DUPLICATES, tl_vflags);
+ tl_flags = tl_flags|GNUTLS_TL_NO_DUPLICATES;
+ const char *file = secure_getenv("NIX_SSL_CERT_FILE");
+ return file
+ ? gnutls_x509_trust_list_add_trust_file(
+ list, file, NULL/*CRL*/, GNUTLS_X509_FMT_PEM, tl_flags, tl_vflags)
+ : add_system_trust(list, tl_flags, tl_vflags);
}