Skip to content

select a single key from key ring #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
moriohara wants to merge 1 commit into
base: master
Choose a base branch
from
Open

select a single key from key ring #5

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 13 additions & 7 deletions config_cipher.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,15 +118,21 @@ def vendor_key(self, keyid, email):
keyid_email = keyid
if not re.match(r'<.+@.+>', keyid) and email:
keyid_email = keyid + ' <' + email + '>'
found = 0
for key in gpg.list_keys():
if 'uids' in key and keyid_email in key['uids']:
logger.debug('vendor_key: found={}'.format(json.dumps(key, indent=4)))
return key['fingerprint']
logger.debug('vendor_key: generating a key keyid={}'.format(keyid))
input_data = gpg.gen_key_input(key_type='RSA', key_length=4096, subkey_type='RSA', subkey_length=4096, expire_date=0, name_real=keyid, name_email=email)
vendor_key = gpg.gen_key(input_data)
vendor_key_fingerprint = str(vendor_key)
logger.debug('vendor_key: generated key={}'.format(vendor_key_fingerprint))
vendor_key_fingerprint = key['fingerprint']
found = found + 1
if found > 1:
logger.warning('vendor_key: {} keys found, using {}'.format(found, vendor_key_fingerprint))
elif found == 0:
logger.debug('vendor_key: generating a key keyid={}'.format(keyid))
input_data = gpg.gen_key_input(key_type='RSA', key_length=4096, subkey_type='RSA', subkey_length=4096, expire_date=0, name_real=keyid, name_email=email)
vendor_key = gpg.gen_key(input_data)
vendor_key_fingerprint = str(vendor_key)
logger.debug('vendor_key: generated key={}'.format(vendor_key_fingerprint))

return vendor_key_fingerprint

def import_ha_public_key(self):
Expand All @@ -152,7 +158,7 @@ def encrypt_config_json(self, config_json, email=None, keyid='secure_build'):
logging.error('encrypt_config_json: failed obtaining a vendor key keyid={}'.format(keyid))
return None
logging.debug('encrypt_config_json: vendor_key_fingerprint={}'.format(vendor_key_fingerprint))
config_json['vendor_key'] = gpg.export_keys(keyid)
config_json['vendor_key'] = gpg.export_keys(vendor_key_fingerprint)

logger.debug('encrypt_config_json: config_json={}'.format(json.dumps(config_json, indent=4)))

Expand Down