[SCM] GNU gnutls branch, master, updated. gnutls_2_9_9-174-g9fc1226

[Nikos Mavrogiannopoulos]

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

The branch, master has been updated
       via  9fc12265de302c1b49475b69d9f93595628b56f7 (commit)
      from  22fa439525f40851df1a02f561d1022bbeb14d7d (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 9fc12265de302c1b49475b69d9f93595628b56f7
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sat Mar 20 12:34:45 2010 +0100

    Display postalCode and Name X.509 DN attributes correctly.
    Based on patch by Pavan Konjarla.

-----------------------------------------------------------------------

Summary of changes:
 lib/includes/gnutls/x509.h |    2 ++
 lib/pkix.asn               |    3 +++
 lib/pkix_asn1_tab.c        |    4 ++++
 lib/x509/common.c          |    2 ++
 4 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/lib/includes/gnutls/x509.h b/lib/includes/gnutls/x509.h
index 6ea5f5d..6c536e0 100644
--- a/lib/includes/gnutls/x509.h
+++ b/lib/includes/gnutls/x509.h
@@ -54,6 +54,8 @@ extern "C"
 #define GNUTLS_OID_X520_TITLE                  "2.5.4.12"
 #define GNUTLS_OID_X520_DN_QUALIFIER           "2.5.4.46"
 #define GNUTLS_OID_X520_PSEUDONYM              "2.5.4.65"
+#define GNUTLS_OID_X520_POSTALCODE              "2.5.4.17"
+#define GNUTLS_OID_X520_NAME                    "2.5.4.41"
 
 #define GNUTLS_OID_LDAP_DC                     "0.9.2342.19200300.100.1.25"
 #define GNUTLS_OID_LDAP_UID                    "0.9.2342.19200300.100.1.1"
diff --git a/lib/pkix.asn b/lib/pkix.asn
index 8b3993a..e105aae 100644
--- a/lib/pkix.asn
+++ b/lib/pkix.asn
@@ -234,6 +234,9 @@ X520postalAddress ::= PostalAddress
 
 PostalAddress ::= SEQUENCE OF DirectoryString
 
+id-at-postalCode     AttributeType   ::=     {id-at 17}
+X520postalCode ::= DirectoryString
+
  -- Legacy attributes
 
 emailAddress AttributeType      ::= { iso(1) member-body(2) us(840) 
rsadsi(113549) pkcs(1) 9 1 }
diff --git a/lib/pkix_asn1_tab.c b/lib/pkix_asn1_tab.c
index bbba01f..e1296d0 100644
--- a/lib/pkix_asn1_tab.c
+++ b/lib/pkix_asn1_tab.c
@@ -210,6 +210,10 @@ const ASN1_ARRAY_TYPE pkix_asn1_tab[] = {
   { "X520postalAddress", 1073741826, "PostalAddress"},
   { "PostalAddress", 1610612747, NULL },
   { NULL, 2, "DirectoryString"},
+  { "id-at-postalCode", 1880096780, "AttributeType"},
+  { NULL, 1073741825, "id-at"},
+  { NULL, 1, "17"},
+  { "X520postalCode", 1073741826, "DirectoryString"},
   { "emailAddress", 1880096780, "AttributeType"},
   { "iso", 1073741825, "1"},
   { "member-body", 1073741825, "2"},
diff --git a/lib/x509/common.c b/lib/x509/common.c
index f8fee2f..962eded 100644
--- a/lib/x509/common.c
+++ b/lib/x509/common.c
@@ -73,6 +73,8 @@ static const struct oid2string _oid2str[] = {
   {"2.5.4.42", "givenName", 1, 1},
   {"2.5.4.65", "pseudonym", 1, 1},
   {"2.5.4.46", "dnQualifier", 0, 1},
+  {"2.5.4.17", "postalCode", 1, 1},
+  {"2.5.4.41", "Name", 1, 1},
 
   {"0.9.2342.19200300.100.1.25", "DC", 0, 1},
   {"0.9.2342.19200300.100.1.1", "UID", 1, 1},


hooks/post-receive
-- 
GNU gnutls