kev/Onionr
1
0
Fork 0
Code Issues 24 Pull Requests Projects Releases 2 Wiki Activity

fixed wrong gnupg

Browse Source
This commit is contained in:
Kevin Froman 2018-01-26 19:45:01 -06:00
parent e59ca3968c
commit d22d945056
No known key found for this signature in database
GPG Key ID: 0D414D0FE405B63B
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
onionr/core.py
View File

@ -49,7 +49,7 @@ class Core:
''' Generate the main PGP key for our client. Should not be done often.
Uses own PGP home folder in the data/ directory. '''
# Generate main pgp key
gpg = gnupg.GPG(gnupghome='./data/pgp/')
gpg = gnupg.GPG(homedir='./data/pgp/')
input_data = gpg.gen_key_input(key_type="RSA", key_length=2048, name_real=myID, name_email='anon@onionr')
#input_data = gpg.gen_key_input(key_type="RSA", key_length=1024)
key = gpg.gen_key(input_data)

5
onionr/onionrutils.py
View File

@ -81,10 +81,7 @@ class OnionrUtils:
'''Export our PGP key if it exists'''
if not os.path.exists(self.fingerprintFile):
raise Exception("No fingerprint found, cannot export our PGP key.")
if os.getenv('TRAVIS') == 'true':
gpg = gnupg.GPG(homedir='./data/pgp/')
else:
gpg = gnupg.GPG(gnupghome='./data/pgp/')
gpg = gnupg.GPG(homedir='./data/pgp/')
with open(self.fingerprintFile,'r') as f:
fingerprint = f.read()
ascii_armored_public_keys = gpg.export_keys(fingerprint)

2
requirements.txt
View File

@ -3,5 +3,5 @@ requests==2.18.4
PyNaCl==1.2.1
Flask==0.12.2
pycrypto==2.6.1
gnupg==0.4.1
gnupg==2.3.1
sha3==0.2.1