Keep all the cert error enums in sync

3 files changed, 38 insertions, 11 deletions

diff --git a/spec/Authentication_TLS_Certificate.xml b/spec/Authentication_TLS_Certificate.xml
index 59834897..470e3940 100644
--- a/spec/Authentication_TLS_Certificate.xml
+++ b/spec/Authentication_TLS_Certificate.xml
@@ -121,9 +121,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 	</tp:docstring>
       </tp:enumvalue>
 
-      <tp:enumvalue suffix="Insecure_Algorithm" value="8">
+      <tp:enumvalue suffix="Insecure" value="8">
 	<tp:docstring>
-	  The certificate uses an insecure cipher algorithm.
+	  The certificate uses an insecure cipher algorithm, or is
+	  cryptographically weak.
 	</tp:docstring>
       </tp:enumvalue>
     </tp:enum>
diff --git a/spec/Connection.xml b/spec/Connection.xml
index c54bb841..e7ed002a 100644
--- a/spec/Connection.xml
+++ b/spec/Connection.xml
@@ -901,7 +901,28 @@ USA.</p>
         </tp:docstring>
       </tp:enumvalue>
 
-      <tp:enumvalue suffix="Cert_Other_Error" value="13">
+      <tp:enumvalue suffix="Cert_Revoked" value="13">
+        <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
+          <p>The server's SSL certificate has been revoked.</p>
+
+          <p>When disconnected for this reason, the equivalent D-Bus error is
+            <code>org.freedesktop.Telepathy.Error.Cert.Revoked</code>.
+          </p>
+        </tp:docstring>
+      </tp:enumvalue>
+
+      <tp:enumvalue suffix="Cert_Insecure" value="14">
+        <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
+          <p>The server's SSL certificate uses an insecure algorithm,
+	  or is cryptographically weak.</p>
+
+          <p>When disconnected for this reason, the equivalent D-Bus error is
+            <code>org.freedesktop.Telepathy.Error.Cert.Insecure</code>.
+          </p>
+        </tp:docstring>
+      </tp:enumvalue>
+
+      <tp:enumvalue suffix="Cert_Other_Error" value="15">
         <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
           <p>There was some other error validating the server's SSL
             certificate.</p>
diff --git a/spec/errors.xml b/spec/errors.xml
index 5bcb8dfd..981fa3c3 100644
--- a/spec/errors.xml
+++ b/spec/errors.xml
@@ -225,9 +225,12 @@
   </tp:error>
 
   <tp:error name="Cert.Hostname Mismatch">
-    <tp:docstring>
-      Raised if the server provided an SSL/TLS certificate that did not match
-      its hostname.
+    <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
+      <p>Raised if the server provided an SSL/TLS certificate that did not match
+      its hostname.</p>
+      <p>You MAY be able to get more details about the expected and certified
+      hostnames by looking up the 'expected-hostname' and 'certificate-hostname'
+      keys in the details map that came together with this error.</p>
       <tp:rationale>
         This corresponds to Cert_Hostname_Mismatch in the
         <tp:type>Connection_Status_Reason</tp:type> enum and to Hostname_Mismatch
@@ -253,18 +256,20 @@
       Raised if the server provided an SSL/TLS certificate that has been
       revoked.
       <tp:rationale>
-        This corresponds to Revoked
+        This corresponds to Cert_Revoked in the
+	<tp:type>Connection_Status_Reason</tp:type> enum and to Revoked
 	in the <tp:type>TLS_Certificate_Reject_Reason</tp:type> enum.
       </tp:rationale>
     </tp:docstring>
   </tp:error>
 
-  <tp:error name="Cert.Insecure Algorithm">
+  <tp:error name="Cert.Insecure">
     <tp:docstring>
       Raised if the server provided an SSL/TLS certificate that uses an
-      insecure cipher algorithm.
+      insecure cipher algorithm or is cryptographically weak.
       <tp:rationale>
-        This corresponds to Insecure_Algorithm
+        This corresponds to Cert_Insecure in the 
+	<tp:type>Connection_Status_Reason</tp:type> enum and to Insecure_Algorithm
 	in the <tp:type>TLS_Certificate_Reject_Reason</tp:type> enum.
       </tp:rationale>
     </tp:docstring>
@@ -276,7 +281,7 @@
       unacceptable in some way that does not have a more specific error.
       <tp:rationale>
         This corresponds to Cert_Other_Error in the
-        <tp:type>Connection_Status_Reason</tp:type> enum and to Other
+        <tp:type>Connection_Status_Reason</tp:type> enum and to Unknown
 	in the <tp:type>TLS_Certificate_Reject_Reason</tp:type> enum.
       </tp:rationale>
     </tp:docstring>