ssh: fix error message on unsupported cipher

Until now, when ssh keys using one of these[1] ciphers were passed, we were
giving a parse error "ssh: parse error in message type 0".

With this fix, we parse it successfully and return the correct error message.

[1] aes{128,256}-gcm@openssh.com and chacha20-poly1305@openssh.com

Fixes golang/go#52135

Change-Id: I3010fff43c48f29f21edb8d63f44e167861a054e
GitHub-Last-Rev: 14ac7e97306d41cba48053b9c60f2ffc7caded45
GitHub-Pull-Request: golang/crypto#324
Reviewed-on: https://go-review.googlesource.com/c/crypto/+/709275
Reviewed-by: Nicola Murino <nicola.murino@gmail.com>
Reviewed-by: Michael Pratt <mpratt@google.com>
Reviewed-by: Junyang Shao <shaojunyang@google.com>
Auto-Submit: Nicola Murino <nicola.murino@gmail.com>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>

This commit is contained in:

Santhanam

2025-11-12 10:42:48 -08:00

committed by

Gopher Robot

parent 79ec3a51fc

commit b4f2b62076

3 changed files with 63 additions and 0 deletions

									
										ssh/keys.go
									
		+1
		
												View File
												
				@@ -1490,6 +1490,7 @@ type openSSHEncryptedPrivateKey struct {

					NumKeys      uint32

					PubKey       []byte

					PrivKeyBlock []byte

					Rest         []byte `ssh:"rest"`

				}

				type openSSHPrivateKey struct {