From 2a0cc5cfca832fe02da9d77326344d4d6b96b233 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= <lha@kth.se>
Date: Fri, 12 Jan 2007 08:35:58 +0000
Subject: [PATCH] Add PKIXXmppAddr and id-pkix-on-xmppAddr.

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@19859 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 lib/asn1/Makefile.am  | 2 ++
 lib/asn1/rfc2459.asn1 | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/lib/asn1/Makefile.am b/lib/asn1/Makefile.am
index c1e122619..29eeba793 100644
--- a/lib/asn1/Makefile.am
+++ b/lib/asn1/Makefile.am
@@ -270,9 +270,11 @@ gen_files_rfc2459 =					\
 	asn1_id_x509_ce_freshestCRL.x			\
 	asn1_id_x509_ce_cRLReason.x			\
 	asn1_CRLReason.x				\
+	asn1_PKIXXmppAddr.x				\
 	asn1_id_pkix.x					\
 	asn1_id_pkix_on.x				\
 	asn1_id_pkix_on_dnsSRV.x			\
+	asn1_id_pkix_on_xmppAddr.x			\
 	asn1_id_pkix_kp.x				\
 	asn1_id_pkix_kp_serverAuth.x			\
 	asn1_id_pkix_kp_clientAuth.x			\
diff --git a/lib/asn1/rfc2459.asn1 b/lib/asn1/rfc2459.asn1
index 430674a5e..508cc3d38 100644
--- a/lib/asn1/rfc2459.asn1
+++ b/lib/asn1/rfc2459.asn1
@@ -406,10 +406,13 @@ CRLReason ::= ENUMERATED {
 	aACompromise           (10)
 }
 
+PKIXXmppAddr ::= UTF8String
+
 id-pkix OBJECT IDENTIFIER ::= { iso(1) identified-organization(3)
             dod(6) internet(1) security(5) mechanisms(5) pkix(7) }
 
 id-pkix-on OBJECT IDENTIFIER ::= { id-pkix 8 }
+id-pkix-on-xmppAddr OBJECT IDENTIFIER ::= { id-pkix-on 5 }
 id-pkix-on-dnsSRV OBJECT IDENTIFIER ::= { id-pkix-on 7 }
 
 id-pkix-kp OBJECT IDENTIFIER ::= { id-pkix 3 }