fixed wrong gnupg
parent
e59ca3968c
commit
d22d945056
|
@ -49,7 +49,7 @@ class Core:
|
||||||
''' Generate the main PGP key for our client. Should not be done often.
|
''' Generate the main PGP key for our client. Should not be done often.
|
||||||
Uses own PGP home folder in the data/ directory. '''
|
Uses own PGP home folder in the data/ directory. '''
|
||||||
# Generate main pgp key
|
# 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=2048, name_real=myID, name_email='anon@onionr')
|
||||||
#input_data = gpg.gen_key_input(key_type="RSA", key_length=1024)
|
#input_data = gpg.gen_key_input(key_type="RSA", key_length=1024)
|
||||||
key = gpg.gen_key(input_data)
|
key = gpg.gen_key(input_data)
|
||||||
|
|
|
@ -81,10 +81,7 @@ class OnionrUtils:
|
||||||
'''Export our PGP key if it exists'''
|
'''Export our PGP key if it exists'''
|
||||||
if not os.path.exists(self.fingerprintFile):
|
if not os.path.exists(self.fingerprintFile):
|
||||||
raise Exception("No fingerprint found, cannot export our PGP key.")
|
raise Exception("No fingerprint found, cannot export our PGP key.")
|
||||||
if os.getenv('TRAVIS') == 'true':
|
|
||||||
gpg = gnupg.GPG(homedir='./data/pgp/')
|
gpg = gnupg.GPG(homedir='./data/pgp/')
|
||||||
else:
|
|
||||||
gpg = gnupg.GPG(gnupghome='./data/pgp/')
|
|
||||||
with open(self.fingerprintFile,'r') as f:
|
with open(self.fingerprintFile,'r') as f:
|
||||||
fingerprint = f.read()
|
fingerprint = f.read()
|
||||||
ascii_armored_public_keys = gpg.export_keys(fingerprint)
|
ascii_armored_public_keys = gpg.export_keys(fingerprint)
|
||||||
|
|
|
@ -3,5 +3,5 @@ requests==2.18.4
|
||||||
PyNaCl==1.2.1
|
PyNaCl==1.2.1
|
||||||
Flask==0.12.2
|
Flask==0.12.2
|
||||||
pycrypto==2.6.1
|
pycrypto==2.6.1
|
||||||
gnupg==0.4.1
|
gnupg==2.3.1
|
||||||
sha3==0.2.1
|
sha3==0.2.1
|
||||||
|
|
Loading…
Reference in New Issue