[tor-commits] [stem/master] Drop _get_descriptor_signing_cert()

[atagar at torproject.org]

commit 53c9ac83a4f7eb53d1b35a06346bcb2675453ec5
Author: Damian Johnson <atagar at torproject.org>
Date:   Wed Nov 13 14:22:53 2019 -0800

    Drop _get_descriptor_signing_cert()
    
    Flattening the last content() helper so we can see all the remaining
    implementation in one spot. Getting close!
---
 stem/descriptor/hidden_service.py | 27 ++++++---------------------
 1 file changed, 6 insertions(+), 21 deletions(-)

diff --git a/stem/descriptor/hidden_service.py b/stem/descriptor/hidden_service.py
index 56ba4d22..05c8267b 100644
--- a/stem/descriptor/hidden_service.py
+++ b/stem/descriptor/hidden_service.py
@@ -863,26 +863,6 @@ class HiddenServiceDescriptorV2(BaseHiddenServiceDescriptor):
     return introduction_points
 
 
-def _get_descriptor_signing_cert(descriptor_signing_public_key, blinded_priv_key):
-  """
-  Get the string representation of the descriptor signing cert
-
-  'descriptor_signing_public_key' key that gets certified by certificate
-
-  'blinded_priv_key' key that signs the certificate
-  """
-
-  # 54 hours expiration date like tor does
-  expiration_date = datetime.datetime.utcnow() + datetime.timedelta(hours=54)
-
-  signing_key = stem.util._pubkey_bytes(descriptor_signing_public_key)
-  extensions = [Ed25519Extension(ExtensionType.HAS_SIGNING_KEY, None, blinded_priv_key.blinded_pubkey)]
-
-  desc_signing_cert = Ed25519CertificateV1(CertType.HS_V3_DESC_SIGNING, expiration_date, 1, signing_key, extensions, signing_key = blinded_priv_key)
-
-  return '\n' + desc_signing_cert.to_base64(pem = True)
-
-
 class HiddenServiceDescriptorV3(BaseHiddenServiceDescriptor):
   """
   Version 3 hidden service descriptor.
@@ -988,10 +968,15 @@ class HiddenServiceDescriptorV3(BaseHiddenServiceDescriptor):
       blinded_key = blinded_key,
     )
 
+    expiration = datetime.datetime.utcnow() + datetime.timedelta(hours = stem.descriptor.certificate.DEFAULT_EXPIRATION_HOURS)
+    extensions = [Ed25519Extension(ExtensionType.HAS_SIGNING_KEY, None, blinded_privkey.blinded_pubkey)]
+
+    signing_cert = Ed25519CertificateV1(CertType.HS_V3_DESC_SIGNING, expiration, 1, stem.util._pubkey_bytes(descriptor_signing_public_key), extensions, signing_key = blinded_privkey)
+
     desc_content = _descriptor_content(attr, exclude, (
       ('hs-descriptor', '3'),
       ('descriptor-lifetime', '180'),
-      ('descriptor-signing-key-cert', _get_descriptor_signing_cert(descriptor_signing_public_key, blinded_privkey)),
+      ('descriptor-signing-key-cert', '\n' + signing_cert.to_base64(pem = True)),
       ('revision-counter', str(revision_counter)),
       ('superencrypted', b'\n' + outer_layer._encrypt(revision_counter, subcredential, blinded_key)),
     ), ())