[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] GNU gnutls branch, gnutls_2_8_x, updated. gnutls_2_8_4-10-g236b8fe
From: |
Simon Josefsson |
Subject: |
[SCM] GNU gnutls branch, gnutls_2_8_x, updated. gnutls_2_8_4-10-g236b8fe |
Date: |
Wed, 14 Oct 2009 15:27:25 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU gnutls".
http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=236b8fe0e588708ef7936c69d380e905ef1aff2a
The branch, gnutls_2_8_x has been updated
via 236b8fe0e588708ef7936c69d380e905ef1aff2a (commit)
via 1b100e8003da21f29acb31c5053cced6b41a62b4 (commit)
via b4262ace63eb938cbb6c25ec5578d1ed1ff584a3 (commit)
from 379e2c824bc620d8ade999b60aa44d227717ddf2 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 236b8fe0e588708ef7936c69d380e905ef1aff2a
Author: Simon Josefsson <address@hidden>
Date: Wed Oct 14 17:27:20 2009 +0200
Add.
commit 1b100e8003da21f29acb31c5053cced6b41a62b4
Author: Simon Josefsson <address@hidden>
Date: Wed Oct 14 17:24:35 2009 +0200
Regenerate.
commit b4262ace63eb938cbb6c25ec5578d1ed1ff584a3
Author: Simon Josefsson <address@hidden>
Date: Wed Oct 14 16:17:50 2009 +0200
Work around 'Cannot find OID: 1.2.840.113549.1.9.21' PKCS#12 problem.
Reported by Michael Welsh Duggan <address@hidden> in
<http://permalink.gmane.org/gmane.network.gnutls.general/1786>.
-----------------------------------------------------------------------
Summary of changes:
NEWS | 7 +++++++
lib/pkix.asn | 2 ++
lib/pkix_asn1_tab.c | 8 ++++++++
3 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/NEWS b/NEWS
index dd8869f..309c7d4 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,13 @@ See the end for copying conditions.
* Version 2.8.5 (unreleased)
+** libgnutls: Fix PKCS#12 encoding.
+The error you would get was "The OID is not supported.". Problem
+introduced for the v2.8.x branch in 2.7.6.
+
+** guile: Compatibility with guile 2.x.
+By Ludovic Courtes <address@hidden>.
+
** API and ABI modifications:
No changes since last version.
diff --git a/lib/pkix.asn b/lib/pkix.asn
index 833f73d..7c85ff4 100644
--- a/lib/pkix.asn
+++ b/lib/pkix.asn
@@ -476,6 +476,8 @@ pkcs-9-challengePassword ::= CHOICE {
printableString PrintableString,
utf8String UTF8String }
+pkcs-9-at-localKeyId OBJECT IDENTIFIER ::= {iso(1) member-body(2) us(840)
rsadsi(113549) pkcs(1) 9 21}
+
pkcs-9-localKeyId ::= OCTET STRING
pkcs-9-at-friendlyName OBJECT IDENTIFIER ::= {iso(1)
member-body(2) us(840) rsadsi(113549) pkcs(1) 9 20}
diff --git a/lib/pkix_asn1_tab.c b/lib/pkix_asn1_tab.c
index a9df3cf..1d8a37d 100644
--- a/lib/pkix_asn1_tab.c
+++ b/lib/pkix_asn1_tab.c
@@ -388,6 +388,14 @@ const ASN1_ARRAY_TYPE pkix_asn1_tab[] = {
{ "pkcs-9-challengePassword", 1610612754, NULL },
{ "printableString", 1073741826, "PrintableString"},
{ "utf8String", 2, "UTF8String"},
+ { "pkcs-9-at-localKeyId", 1879048204, NULL },
+ { "iso", 1073741825, "1"},
+ { "member-body", 1073741825, "2"},
+ { "us", 1073741825, "840"},
+ { "rsadsi", 1073741825, "113549"},
+ { "pkcs", 1073741825, "1"},
+ { NULL, 1073741825, "9"},
+ { NULL, 1, "21"},
{ "pkcs-9-localKeyId", 1073741831, NULL },
{ "pkcs-9-at-friendlyName", 1879048204, NULL },
{ "iso", 1073741825, "1"},
hooks/post-receive
--
GNU gnutls
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] GNU gnutls branch, gnutls_2_8_x, updated. gnutls_2_8_4-10-g236b8fe,
Simon Josefsson <=