Support for OpenSSH new key file format #279
Conversation
|
@dkocher Can you test it out? |
|
@hierynomus Will do today! |
|
It's a bit later then I wanted, but it took some experimenting ;) |
| return readUnencrypted(privateKeyBuffer, publicKey); | ||
| } else { | ||
| logger.info("Keypair is encrypted with: " + cipherName + ", " + kdfName + ", " + kdfOptions); | ||
| throw new IOException("Cannot read encrypted keypair with " + cipherName + " yet.."); |
There was a problem hiding this comment.
What additional work is required to support encrypted keys?
There was a problem hiding this comment.
I have to figure out how the 'altered' bcrypt implementation works... i.e. seems non-trivial at the moment.
| * Reads a key file in the new OpenSSH format. | ||
| * The format is described in the following document: https://github.com/openssh/openssh-portable/blob/master/PROTOCOL.key | ||
| */ | ||
| public class OpenSSHKeyV1KeyFile extends BaseFileKeyProvider { |
There was a problem hiding this comment.
The class name is somewhat uneloquent.
There was a problem hiding this comment.
Suggestion for a better one?
|
I have tested this with a private key of mine and it works as advertised. |
|
Yay! If you can think of a better class name I'll rename it. Else I'll leave that for a moment. Going through this code again, it could use a lot of cleanup. I want to split off the keyfile format from the keytype stored in there. Will do that separately though. |
|
When I pass a non-null public key to |
The new format is used for ed-25519 keys.
Only support for non-encrypted keys currently.