Commit b4cc6236 by Vincent Pelletier

cli: Fix key_id used with no-encoding stdout on python2.

1 parent 05893598
...@@ -962,11 +962,11 @@ def key_id(argv=None): ...@@ -962,11 +962,11 @@ def key_id(argv=None):
with open(key_path, 'rb') as key_file: with open(key_path, 'rb') as key_file:
print( print(
key_path, key_path,
utils.toUnicode(hexlify( hexlify(
x509.SubjectKeyIdentifier.from_public_key( x509.SubjectKeyIdentifier.from_public_key(
utils.load_privatekey(key_file.read()).public_key(), utils.load_privatekey(key_file.read()).public_key(),
).digest, ).digest,
)), ),
) )
for backup_path in args.backup: for backup_path in args.backup:
print(backup_path) print(backup_path)
...@@ -979,4 +979,4 @@ def key_id(argv=None): ...@@ -979,4 +979,4 @@ def key_id(argv=None):
backup_file.read(struct.calcsize('<I')), backup_file.read(struct.calcsize('<I')),
) )
for key_entry in json.loads(backup_file.read(header_len))['key_list']: for key_entry in json.loads(backup_file.read(header_len))['key_list']:
print(b' ', key_entry['id']) print(b' ', key_entry['id'].encode('utf-8'))
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!