From 3a2efce637ab3cf7497b94f33f38aa79a981874a Mon Sep 17 00:00:00 2001 From: Kevin Froman Date: Sun, 15 Apr 2018 03:46:50 -0500 Subject: [PATCH] work on encryption --- onionr/onionr.py | 6 +++--- onionr/onionrutils.py | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/onionr/onionr.py b/onionr/onionr.py index 4dbef11b..d6ba3096 100755 --- a/onionr/onionr.py +++ b/onionr/onionr.py @@ -249,15 +249,15 @@ class Onionr: ''' Create a private message and send it ''' - - while True: + invalidID = True + while invalidID: try: peer = logger.readline('Peer to send to: ') except KeyboardInterrupt: break else: if self.onionrUtils.validatePubKey(peer): - break + invalidID = False else: logger.error('Invalid peer ID') else: diff --git a/onionr/onionrutils.py b/onionr/onionrutils.py index 19bee3b7..c13de386 100644 --- a/onionr/onionrutils.py +++ b/onionr/onionrutils.py @@ -40,13 +40,13 @@ class OnionrUtils: def sendPM(self, pubkey, message): '''High level function to encrypt a message to a peer and insert it as a block''' - forwardKey = self._core.getPeerInfo(pubkey, 'forwardKey') + #forwardKey = self._core.getPeerInfo(pubkey, 'forwardKey') - if self._core.getPeerInfo(pubkey, 'pubkeyExchanged') == 1: - pass - - if len(forwardKey) > 0: - pass + #if self._core.getPeerInfo(pubkey, 'pubkeyExchanged') == 1: + # pass + encrypted = self._core._crypto.pubKeyEncrypt(message, pubkey, anonymous=True, encodedData=True) + logger.info(encrypted) + return return