Skip to content

Commit e47973b

Browse files
seankhliaogopherbot
authored andcommitted
all: update certs for go1.24
Fixes golang/go#71612 Change-Id: I5cb0596b33cb18016eb1883d1518319588ae1454 Reviewed-on: https://go-review.googlesource.com/c/crypto/+/647975 Reviewed-by: Roland Shoemaker <[email protected]> Reviewed-by: Nicola Murino <[email protected]> Reviewed-by: Dmitri Shuralyov <[email protected]> LUCI-TryBot-Result: Go LUCI <[email protected]> Auto-Submit: Nicola Murino <[email protected]>
1 parent 9290511 commit e47973b

File tree

3 files changed

+9
-11
lines changed

3 files changed

+9
-11
lines changed

acme/acme_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -757,7 +757,7 @@ func TestTLSALPN01ChallengeCert(t *testing.T) {
757757
}
758758

759759
func TestTLSChallengeCertOpt(t *testing.T) {
760-
key, err := rsa.GenerateKey(rand.Reader, 512)
760+
key, err := rsa.GenerateKey(rand.Reader, 1024)
761761
if err != nil {
762762
t.Fatal(err)
763763
}

acme/autocert/autocert_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -619,7 +619,7 @@ func TestCache(t *testing.T) {
619619
PrivateKey: ecdsaKey,
620620
}
621621

622-
rsaKey, err := rsa.GenerateKey(rand.Reader, 512)
622+
rsaKey, err := rsa.GenerateKey(rand.Reader, 1024)
623623
if err != nil {
624624
t.Fatal(err)
625625
}
@@ -694,7 +694,7 @@ func TestValidCert(t *testing.T) {
694694
if err != nil {
695695
t.Fatal(err)
696696
}
697-
key3, err := rsa.GenerateKey(rand.Reader, 512)
697+
key3, err := rsa.GenerateKey(rand.Reader, 1024)
698698
if err != nil {
699699
t.Fatal(err)
700700
}

ssh/certs_test.go

+6-8
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,12 @@ import (
1515
"reflect"
1616
"testing"
1717
"time"
18-
)
1918

20-
// Cert generated by ssh-keygen 6.0p1 Debian-4.
21-
// % ssh-keygen -s ca-key -I test user-key
22-
const exampleSSHCert = `[email protected] AAAAHHNzaC1yc2EtY2VydC12MDFAb3BlbnNzaC5jb20AAAAgb1srW/W3ZDjYAO45xLYAwzHBDLsJ4Ux6ICFIkTjb1LEAAAADAQABAAAAYQCkoR51poH0wE8w72cqSB8Sszx+vAhzcMdCO0wqHTj7UNENHWEXGrU0E0UQekD7U+yhkhtoyjbPOVIP7hNa6aRk/ezdh/iUnCIt4Jt1v3Z1h1P+hA4QuYFMHNB+rmjPwAcAAAAAAAAAAAAAAAEAAAAEdGVzdAAAAAAAAAAAAAAAAP//////////AAAAAAAAAIIAAAAVcGVybWl0LVgxMS1mb3J3YXJkaW5nAAAAAAAAABdwZXJtaXQtYWdlbnQtZm9yd2FyZGluZwAAAAAAAAAWcGVybWl0LXBvcnQtZm9yd2FyZGluZwAAAAAAAAAKcGVybWl0LXB0eQAAAAAAAAAOcGVybWl0LXVzZXItcmMAAAAAAAAAAAAAAHcAAAAHc3NoLXJzYQAAAAMBAAEAAABhANFS2kaktpSGc+CcmEKPyw9mJC4nZKxHKTgLVZeaGbFZOvJTNzBspQHdy7Q1uKSfktxpgjZnksiu/tFF9ngyY2KFoc+U88ya95IZUycBGCUbBQ8+bhDtw/icdDGQD5WnUwAAAG8AAAAHc3NoLXJzYQAAAGC8Y9Z2LQKhIhxf52773XaWrXdxP0t3GBVo4A10vUWiYoAGepr6rQIoGGXFxT4B9Gp+nEBJjOwKDXPrAevow0T9ca8gZN+0ykbhSrXLE5Ao48rqr3zP4O1/9P7e6gp0gw8=`
19+
"golang.org/x/crypto/ssh/testdata"
20+
)
2321

2422
func TestParseCert(t *testing.T) {
25-
authKeyBytes := []byte(exampleSSHCert)
23+
authKeyBytes := bytes.TrimSuffix(testdata.SSHCertificates["rsa"], []byte(" host.example.com\n"))
2624

2725
key, _, _, rest, err := ParseAuthorizedKey(authKeyBytes)
2826
if err != nil {
@@ -103,7 +101,7 @@ func TestParseCertWithOptions(t *testing.T) {
103101
}
104102

105103
func TestValidateCert(t *testing.T) {
106-
key, _, _, _, err := ParseAuthorizedKey([]byte(exampleSSHCert))
104+
key, _, _, _, err := ParseAuthorizedKey(testdata.SSHCertificates["rsa-user-testcertificate"])
107105
if err != nil {
108106
t.Fatalf("ParseAuthorizedKey: %v", err)
109107
}
@@ -116,7 +114,7 @@ func TestValidateCert(t *testing.T) {
116114
return bytes.Equal(k.Marshal(), validCert.SignatureKey.Marshal())
117115
}
118116

119-
if err := checker.CheckCert("user", validCert); err != nil {
117+
if err := checker.CheckCert("testcertificate", validCert); err != nil {
120118
t.Errorf("Unable to validate certificate: %v", err)
121119
}
122120
invalidCert := &Certificate{
@@ -125,7 +123,7 @@ func TestValidateCert(t *testing.T) {
125123
ValidBefore: CertTimeInfinity,
126124
Signature: &Signature{},
127125
}
128-
if err := checker.CheckCert("user", invalidCert); err == nil {
126+
if err := checker.CheckCert("testcertificate", invalidCert); err == nil {
129127
t.Error("Invalid cert signature passed validation")
130128
}
131129
}

0 commit comments

Comments
 (0)