From 6e61efc7bfbed562a6545a8ea6ed221ea909dcba Mon Sep 17 00:00:00 2001
From: Peter Saint-Andre <stpeter@jabber.org>
Date: Mon, 8 Sep 2008 17:08:31 +0000
Subject: [PATCH] 1.0 ACTIVE

git-svn-id: file:///home/ksmith/gitmigration/svn/xmpp/trunk@2224 4b5297f7-1745-476d-ba37-a9c6900126ab
---
 xep-0222.xml | 94 +++++++++++++++++++++-------------------------------
 xep-0223.xml | 10 ++++--
 2 files changed, 46 insertions(+), 58 deletions(-)

diff --git a/xep-0222.xml b/xep-0222.xml
index 5ce78594..cc970d7b 100644
--- a/xep-0222.xml
+++ b/xep-0222.xml
@@ -10,7 +10,7 @@
   <abstract>This specification defines best practices for using the XMPP publish-subscribe extension to persistently store semi-public data objects such as public keys and personal profiles.</abstract>
   &LEGALNOTICE;
   <number>0222</number>
-  <status>Proposed</status>
+  <status>Active</status>
   <type>Informational</type>
   <sig>Standards JIG</sig>
   <approver>Council</approver>
@@ -23,8 +23,14 @@
   </dependencies>
   <supersedes/>
   <supersededby/>
-  <shortname>NOT_YET_ASSIGNED</shortname>
+  <shortname>N/A</shortname>
   &stpeter;
+  <revision>
+    <version>1.0</version>
+    <date>2008-09-08</date>
+    <initials>psa</initials>
+    <remark><p>Per a vote of the XMPP Council, advanced specification to Active.</p></remark>
+  </revision>
   <revision>
     <version>0.3</version>
     <date>2008-06-20</date>
@@ -70,15 +76,11 @@
   <pubsub xmlns='http://jabber.org/protocol/pubsub'>
     <publish node='urn:xmpp:tmp:pubkey'>
       <item id='julietRSAkey1hash'>
-        <KeyInfo xmlns='http://www.w3.org/2000/09/xmldsig#'>
-          <KeyName>julietRSAkey1hash</KeyName>
-          <KeyValue>
-            <RSAKeyValue>
-              <Modulus>...</Modulus>
-              <Exponent>AQAB</Exponent>
-            </RSAKeyValue>
-          </KeyValue>
-        </KeyInfo>
+        <key xmlns='urn:xmpp:tmp:pubkey'>
+          <x509cert>
+            der-encoded-cert
+          </x509cert>
+        </key>
       </item>
     </publish>
     <publish-options>
@@ -118,15 +120,11 @@
   <event xmlns='http://jabber.org/protocol/pubsub#event'>
     <items node='urn:xmpp:tmp:pubkey'>
       <item id='julietRSAkey1hash'>
-        <KeyInfo xmlns='http://www.w3.org/2000/09/xmldsig#'>
-          <KeyName>julietRSAkey1hash</KeyName>
-          <KeyValue>
-            <RSAKeyValue>
-              <Modulus>...</Modulus>
-              <Exponent>AQAB</Exponent>
-            </RSAKeyValue>
-          </KeyValue>
-        </KeyInfo>
+        <key xmlns='urn:xmpp:tmp:pubkey'>
+          <x509cert>
+            der-encoded-cert
+          </x509cert>
+        </key>
       </item>
     </items>
   </event>
@@ -141,15 +139,11 @@
   <event xmlns='http://jabber.org/protocol/pubsub#event'>
     <items node='urn:xmpp:tmp:pubkey'>
       <item id='julietRSAkey1hash'>
