Skip to content

only process supported Putty v3 keys + minor optimizations - #729

Merged
hierynomus merged 1 commit into
hierynomus:masterfrom
jpstotz:puttyv3
Oct 2, 2021
Merged

only process supported Putty v3 keys + minor optimizations#729
hierynomus merged 1 commit into
hierynomus:masterfrom
jpstotz:puttyv3

Conversation

@jpstotz

@jpstotz jpstotz commented Oct 2, 2021

Copy link
Copy Markdown
Contributor

As mentioned in #716 the current Puttyv3 support is limited to unencrypted key files as the new file format uses Argon based key derivation functions . This PR adds checks so that we do not try to decrypt a key we can never decrypt successfully because of the missing Argon implementation.
Instead a describing exception is thrown so it is clear that the password was not the problem.
A unit test for an encrypted RSA putty v3 key has been added.

Additionally I made some small optimizations on the putty key loading code.

@jpstotz
jpstotz requested a review from hierynomus as a code owner October 2, 2021 15:56
@hierynomus
hierynomus merged commit d6d6f0d into hierynomus:master Oct 2, 2021
@hierynomus

Copy link
Copy Markdown
Owner

Thanks!

@jpstotz
jpstotz deleted the puttyv3 branch October 12, 2021 07:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants