summaryrefslogtreecommitdiff
path: root/onionshare
diff options
context:
space:
mode:
authorMiguel Jacq <mig@mig5.net>2019-02-11 11:36:18 +1100
committerMiguel Jacq <mig@mig5.net>2019-02-11 11:36:18 +1100
commit7c71aef15b1038c3eeac08fe5a8fa69b9d40c9f9 (patch)
tree44eac1483483239ad1d96cecb574b0f0cbe2ca80 /onionshare
parent181fed1a4aff15cfe9a67f60b56ac0d70f9c1fe6 (diff)
downloadonionshare-7c71aef15b1038c3eeac08fe5a8fa69b9d40c9f9.tar.gz
onionshare-7c71aef15b1038c3eeac08fe5a8fa69b9d40c9f9.zip
Support persistent v3 onions
Diffstat (limited to 'onionshare')
-rw-r--r--onionshare/onion.py15
1 files changed, 2 insertions, 13 deletions
diff --git a/onionshare/onion.py b/onionshare/onion.py
index 4d9cbacf..ed4fde7b 100644
--- a/onionshare/onion.py
+++ b/onionshare/onion.py
@@ -451,20 +451,9 @@ class Onion(object):
key_content = self.settings.get('private_key')
if self.is_v2_key(key_content):
key_type = "RSA1024"
- # The below section is commented out because re-publishing
- # a pre-prepared v3 private key is currently unstable in Tor.
- # This is fixed upstream but won't reach stable until 0.3.5
- # (expected in December 2018)
- # See https://trac.torproject.org/projects/tor/ticket/25552
- # Until then, we will deliberately not work with 'persistent'
- # v3 onions, which should not be possible via the GUI settings
- # anyway.
- # Our ticket: https://github.com/micahflee/onionshare/issues/677
- #
- # Assume it was a v3 key
- # key_type = "ED25519-V3"
else:
- raise TorErrorProtocolError(strings._('error_invalid_private_key'))
+ # Assume it was a v3 key. Stem will throw an error if it's something illegible
+ key_type = "ED25519-V3"
else:
key_type = "NEW"