-        <KeyInfo xmlns='http://www.w3.org/2000/09/xmldsig#'>
-          <KeyName>julietRSAkey1hash</KeyName>
-          <KeyValue>
-            <RSAKeyValue>
-              <Modulus>...</Modulus>
-              <Exponent>AQAB</Exponent>
-            </RSAKeyValue>
-          </KeyValue>
-        </KeyInfo>
+        <key xmlns='urn:xmpp:tmp:pubkey'>
+          <x509cert>
+            der-encoded-cert
+          </x509cert>
+        </key>
       </item>
     </items>
   </event>
@@ -162,15 +156,11 @@
   <event xmlns='http://jabber.org/protocol/pubsub#event'>
     <items node='urn:xmpp:tmp:pubkey'>
       <item id='julietRSAkey1hash'>
-        <KeyInfo xmlns='http://www.w3.org/2000/09/xmldsig#'>
-          <KeyName>julietRSAkey1hash</KeyName>
-          <KeyValue>
-            <RSAKeyValue>
-              <Modulus>...</Modulus>
-              <Exponent>AQAB</Exponent>
-            </RSAKeyValue>
-          </KeyValue>
-        </KeyInfo>
+        <key xmlns='urn:xmpp:tmp:pubkey'>
+          <x509cert>
+            der-encoded-cert
+          </x509cert>
+        </key>
       </item>
     </items>
   </event>
@@ -196,15 +186,11 @@
   <pubsub xmlns='http://jabber.org/protocol/pubsub'>
     <publish node='urn:xmpp:tmp:pubkey'>
       <item id='julietRSAkey1hash'>
-        <KeyInfo xmlns='http://www.w3.org/2000/09/xmldsig#'>
-          <KeyName>julietRSAkey1hash</KeyName>
-          <KeyValue>
-            <RSAKeyValue>
-              <Modulus>...</Modulus>
-              <Exponent>AQAB</Exponent>
-            </RSAKeyValue>
-          </KeyValue>
-        </KeyInfo>
+        <key xmlns='urn:xmpp:tmp:pubkey'>
+          <x509cert>
+            der-encoded-cert
+          </x509cert>
+        </key>
       </item>
     </publish>
   </pubsub>
@@ -217,15 +203,11 @@
   <pubsub xmlns='http://jabber.org/protocol/pubsub'>
     <publish node='urn:xmpp:tmp:pubkey'>
       <item id='julietRSAkey1hash'>
-        <KeyInfo xmlns='http://www.w3.org/2000/09/xmldsig#'>
-          <KeyName>julietRSAkey1hash</KeyName>
-          <KeyValue>
-            <RSAKeyValue>
-              <Modulus>...</Modulus>
-              <Exponent>AQAB</Exponent>
-            </RSAKeyValue>
-          </KeyValue>
-        </KeyInfo>
+        <key xmlns='urn:xmpp:tmp:pubkey'>
+          <x509cert>
+            der-encoded-cert
+          </x509cert>
+        </key>
       </item>
     </publish>
     <publish-options>
diff --git a/xep-0223.xml b/xep-0223.xml
index d3b9cccb..0ee55e73 100644
--- a/xep-0223.xml
+++ b/xep-0223.xml
@@ -10,7 +10,7 @@
   <abstract>This specification defines best practices for using the XMPP publish-subscribe extension to persistently store private information such as bookmarks and client configuration options.</abstract>
   &LEGALNOTICE;
   <number>0223</number>
-  <status>Proposed</status>
+  <status>Active</status>
   <type>Informational</type>
   <sig>Standards JIG</sig>
   <approver>Council</approver>
@@ -23,8 +23,14 @@
   </dependencies>
   <supersedes/>
   <supersededby/>
-  <shortname>NOT_YET_ASSIGNED</shortname>
+  <shortname>N/A</shortname>
   &stpeter;
+  <revision>
+    <version>1.0</version>
+    <date>2008-09-08</date>
+    <initials>psa</initials>
+    <remark><p>Per a vote of the XMPP Council, advanced specification to Active.</p></remark>
+  </revision>
   <revision>
     <version>0.3</version>
     <date>2008-06-20</date>