Merge "Fix uploading an signed image does not work if private signing key is encrypted"

This commit is contained in:
Zuul 2020-07-08 17:30:38 +00:00 committed by Gerrit Code Review
commit 8aed5feab8
2 changed files with 13 additions and 0 deletions

View File

@ -440,8 +440,14 @@ class CreateImage(command.ShowOne):
prompt=("Please enter private key password, leave "
"empty if none: "),
confirm=False)
if not pw or len(pw) < 1:
pw = None
else:
# load_private_key() requires the password to be
# passed as bytes
pw = pw.encode()
signer.load_private_key(
sign_key_path,
password=pw)

View File

@ -0,0 +1,7 @@
---
fixes:
- |
While uploading a signed image, a private key to sign that image must be
specified. The CLI client asks for the password of that private key. Due
to wrong encoding handling while using Python 3, the password is not
accepted, whether it is correct or not.