Fix bug in format handling. (#65642)
This commit is contained in:
parent
57c042243f
commit
ecb6f2e76c
3 changed files with 7 additions and 4 deletions
|
@ -377,7 +377,7 @@ class PrivateKeyBase(crypto_utils.OpenSSLObject):
|
|||
return False
|
||||
|
||||
if not self._check_format():
|
||||
if ignore_conversion or self.format_mismatch != 'convert':
|
||||
if not ignore_conversion or self.format_mismatch != 'convert':
|
||||
return False
|
||||
|
||||
return True
|
||||
|
@ -678,6 +678,7 @@ class PrivateKeyCryptography(PrivateKeyBase):
|
|||
|
||||
def _check_size_and_type(self):
|
||||
privatekey = self._load_privatekey()
|
||||
self.privatekey = privatekey
|
||||
|
||||
if isinstance(privatekey, cryptography.hazmat.primitives.asymmetric.rsa.RSAPrivateKey):
|
||||
return self.type == 'RSA' and self.size == privatekey.key_size
|
||||
|
|
|
@ -394,15 +394,17 @@
|
|||
- name: Generate privatekey_fmt_2 - auto format (ignore)
|
||||
openssl_privatekey:
|
||||
path: '{{ output_dir }}/privatekey_fmt_2.pem'
|
||||
type: X448
|
||||
format: auto_ignore
|
||||
select_crypto_backend: '{{ select_crypto_backend }}'
|
||||
register: privatekey_fmt_1_step_5
|
||||
register: privatekey_fmt_2_step_5
|
||||
|
||||
- name: Generate privatekey_fmt_2 - auto format (no ignore)
|
||||
openssl_privatekey:
|
||||
path: '{{ output_dir }}/privatekey_fmt_2.pem'
|
||||
type: X448
|
||||
format: auto
|
||||
select_crypto_backend: '{{ select_crypto_backend }}'
|
||||
register: privatekey_fmt_1_step_6
|
||||
register: privatekey_fmt_2_step_6
|
||||
|
||||
when: 'select_crypto_backend == "cryptography" and cryptography_version.stdout is version("2.6", ">=")'
|
||||
|
|
|
@ -61,7 +61,7 @@
|
|||
|
||||
- import_tasks: ../tests/validate.yml
|
||||
vars:
|
||||
select_crypto_backend: pyopenssl
|
||||
select_crypto_backend: cryptography
|
||||
|
||||
when: cryptography_version.stdout is version('0.5', '>=')
|
||||
|
||||
|
|
Loading…
Reference in a new issue