Skip to content

Commit 0ab907c

Browse files
ldezldez
authored
chore: use go1.23 (#2446)
1 parent 526ac35 commit 0ab907c

File tree

11 files changed

+36
-56
lines changed

11 files changed

+36
-56
lines changed

‎acme/api/order_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ func TestOrderService_NewWithOptions(t *testing.T) {
2020
mux, apiURL := tester.SetupFakeAPI(t)
2121

2222
// small value keeps test fast
23-
privateKey, errK := rsa.GenerateKey(rand.Reader, 512)
23+
privateKey, errK := rsa.GenerateKey(rand.Reader, 1024)
2424
require.NoError(t, errK, "Could not generate test key")
2525

2626
mux.HandleFunc("/newOrder", func(w http.ResponseWriter, r *http.Request) {

‎certcrypto/crypto_test.go‎

Lines changed: 13 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import (
66
"crypto/rand"
77
"crypto/rsa"
88
"encoding/pem"
9-
"regexp"
109
"testing"
1110
"time"
1211

@@ -22,7 +21,7 @@ func TestGeneratePrivateKey(t *testing.T) {
2221
}
2322

2423
func TestGenerateCSR(t *testing.T) {
25-
privateKey, err := rsa.GenerateKey(rand.Reader, 512)
24+
privateKey, err := rsa.GenerateKey(rand.Reader, 1024)
2625
require.NoError(t, err, "Error generating private key")
2726

2827
type expected struct {
@@ -43,7 +42,7 @@ func TestGenerateCSR(t *testing.T) {
4342
Domain: "lego.acme",
4443
MustStaple: true,
4544
},
46-
expected: expected{len: 245},
45+
expected: expected{len: 379},
4746
},
4847
{
4948
desc: "without SAN (empty)",
@@ -53,7 +52,7 @@ func TestGenerateCSR(t *testing.T) {
5352
SAN: []string{},
5453
MustStaple: true,
5554
},
56-
expected: expected{len: 245},
55+
expected: expected{len: 379},
5756
},
5857
{
5958
desc: "with SAN",
@@ -63,7 +62,7 @@ func TestGenerateCSR(t *testing.T) {
6362
SAN: []string{"a.lego.acme", "b.lego.acme", "c.lego.acme"},
6463
MustStaple: true,
6564
},
66-
expected: expected{len: 296},
65+
expected: expected{len: 430},
6766
},
6867
{
6968
desc: "no domain",
@@ -72,7 +71,7 @@ func TestGenerateCSR(t *testing.T) {
7271
Domain: "",
7372
MustStaple: true,
7473
},
75-
expected: expected{len: 225},
74+
expected: expected{len: 359},
7675
},
7776
{
7877
desc: "no domain with SAN",
@@ -82,7 +81,7 @@ func TestGenerateCSR(t *testing.T) {
8281
SAN: []string{"a.lego.acme", "b.lego.acme", "c.lego.acme"},
8382
MustStaple: true,
8483
},
85-
expected: expected{len: 276},
84+
expected: expected{len: 409},
8685
},
8786
{
8887
desc: "private key nil",
@@ -101,7 +100,7 @@ func TestGenerateCSR(t *testing.T) {
101100
SAN: []string{"example.org"},
102101
EmailAddresses: []string{"[email protected]", "[email protected]"},
103102
},
104-
expected: expected{len: 287},
103+
expected: expected{len: 421},
105104
},
106105
}
107106

@@ -124,17 +123,17 @@ func TestGenerateCSR(t *testing.T) {
124123
}
125124

126125
func TestPEMEncode(t *testing.T) {
127-
buf := bytes.NewBufferString("TestingRSAIsSoMuchFun")
128-
129-
reader := MockRandReader{b: buf}
130-
key, err := rsa.GenerateKey(reader, 32)
126+
key, err := rsa.GenerateKey(rand.Reader, 1024)
131127
require.NoError(t, err, "Error generating private key")
132128

133129
data := PEMEncode(key)
134130
require.NotNil(t, data)
135131

136-
exp := regexp.MustCompile(`^-----BEGIN RSA PRIVATE KEY-----\s+\S{60,}\s+-----END RSA PRIVATE KEY-----\s+`)
137-
assert.Regexp(t, exp, string(data))
132+
p, rest := pem.Decode(data)
133+
134+
assert.Equal(t, "RSA PRIVATE KEY", p.Type)
135+
assert.Empty(t, rest)
136+
assert.Empty(t, p.Headers)
138137
}
139138

140139
func TestParsePEMCertificate(t *testing.T) {
@@ -186,11 +185,3 @@ func TestParsePEMPrivateKey(t *testing.T) {
186185
_, err = ParsePEMPrivateKey([]byte("This is not PEM"))
187186
require.Errorf(t, err, "Expected to return an error for non-PEM input")
188187
}
189-
190-
type MockRandReader struct {
191-
b *bytes.Buffer
192-
}
193-
194-
func (r MockRandReader) Read(p []byte) (int, error) {
195-
return r.b.Read(p)
196-
}

‎challenge/dns01/dns_challenge_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ func (p *providerTimeoutMock) Timeout() (time.Duration, time.Duration) { ret
3434
func TestChallenge_PreSolve(t *testing.T) {
3535
_, apiURL := tester.SetupFakeAPI(t)
3636

37-
privateKey, err := rsa.GenerateKey(rand.Reader, 512)
37+
privateKey, err := rsa.GenerateKey(rand.Reader, 1024)
3838
require.NoError(t, err)
3939

4040
core, err := api.New(http.DefaultClient, "lego-test", apiURL+"/dir", "", privateKey)
@@ -116,7 +116,7 @@ func TestChallenge_PreSolve(t *testing.T) {
116116
func TestChallenge_Solve(t *testing.T) {
117117
_, apiURL := tester.SetupFakeAPI(t)
118118

119-
privateKey, err := rsa.GenerateKey(rand.Reader, 512)
119+
privateKey, err := rsa.GenerateKey(rand.Reader, 1024)
120120
require.NoError(t, err)
121121

122122
core, err := api.New(http.DefaultClient, "lego-test", apiURL+"/dir", "", privateKey)
@@ -203,7 +203,7 @@ func TestChallenge_Solve(t *testing.T) {
203203
func TestChallenge_CleanUp(t *testing.T) {
204204
_, apiURL := tester.SetupFakeAPI(t)
205205

206-
privateKey, err := rsa.GenerateKey(rand.Reader, 512)
206+
privateKey, err := rsa.GenerateKey(rand.Reader, 1024)
207207
require.NoError(t, err)
208208

209209
core, err := api.New(http.DefaultClient, "lego-test", apiURL+"/dir", "", privateKey)

‎challenge/http01/http_challenge_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ func TestChallenge(t *testing.T) {
9797
return nil
9898
}
9999

100-
privateKey, err := rsa.GenerateKey(rand.Reader, 512)
100+
privateKey, err := rsa.GenerateKey(rand.Reader, 1024)
101101
require.NoError(t, err, "Could not generate test key")
102102

103103
core, err := api.New(http.DefaultClient, "lego-test", apiURL+"/dir", "", privateKey)
@@ -166,7 +166,7 @@ func TestChallengeUnix(t *testing.T) {
166166
return nil
167167
}
168168

169-
privateKey, err := rsa.GenerateKey(rand.Reader, 512)
169+
privateKey, err := rsa.GenerateKey(rand.Reader, 1024)
170170
require.NoError(t, err, "Could not generate test key")
171171

172172
core, err := api.New(http.DefaultClient, "lego-test", apiURL+"/dir", "", privateKey)
@@ -190,7 +190,7 @@ func TestChallengeUnix(t *testing.T) {
190190
func TestChallengeInvalidPort(t *testing.T) {
191191
_, apiURL := tester.SetupFakeAPI(t)
192192

193-
privateKey, err := rsa.GenerateKey(rand.Reader, 128)
193+
privateKey, err := rsa.GenerateKey(rand.Reader, 1024)
194194
require.NoError(t, err, "Could not generate test key")
195195

196196
core, err := api.New(http.DefaultClient, "lego-test", apiURL+"/dir", "", privateKey)
@@ -411,7 +411,7 @@ func testServeWithProxy(t *testing.T, header, extra *testProxyHeader, expectErro
411411
return nil
412412
}
413413

414-
privateKey, err := rsa.GenerateKey(rand.Reader, 512)
414+
privateKey, err := rsa.GenerateKey(rand.Reader, 1024)
415415
require.NoError(t, err, "Could not generate test key")
416416

417417
core, err := api.New(http.DefaultClient, "lego-test", apiURL+"/dir", "", privateKey)

‎challenge/resolver/solver_manager_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ func TestValidate(t *testing.T) {
3636

3737
var statuses []string
3838

39-
privateKey, _ := rsa.GenerateKey(rand.Reader, 512)
39+
privateKey, _ := rsa.GenerateKey(rand.Reader, 1024)
4040

4141
mux.HandleFunc("/chlg", func(w http.ResponseWriter, r *http.Request) {
4242
if r.Method != http.MethodPost {

‎challenge/tlsalpn01/tls_alpn_challenge_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ func TestChallenge(t *testing.T) {
6666
return nil
6767
}
6868

69-
privateKey, err := rsa.GenerateKey(rand.Reader, 512)
69+
privateKey, err := rsa.GenerateKey(rand.Reader, 1024)
7070
require.NoError(t, err, "Could not generate test key")
7171

7272
core, err := api.New(http.DefaultClient, "lego-test", apiURL+"/dir", "", privateKey)
@@ -95,7 +95,7 @@ func TestChallenge(t *testing.T) {
9595
func TestChallengeInvalidPort(t *testing.T) {
9696
_, apiURL := tester.SetupFakeAPI(t)
9797

98-
privateKey, err := rsa.GenerateKey(rand.Reader, 128)
98+
privateKey, err := rsa.GenerateKey(rand.Reader, 1024)
9999
require.NoError(t, err, "Could not generate test key")
100100

101101
core, err := api.New(http.DefaultClient, "lego-test", apiURL+"/dir", "", privateKey)
@@ -167,7 +167,7 @@ func TestChallengeIPaddress(t *testing.T) {
167167
return nil
168168
}
169169

170-
privateKey, err := rsa.GenerateKey(rand.Reader, 512)
170+
privateKey, err := rsa.GenerateKey(rand.Reader, 1024)
171171
require.NoError(t, err, "Could not generate test key")
172172

173173
core, err := api.New(http.DefaultClient, "lego-test", apiURL+"/dir", "", privateKey)

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/go-acme/lego/v4
22

3-
go 1.22.0
3+
go 1.23.0
44

55
require (
66
cloud.google.com/go/compute/metadata v0.6.0

‎lego/client_test.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@ import (
1515
func TestNewClient(t *testing.T) {
1616
_, apiURL := tester.SetupFakeAPI(t)
1717

18-
keyBits := 32 // small value keeps test fast
19-
key, err := rsa.GenerateKey(rand.Reader, keyBits)
18+
key, err := rsa.GenerateKey(rand.Reader, 1024)
2019
require.NoError(t, err, "Could not generate test key")
2120

2221
user := mockUser{

‎providers/dns/hyperone/internal/token_test.go‎

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,29 @@
11
package internal
22

33
import (
4+
"crypto/rand"
5+
"crypto/rsa"
46
"encoding/base64"
57
"encoding/json"
68
"strings"
79
"testing"
810

11+
"github.com/go-acme/lego/v4/certcrypto"
912
"github.com/stretchr/testify/assert"
1013
"github.com/stretchr/testify/require"
1114
)
1215

13-
const privateKey = `-----BEGIN RSA PRIVATE KEY-----
14-
MIICWgIBAAKBgGFfgMY+DuO8l0RYrMLhcl6U/NigNIiOVhoo/xnYyoQALpWxBaBR
15-
+iVJiBUYunQjKA33yAiY0AasCfSn1JB6asayQvGGn73xztLjkeCVLT+9e4nJ0A/o
16-
dK8SOKBg9FFe70KJrWjJd626el0aVDJjtCE+QxJExA0UZbQp+XIyveQXAgMBAAEC
17-
gYBHcL1XNWLRPaWx9GlUVfoGYMMd4HSKl/ueF+QKP59dt5B2LTnWhS7FOqzH5auu
18-
17hkfx3ZCNzfeEuZn6T6F4bMtsQ6A5iT/DeRlG8tOPiCVZ/L0j6IFM78iIUT8XyA
19-
miwnSy1xGSBA67yUmsLxFg2DtGCjamAkY0C5pccadaB7oQJBAKsIPpMXMni+Oo1I
20-
kVxRyoIZgDxsMJiihG2YLVqo8rPtdErl+Lyg3ziVyg9KR6lFMaTBkYBTLoCPof3E
21-
AB/jyucCQQCRv1cVnYNx+bfnXsBlcsCFDV2HkEuLTpxj7hauD4P3GcyLidSsUkn1
22-
PiPunZqKpsQaIoxc/BzTOCcP19ifgqdRAkBJ8Cp9FE4xfKt7YJ/WtVVCoRubA3qO
23-
wdNWPa99vgQOXN0lc/3wLevSXo8XxRjtyIgJndT1EQDNe0qglhcnsiaJAkBziAcR
24-
/VAq0tZys2szf6kYTyXqxfj8Lo5NsHeN9oKXJ346xkEtb/VsT5vQFGJishsU1HoL
25-
Y1W+IO7l4iW3G6xhAkACNwtqxSRRbVsNCUMENpKmYhsyN8QXJ8V+o2A9s+pl21Kz
26-
HIIm179mUYCgO6iAHmkqxlFHFwprUBKdPrmP8qF9
27-
-----END RSA PRIVATE KEY-----`
28-
2916
type Header struct {
3017
Algorithm string `json:"alg"`
3118
Type string `json:"typ"`
3219
KeyID string `json:"kid"`
3320
}
3421

3522
func TestPayload_buildToken(t *testing.T) {
36-
signer, err := getRSASigner(privateKey, "sampleKeyId")
23+
key, err := rsa.GenerateKey(rand.Reader, 1024)
24+
require.NoError(t, err)
25+
26+
signer, err := getRSASigner(string(certcrypto.PEMEncode(key)), "sampleKeyId")
3727
require.NoError(t, err)
3828

3929
payload := Payload{IssuedAt: 1234, Expiry: 4321, Audience: "api.url", Issuer: "issuer", Subject: "subject"}

‎providers/dns/oraclecloud/oraclecloud_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ func mustGeneratePrivateKeyFile(pwd string) string {
320320
}
321321

322322
func generatePrivateKey(pwd string) (*pem.Block, error) {
323-
key, err := rsa.GenerateKey(rand.Reader, 512)
323+
key, err := rsa.GenerateKey(rand.Reader, 1024)
324324
if err != nil {
325325
return nil, err
326326
}

0 commit comments

Comments
 (0)