tor

commit 00e150a0e4967f5859f3eecb51fb54104d87335d
parent d7bbfd0f6217181fc7f4a4a71d23874873a5262a
Author: Nick Mathewson <nickm@torproject.org>
Date:   Sat,  2 Jun 2018 10:33:33 -0700

Merge branch 'bug25939_034_01_squashed'

Diffstat:
A
changes/bug25939
 | 
3
+++
M
src/or/hs_service.c
 | 
14
++++++++------

2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/changes/bug25939 b/changes/bug25939
@@ -0,0 +1,3 @@
+  o Minor bugfixes (onion services):
+    - Fix a bug that blocked the creation of ephemeral v3 onion services. Fixes
+      bug 25939; bugfix on 0.3.4.1-alpha.
diff --git a/src/or/hs_service.c b/src/or/hs_service.c
@@ -3062,6 +3062,12 @@ hs_service_add_ephemeral(ed25519_secret_key_t *sk, smartlist_t *ports,
     goto err;
   }
 
+  /* Build the onion address for logging purposes but also the control port
+   * uses it for the HS_DESC event. */
+  hs_build_address(&service->keys.identity_pk,
+                   (uint8_t) service->config.version,
+                   service->onion_address);
+
   /* The only way the registration can fail is if the service public key
    * already exists. */
   if (BUG(register_service(hs_service_map, service) < 0)) {
@@ -3071,14 +3077,10 @@ hs_service_add_ephemeral(ed25519_secret_key_t *sk, smartlist_t *ports,
     goto err;
   }
 
-  /* Last step is to build the onion address. */
-  hs_build_address(&service->keys.identity_pk,
-                   (uint8_t) service->config.version,
-                   service->onion_address);
-  *address_out = tor_strdup(service->onion_address);
-
   log_info(LD_CONFIG, "Added ephemeral v3 onion service: %s",
            safe_str_client(service->onion_address));
+
+  *address_out = tor_strdup(service->onion_address);
   ret = RSAE_OKAY;
   goto end;