Add cross-certification to authority key certificates. Partial implementation of proposal 157.

svn:r17610

2 files changed, 24 insertions, 0 deletions

diff --git a/doc/spec/dir-spec.txt b/doc/spec/dir-spec.txt
index 1bd73ba09..d7e393b32 100644
--- a/doc/spec/dir-spec.txt
+++ b/doc/spec/dir-spec.txt
@@ -758,6 +758,25 @@ $Id$
         The directory server's public signing key.  This key MUST be at
         least 1024 bits, and MAY be longer.
 
+    "dir-key-crosscert" NL CrossSignature NL
+
+        [At most once.]
+
+        NOTE: Authorities MUST include this field in all newly generated
+        certificates.  A future version of this specification will make
+        the field required.
+
+        CrossSignature is a signature, made using the certificate's signing
+        key, of the digest of the PKCS1-padded hash of the certificate's
+        identity key.  For backward compatibility with broken versions of the
+        parser, we wrap the base64-encoded signature in -----BEGIN ID
+        SIGNATURE---- and -----END ID SIGNATURE----- tags.  Implementations
+        MUST allow the "ID " portion to be omitted, however.
+
+        When encountering a certificate with a dir-key-crosscert entry,
+        implementations MUST verify that the signature is a correct signature
+        of the hash of the identity key using the signing key.
+
     "dir-key-certification" NL Signature NL
 
         [At end, exactly once.]
diff --git a/doc/spec/proposals/157-specific-cert-download.txt b/doc/spec/proposals/157-specific-cert-download.txt
index 4687a5bd0..2cae13b2e 100644
--- a/doc/spec/proposals/157-specific-cert-download.txt
+++ b/doc/spec/proposals/157-specific-cert-download.txt
@@ -13,6 +13,11 @@ History:
      Changed name of cross certification field to match the other authority
      certificate fields.
 
+Status:
+
+  Cross-certification is implemented for new certificates, but not yet
+  required.
+
 Overview:
 
   Tor's directory specification gives two ways to download a certificate: