[or-cvs] r13400: if i'm a v3 authority, tell myself about my cert when i star (tor/trunk/src/or)

[arma at seul.org]

Author: arma
Date: 2008-02-06 07:39:25 -0500 (Wed, 06 Feb 2008)
New Revision: 13400

Modified:
   tor/trunk/src/or/router.c
Log:
if i'm a v3 authority, tell myself about my cert when i startup.
otherwise i'll keep asking other authorities for it, which probably
isn't the best way to get it. this made bootstrapping a new network
very hard.


Modified: tor/trunk/src/or/router.c
===================================================================
--- tor/trunk/src/or/router.c	2008-02-06 12:37:25 UTC (rev 13399)
+++ tor/trunk/src/or/router.c	2008-02-06 12:39:25 UTC (rev 13400)
@@ -387,6 +387,7 @@
   time_t now = time(NULL);
   trusted_dir_server_t *ds;
   int v3_digest_set = 0;
+  authority_cert_t *cert = NULL;
 
   if (!key_lock)
     key_lock = tor_mutex_new();
@@ -431,7 +432,8 @@
               "Use tor-gencert to generate them. Dying.");
       return -1;
     }
-    if (get_my_v3_authority_cert()) {
+    cert = get_my_v3_authority_cert();
+    if (cert) {
       crypto_pk_get_digest(get_my_v3_authority_cert()->identity_key,
                            v3_digest);
       v3_digest_set = 1;
@@ -585,6 +587,15 @@
     memcpy(ds->v3_identity_digest, v3_digest, DIGEST_LEN);
   }
 
+  if (cert) { /* add my own cert to the list of known certs */
+    log_info(LD_DIR, "adding my own v3 cert");
+    if (trusted_dirs_load_certs_from_string(
+          cert->cache_info.signed_descriptor_body, 0)<0) {
+      log_warn(LD_DIR, "Unable to parse my own v3 cert! Failing.");
+      return -1;
+    }
+  }
+
   return 0; /* success */
 }