Change DSA test key format + adopt test code #264
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
joshuagl
approved these changes
Aug 6, 2020
tests/test_gpg.py
Outdated
| cryptography for the sake of comparison """ | ||
| since there's very little we can do to check key parameters are right | ||
| we pre-exported the public key to an x.509 SubjectPublicKeyInfo key, | ||
| which we can load with cryptography for the sake of comparison """ | ||
|
|
||
| # export our gpg key, using our functions | ||
| key_data = export_pubkey(self.default_keyid, homedir=self.gnupg_home) | ||
| our_exported_key = dsa_create_pubkey(key_data) | ||
|
|
||
| # load the equivalent ssh key, and make sure that we get the same RSA key |
There was a problem hiding this comment.
Nit: this is not an ssh key any more, right?
There was a problem hiding this comment.
and not an rsa key either. 🤦 thanks for catching!
There was a problem hiding this comment.
Updated and squashed into 492f7e5
A recent pyca/cryptography update dropped support for DSA ssh public keys with bit size other than 1024, which broke our tests. See pyca/cryptography#5373 This commit changes the test key format to X.509 SubjectPublicKeyInfo PEM and updates the corresponding test code. ``` ssh-keygen -f C242A830DAAF1C2BEF604A9EF033A3A3E267B3B1.ssh \ -e -m pkcs8 > C242A830DAAF1C2BEF604A9EF033A3A3E267B3B1.pem ``` Note: ssh-keygen mistakingly calls the format pkcs8 although it is X.509 SubjectPublicKeyInfo PEM.
Bumps [cryptography](https://github.com/pyca/cryptography) from 2.9.2 to 3.0. - [Release notes](https://github.com/pyca/cryptography/releases) - [Changelog](https://github.com/pyca/cryptography/blob/master/CHANGELOG.rst) - [Commits](pyca/cryptography@2.9.2...3.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
lukpueh
force-pushed
the
fix-gpg-dsa-test
branch
from
e058c99
to
15028a4
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes issue #:
Related #261, #251
Description of the changes being introduced by the pull request:
A recent pyca/cryptography update dropped support for DSA ssh public keys with bit size other than 1024, which broke our tests. See pyca/cryptography#5373.
This PR changes the test key format to X.509 SubjectPublicKeyInfo PEM and updates the corresponding test code.
Note: ssh-keygen mistakingly calls the format pkcs8 although it is X.509 SubjectPublicKeyInfo PEM.
Please verify and check that the pull request fulfils the following
requirements: