summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVictor Shyba <victor.shyba@gmail.com>2015-07-20 17:11:48 +0200
committerFolker Bernitt <fbernitt@thoughtworks.com>2015-08-11 17:00:25 +0200
commitf3cdd5875d20b3cc24a839c51597e2f04989dead (patch)
treea1db4fcf1d9b30febf7647def637a3ae608e9b92
parent9b773d5e8728893c0d01a57770deae1e4c58bc20 (diff)
always sending pubkey to nicknym for now
-rw-r--r--service/pixelated/bitmask_libraries/nicknym.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/service/pixelated/bitmask_libraries/nicknym.py b/service/pixelated/bitmask_libraries/nicknym.py
index ecd928cc..810161ee 100644
--- a/service/pixelated/bitmask_libraries/nicknym.py
+++ b/service/pixelated/bitmask_libraries/nicknym.py
@@ -24,9 +24,9 @@ class NickNym(object):
self._email = email_address
self.keymanager = KeyManager(self._email, nicknym_url,
soledad_session.soledad,
- token, LeapCertificate(provider).provider_api_cert, provider.api_uri,
- provider.api_version,
- uuid, config.gpg_binary)
+ token=token, ca_cert_path=LeapCertificate(provider).provider_api_cert, api_uri=provider.api_uri,
+ api_version=provider.api_version,
+ uid=uuid, gpgbinary=config.gpg_binary)
@defer.inlineCallbacks
def generate_openpgp_key(self):
@@ -34,7 +34,8 @@ class NickNym(object):
if not key_present:
print "Generating keys - this could take a while..."
yield self._gen_key()
- yield self._send_key_to_leap()
+ # Sending it anyway for now. TODO: This can be better with real checking (downloading pubkey from nicknym)
+ yield self._send_key_to_leap()
@defer.inlineCallbacks
def _key_exists(self, email):