| 1 |
alonbl 14/08/24 19:09:45 |
| 2 |
|
| 3 |
Added: gnutls-3.3.7-build.patch |
| 4 |
Log: |
| 5 |
Version bump, bug#520784, cleanup |
| 6 |
|
| 7 |
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key BF20DC51) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 net-libs/gnutls/files/gnutls-3.3.7-build.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/gnutls/files/gnutls-3.3.7-build.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/gnutls/files/gnutls-3.3.7-build.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: gnutls-3.3.7-build.patch |
| 16 |
=================================================================== |
| 17 |
From 580c82cbe8629b0848b30a4a4ed659c558dc42c7 Mon Sep 17 00:00:00 2001 |
| 18 |
From: Alon Bar-Lev <alon.barlev@×××××.com> |
| 19 |
Date: Sun, 24 Aug 2014 21:19:26 +0300 |
| 20 |
Subject: [PATCH] build: condition pkcs11 block |
| 21 |
|
| 22 |
Signed-off-by: Alon Bar-Lev <alon.barlev@×××××.com> |
| 23 |
--- |
| 24 |
lib/gnutls_privkey.c | 2 ++ |
| 25 |
1 file changed, 2 insertions(+) |
| 26 |
|
| 27 |
diff --git a/lib/gnutls_privkey.c b/lib/gnutls_privkey.c |
| 28 |
index 24ed6f2..647777e 100644 |
| 29 |
--- a/lib/gnutls_privkey.c |
| 30 |
+++ b/lib/gnutls_privkey.c |
| 31 |
@@ -198,6 +198,7 @@ _gnutls_privkey_get_mpis(gnutls_privkey_t key, gnutls_pk_params_st * params) |
| 32 |
case GNUTLS_PRIVKEY_X509: |
| 33 |
ret = _gnutls_pk_params_copy(params, &key->key.x509->params); |
| 34 |
break; |
| 35 |
+#ifdef ENABLE_PKCS11 |
| 36 |
case GNUTLS_PRIVKEY_PKCS11: { |
| 37 |
gnutls_pubkey_t pubkey; |
| 38 |
|
| 39 |
@@ -210,6 +211,7 @@ _gnutls_privkey_get_mpis(gnutls_privkey_t key, gnutls_pk_params_st * params) |
| 40 |
|
| 41 |
break; |
| 42 |
} |
| 43 |
+#endif |
| 44 |
default: |
| 45 |
gnutls_assert(); |
| 46 |
return GNUTLS_E_INVALID_REQUEST; |
| 47 |
-- |
| 48 |
1.8.5.5 |
| 49 |
|
| 50 |
From 95cf32756f65d945dff17458a89a0bdf7fc81f41 Mon Sep 17 00:00:00 2001 |
| 51 |
From: Alon Bar-Lev <alon.barlev@×××××.com> |
| 52 |
Date: Sun, 24 Aug 2014 21:49:55 +0300 |
| 53 |
Subject: [PATCH] build: tests: x509cert-tl: support separate builddir |
| 54 |
|
| 55 |
Signed-off-by: Alon Bar-Lev <alon.barlev@×××××.com> |
| 56 |
--- |
| 57 |
tests/Makefile.am | 1 + |
| 58 |
tests/x509cert-tl.c | 6 +++++- |
| 59 |
2 files changed, 6 insertions(+), 1 deletion(-) |
| 60 |
|
| 61 |
diff --git a/tests/Makefile.am b/tests/Makefile.am |
| 62 |
index 6638fce..3ad6c67 100644 |
| 63 |
--- a/tests/Makefile.am |
| 64 |
+++ b/tests/Makefile.am |
| 65 |
@@ -128,6 +128,7 @@ TESTS_ENVIRONMENT = \ |
| 66 |
PKCS12FILE_2=$(srcdir)/pkcs12-decode/pkcs12_2certs.p12 \ |
| 67 |
PKCS12PASSWORD_2="" \ |
| 68 |
PKCS12PATH=$(srcdir)/pkcs12-decode/ \ |
| 69 |
+ X509CERTDIR=$(srcdir)/x509cert-dir/ \ |
| 70 |
EXEEXT=$(EXEEXT) \ |
| 71 |
top_builddir="$(top_builddir)" \ |
| 72 |
srcdir="$(srcdir)" |
| 73 |
diff --git a/tests/x509cert-tl.c b/tests/x509cert-tl.c |
| 74 |
index dad7860..5ecc03e 100644 |
| 75 |
--- a/tests/x509cert-tl.c |
| 76 |
+++ b/tests/x509cert-tl.c |
| 77 |
@@ -189,6 +189,7 @@ static time_t mytime(time_t * t) |
| 78 |
void doit(void) |
| 79 |
{ |
| 80 |
int ret; |
| 81 |
+ const char *path; |
| 82 |
gnutls_datum_t data; |
| 83 |
gnutls_x509_crt_t server_crt, ca_crt2; |
| 84 |
gnutls_x509_trust_list_t tl; |
| 85 |
@@ -209,7 +210,10 @@ void doit(void) |
| 86 |
gnutls_x509_crt_init(&server_crt); |
| 87 |
gnutls_x509_crt_init(&ca_crt2); |
| 88 |
|
| 89 |
- ret = gnutls_x509_trust_list_add_trust_dir(tl, "./x509cert-dir", NULL, GNUTLS_X509_FMT_PEM, 0, 0); |
| 90 |
+ path = getenv("X509CERTDIR"); |
| 91 |
+ if (!path) |
| 92 |
+ path = "./x509cert-dir"; |
| 93 |
+ ret = gnutls_x509_trust_list_add_trust_dir(tl, path, NULL, GNUTLS_X509_FMT_PEM, 0, 0); |
| 94 |
if (ret != 1) |
| 95 |
fail("gnutls_x509_trust_list_add_trust_dir: %d\n", ret); |
| 96 |
|
| 97 |
-- |
| 98 |
1.8.5.5 |
Archives