[SCM] GNU gnutls branch, master, updated. gnutls_2_9_7-4-g9eba9e6

[Simon Josefsson]

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=9eba9e651a08dc69cafffad162d21a0ccb5c4dc3

The branch, master has been updated
       via  9eba9e651a08dc69cafffad162d21a0ccb5c4dc3 (commit)
      from  d1b5f97940fe09e3e2baf7da3b4968f7e53be034 (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 9eba9e651a08dc69cafffad162d21a0ccb5c4dc3
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:
 lib/pkix.asn |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

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}


hooks/post-receive
-- 
GNU gnutls