@@ -12,12 +12,12 @@ import (
12 12
"encoding/hex"
13 13
"encoding/pem"
14 14
"errors"
15 -
"io/ioutil"
16 15
"math/big"
17 16
"net"
18 17
"net/http"
19 18
"net/http/httptest"
20 19
"net/url"
20 +
"os"
21 21
"reflect"
22 22
"regexp"
23 23
"sort"
@@ -31,6 +31,7 @@ import (
31 31
"github.com/cloudflare/cfssl/helpers"
32 32
"github.com/cloudflare/cfssl/log"
33 33
"github.com/cloudflare/cfssl/signer"
34 + 34 35
"github.com/google/certificate-transparency-go"
35 36
"github.com/zmap/zlint/v3/lint"
36 37
)
@@ -215,13 +216,13 @@ func TestSign(t *testing.T) {
215 216
}
216 217 217 218
// not a csr
218 -
certPem, err := ioutil.ReadFile("../../helpers/testdata/cert.pem")
219 +
certPem, err := os.ReadFile("../../helpers/testdata/cert.pem")
219 220
if err != nil {
220 221
t.Fatal(err)
221 222
}
222 223 223 224
// csr with ip as hostname
224 -
pem, err := ioutil.ReadFile("testdata/ip.csr")
225 +
pem, err := os.ReadFile("testdata/ip.csr")
225 226
if err != nil {
226 227
t.Fatal(err)
227 228
}
@@ -239,7 +240,7 @@ func TestSign(t *testing.T) {
239 240
t.Fatal("A bad case failed to raise an error")
240 241
}
241 242 242 -
pem, err = ioutil.ReadFile("testdata/ex.csr")
243 +
pem, err = os.ReadFile("testdata/ex.csr")
243 244
validReq = signer.SignRequest{
244 245
Request: string(pem),
245 246
Hosts: []string{"example.com"},
@@ -295,7 +296,7 @@ const (
295 296
func testSignFile(t *testing.T, certFile string) ([]byte, error) {
296 297
s := newTestSigner(t)
297 298 298 -
pem, err := ioutil.ReadFile(certFile)
299 +
pem, err := os.ReadFile(certFile)
299 300
if err != nil {
300 301
t.Fatal(err)
301 302
}
@@ -369,7 +370,7 @@ func TestSignCSRs(t *testing.T) {
369 370
s := newTestSigner(t)
370 371
hostname := "cloudflare.com"
371 372
for _, test := range csrTests {
372 -
csr, err := ioutil.ReadFile(test.file)
373 +
csr, err := os.ReadFile(test.file)
373 374
if err != nil {
374 375
t.Fatal("CSR loading error:", err)
375 376
}
@@ -397,7 +398,7 @@ func TestECDSASigner(t *testing.T) {
397 398
s := newCustomSigner(t, testECDSACaFile, testECDSACaKeyFile)
398 399
hostname := "cloudflare.com"
399 400
for _, test := range csrTests {
400 -
csr, err := ioutil.ReadFile(test.file)
401 +
csr, err := os.ReadFile(test.file)
401 402
if err != nil {
402 403
t.Fatal("CSR loading error:", err)
403 404
}
@@ -449,7 +450,7 @@ func TestCAIssuing(t *testing.T) {
449 450
s := newCustomSigner(t, caFile, caKeyFile)
450 451
s.policy = CAPolicy
451 452
for j, csr := range interCSRs {
452 -
csrBytes, _ := ioutil.ReadFile(csr)
453 +
csrBytes, _ := os.ReadFile(csr)
453 454
certBytes, err := s.Sign(signer.SignRequest{Hosts: signer.SplitHosts(hostname), Request: string(csrBytes)})
454 455
if err != nil {
455 456
t.Fatal(err)
@@ -458,7 +459,7 @@ func TestCAIssuing(t *testing.T) {
458 459
if err != nil {
459 460
t.Fatal(err)
460 461
}
461 -
keyBytes, _ := ioutil.ReadFile(interKeys[j])
462 +
keyBytes, _ := os.ReadFile(interKeys[j])
462 463
interKey, _ := helpers.ParsePrivateKeyPEM(keyBytes)
463 464
interSigner := &Signer{
464 465
ca: interCert,
@@ -467,7 +468,7 @@ func TestCAIssuing(t *testing.T) {
467 468
sigAlgo: signer.DefaultSigAlgo(interKey),
468 469
}
469 470
for _, anotherCSR := range interCSRs {
470 -
anotherCSRBytes, _ := ioutil.ReadFile(anotherCSR)
471 +
anotherCSRBytes, _ := os.ReadFile(anotherCSR)
471 472
bytes, err := interSigner.Sign(
472 473
signer.SignRequest{
473 474
Hosts: signer.SplitHosts(hostname),
@@ -564,7 +565,7 @@ func TestPopulateSubjectFromCSR(t *testing.T) {
564 565 565 566
}
566 567
func TestOverrideSubject(t *testing.T) {
567 -
csrPEM, err := ioutil.ReadFile(fullSubjectCSR)
568 +
csrPEM, err := os.ReadFile(fullSubjectCSR)
568 569
if err != nil {
569 570
t.Fatalf("%v", err)
570 571
}
@@ -624,7 +625,7 @@ func TestOverrideSubject(t *testing.T) {
624 625 625 626
func TestOverwriteHosts(t *testing.T) {
626 627
for _, csrFile := range []string{testCSR, testSANCSR} {
627 -
csrPEM, err := ioutil.ReadFile(csrFile)
628 +
csrPEM, err := os.ReadFile(csrFile)
628 629
if err != nil {
629 630
t.Fatal(err)
630 631
}
@@ -702,7 +703,7 @@ func TestOverwriteHosts(t *testing.T) {
702 703
}
703 704 704 705
func TestOverrideValidity(t *testing.T) {
705 -
csrPEM, err := ioutil.ReadFile(fullSubjectCSR)
706 +
csrPEM, err := os.ReadFile(fullSubjectCSR)
706 707
if err != nil {
707 708
t.Fatalf("%v", err)
708 709
}
@@ -904,7 +905,7 @@ func TestCASignPathlen(t *testing.T) {
904 905
}
905 906 906 907
for _, testCase := range csrPathlenTests {
907 -
csrPEM, err := ioutil.ReadFile(testCase.csrFile)
908 +
csrPEM, err := os.ReadFile(testCase.csrFile)
908 909
if err != nil {
909 910
t.Fatalf("%v", err)
910 911
}
@@ -964,7 +965,7 @@ func TestCASignPathlen(t *testing.T) {
964 965
}
965 966 966 967
func TestNoWhitelistSign(t *testing.T) {
967 -
csrPEM, err := ioutil.ReadFile(fullSubjectCSR)
968 +
csrPEM, err := os.ReadFile(fullSubjectCSR)
968 969
if err != nil {
969 970
t.Fatalf("%v", err)
970 971
}
@@ -1019,7 +1020,7 @@ func TestNoWhitelistSign(t *testing.T) {
1019 1020
}
1020 1021 1021 1022
func TestWhitelistSign(t *testing.T) {
1022 -
csrPEM, err := ioutil.ReadFile(fullSubjectCSR)
1023 +
csrPEM, err := os.ReadFile(fullSubjectCSR)
1023 1024
if err != nil {
1024 1025
t.Fatalf("%v", err)
1025 1026
}
@@ -1088,7 +1089,7 @@ func TestWhitelistSign(t *testing.T) {
1088 1089
}
1089 1090 1090 1091
func TestNameWhitelistSign(t *testing.T) {
1091 -
csrPEM, err := ioutil.ReadFile(fullSubjectCSR)
1092 +
csrPEM, err := os.ReadFile(fullSubjectCSR)
1092 1093
if err != nil {
1093 1094
t.Fatalf("%v", err)
1094 1095
}
@@ -1160,7 +1161,7 @@ func TestNameWhitelistSign(t *testing.T) {
1160 1161
}
1161 1162 1162 1163
func TestExtensionSign(t *testing.T) {
1163 -
csrPEM, err := ioutil.ReadFile(testCSR)
1164 +
csrPEM, err := os.ReadFile(testCSR)
1164 1165
if err != nil {
1165 1166
t.Fatalf("%v", err)
1166 1167
}
@@ -1270,7 +1271,7 @@ func TestCTFailure(t *testing.T) {
1270 1271
t.Fatalf("%v", err)
1271 1272
}
1272 1273
var pem []byte
1273 -
pem, err = ioutil.ReadFile("testdata/ex.csr")
1274 +
pem, err = os.ReadFile("testdata/ex.csr")
1274 1275
if err != nil {
1275 1276
t.Fatalf("%v", err)
1276 1277
}
@@ -1307,7 +1308,7 @@ func TestCTSuccess(t *testing.T) {
1307 1308
t.Fatalf("%v", err)
1308 1309
}
1309 1310
var pem []byte
1310 -
pem, err = ioutil.ReadFile("testdata/ex.csr")
1311 +
pem, err = os.ReadFile("testdata/ex.csr")
1311 1312
if err != nil {
1312 1313
t.Fatalf("%v", err)
1313 1314
}
@@ -1335,7 +1336,7 @@ func TestReturnPrecert(t *testing.T) {
1335 1336
if err != nil {
1336 1337
t.Fatalf("%v", err)
1337 1338
}
1338 -
csr, err := ioutil.ReadFile("testdata/ex.csr")
1339 +
csr, err := os.ReadFile("testdata/ex.csr")
1339 1340
if err != nil {
1340 1341
t.Fatalf("%v", err)
1341 1342
}
RetroSearch is an open source project built by @garambo | Open a GitHub Issue
Search and Browse the WWW like it's 1997 | Search results from DuckDuckGo
HTML:
3.2
| Encoding:
UTF-8
| Version:
0.7.4