diff options
| author | Ross Kinsey <rossikinsey@gmail.com> | 2020-03-22 14:36:50 -0400 |
|---|---|---|
| committer | Filippo Valsorda <filippo@golang.org> | 2020-03-23 16:52:09 +0000 |
| commit | 0ec3e9974c59449edd84298612e9f16fa13368e8 (patch) | |
| tree | 15dc73e96a4ef086ecf3fedfa821cffc5a2fa9b9 /ssh/testdata | |
| parent | 891825fb96dfc23279b4a42f710d49e78e05b333 (diff) | |
| download | go-x-crypto-0ec3e9974c59449edd84298612e9f16fa13368e8.tar.xz | |
ssh: support aes256-cbc for passphrase-protected OpenSSH keys
The existing code for decrypting OpenSSH-format keys only allows aes256-ctr, the current ssh-keygen default.
However, the default encryption scheme was aes256-cbc until relatively recently, and some of these keys are still in use.
Support for aes256-cbc has been added.
Fixes golang/go#37939
Change-Id: I3730347109c5dd18e4cbe61b48bbca9566ad61d2
Reviewed-on: https://go-review.googlesource.com/c/crypto/+/224817
Reviewed-by: Filippo Valsorda <filippo@golang.org>
Diffstat (limited to 'ssh/testdata')
| -rw-r--r-- | ssh/testdata/keys.go | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/ssh/testdata/keys.go b/ssh/testdata/keys.go index a7da078..f1e2fc5 100644 --- a/ssh/testdata/keys.go +++ b/ssh/testdata/keys.go @@ -271,6 +271,21 @@ Lvs9+PH8nIuhFMYZgo3liqZbVS5z4Fqhyzyq4= -----END OPENSSH PRIVATE KEY----- `), }, + + 3: { + Name: "ed25519-encrypted-cbc", + EncryptionKey: "password", + IncludesPublicKey: true, + PEMBytes: []byte(`-----BEGIN OPENSSH PRIVATE KEY----- +b3BlbnNzaC1rZXktdjEAAAAACmFlczI1Ni1jYmMAAAAGYmNyeXB0AAAAGAAAABDzGKF3uX +G1gXALZKFd6Ir4AAAAEAAAAAEAAAAzAAAAC3NzaC1lZDI1NTE5AAAAIDne4/teO42zTDdj +NwxUMNpbfmp/dxgU4ZNkC3ydgcugAAAAoJ3J/oA7+iqVOz0CIUUk9ufdP1VP4jDf2um+0s +Sgs7x6Gpyjq67Ps7wLRdSmxr/G5b+Z8dRGFYS/wUCQEe3whwuImvLyPwWjXLzkAyMzc01f +ywBGSrHnvP82ppenc2HuTI+E05Xc02i6JVyI1ShiekQL5twoqtR6pEBZnD17UonIx7cRzZ +gbDGyT3bXMQtagvCwoW+/oMTKXiZP5jCJpEO8= +-----END OPENSSH PRIVATE KEY----- +`), + }, } // SKData contains a list of PubKeys backed by U2F/FIDO2 Security Keys and their test data. |