Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit ec384e2

Browse files
robstradlingrobstradling
authored
Adapt to zcrypto RSA library fork (#1045)
1 parent 77ce217 commit ec384e2

26 files changed

Lines changed: 89 additions & 516 deletions

‎v3/cmd/genTestCerts/go.mod‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ go 1.25.0
55
replace github.com/zmap/zlint/v3 => ../../
66

77
require (
8-
github.com/zmap/zcrypto v0.0.0-20260426170728-e95752a6dfc1
8+
github.com/zmap/zcrypto v0.0.0-20260514033604-a1159eb3cad9
99
github.com/zmap/zlint/v3 v3.6.8
1010
)
1111

1212
require (
13-
github.com/weppos/publicsuffix-go v0.50.4-0.20260424101603-5ad6bdf70b02 // indirect
14-
golang.org/x/crypto v0.50.0 // indirect
15-
golang.org/x/net v0.53.0 // indirect
16-
golang.org/x/text v0.36.0 // indirect
13+
github.com/weppos/publicsuffix-go v0.50.4-0.20260507075217-1bd47f85b3da // indirect
14+
golang.org/x/crypto v0.51.0 // indirect
15+
golang.org/x/net v0.54.0 // indirect
16+
golang.org/x/text v0.37.0 // indirect
1717
)

‎v3/cmd/genTestCerts/go.sum‎

Lines changed: 14 additions & 212 deletions
Large diffs are not rendered by default.

‎v3/cmd/gen_test_crl/gen_test_crl.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ package main
1717
import (
1818
"crypto"
1919
"crypto/rand"
20-
"crypto/rsa"
2120
"crypto/sha256"
2221
"encoding/pem"
2322
"fmt"
@@ -28,6 +27,7 @@ import (
2827

2928
log "github.com/sirupsen/logrus"
3029
"github.com/zmap/zcrypto/encoding/asn1"
30+
"github.com/zmap/zcrypto/rsa"
3131
"github.com/zmap/zcrypto/x509/pkix"
3232
"github.com/zmap/zlint/v3/util"
3333
)

‎v3/cmd/gen_test_crl/go.mod‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ replace github.com/zmap/zlint/v3 => ../../
66

77
require (
88
github.com/sirupsen/logrus v1.9.4
9-
github.com/zmap/zcrypto v0.0.0-20260426170728-e95752a6dfc1
9+
github.com/zmap/zcrypto v0.0.0-20260514033604-a1159eb3cad9
1010
github.com/zmap/zlint/v3 v3.6.8
1111
)
1212

1313
require (
14-
github.com/weppos/publicsuffix-go v0.50.4-0.20260424101603-5ad6bdf70b02 // indirect
15-
golang.org/x/crypto v0.50.0 // indirect
16-
golang.org/x/net v0.53.0 // indirect
17-
golang.org/x/sys v0.43.0 // indirect
18-
golang.org/x/text v0.36.0 // indirect
14+
github.com/weppos/publicsuffix-go v0.50.4-0.20260507075217-1bd47f85b3da // indirect
15+
golang.org/x/crypto v0.51.0 // indirect
16+
golang.org/x/net v0.54.0 // indirect
17+
golang.org/x/sys v0.44.0 // indirect
18+
golang.org/x/text v0.37.0 // indirect
1919
)

‎v3/cmd/gen_test_crl/go.sum‎

Lines changed: 17 additions & 215 deletions
Large diffs are not rendered by default.

‎v3/go.mod‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ go 1.25.0
55
require (
66
github.com/pelletier/go-toml v1.9.5
77
github.com/sirupsen/logrus v1.9.4
8-
github.com/zmap/zcrypto v0.0.0-20260426170728-e95752a6dfc1
9-
golang.org/x/crypto v0.50.0
10-
golang.org/x/net v0.53.0
11-
golang.org/x/text v0.36.0
8+
github.com/zmap/zcrypto v0.0.0-20260514033604-a1159eb3cad9
9+
golang.org/x/crypto v0.51.0
10+
golang.org/x/net v0.54.0
11+
golang.org/x/text v0.37.0
1212
)
1313

1414
require (
15-
github.com/weppos/publicsuffix-go v0.50.4-0.20260424101603-5ad6bdf70b02 // indirect
16-
golang.org/x/sys v0.43.0 // indirect
15+
github.com/weppos/publicsuffix-go v0.50.4-0.20260507075217-1bd47f85b3da // indirect
16+
golang.org/x/sys v0.44.0 // indirect
1717
)

‎v3/go.sum‎

Lines changed: 12 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
21
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
32
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
43
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
@@ -11,42 +10,23 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
1110
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
1211
github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
1312
github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
14-
github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
15-
github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
1613
github.com/sirupsen/logrus v1.9.4 h1:TsZE7l11zFCLZnZ+teH4Umoq5BhEIfIzfRDZ1Uzql2w=
1714
github.com/sirupsen/logrus v1.9.4/go.mod h1:ftWc9WdOfJ0a92nsE2jF5u5ZwH8Bv2zdeOC42RjbV2g=
18-
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
19-
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
2015
github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
2116
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
22-
github.com/weppos/publicsuffix-go v0.50.1 h1:elrBHeSkS/eIb169+DnLrknqmdP4AjT0Q0tEdytz1Og=
23-
github.com/weppos/publicsuffix-go v0.50.1/go.mod h1:znn0JVXjcR5hpUl9pbEogwH6I710rA1AX0QQPT0bf+k=
24-
github.com/weppos/publicsuffix-go v0.50.4-0.20260424101603-5ad6bdf70b02 h1:WzD4FW44vaYrEWibqJ4FQqgBBsNFcexMpaQyqMM44pM=
25-
github.com/weppos/publicsuffix-go v0.50.4-0.20260424101603-5ad6bdf70b02/go.mod h1:/rOa781xBykZhHK/I3QeHo92qdDKVmKZKF7s8qAEM/4=
26-
github.com/zmap/zcrypto v0.0.0-20251227215108-5ca1211d486b h1:MZM9+FwdBS/nsjiBNhy2GK4/6C/Ipd7IstzHaLlX8fM=
27-
github.com/zmap/zcrypto v0.0.0-20251227215108-5ca1211d486b/go.mod h1:NBtLpB/eitQk7/yXV7mHbZ/Gtmigw0Un9H9DEnrl+Zg=
28-
github.com/zmap/zcrypto v0.0.0-20260426170728-e95752a6dfc1 h1:317pTB0eIhECMeuvtUhAtdfr5sJHcjr/zkQRfq/XpAM=
29-
github.com/zmap/zcrypto v0.0.0-20260426170728-e95752a6dfc1/go.mod h1:VKm3JJ9YsOEfr3+SirfeEbTNRa+s/mEXTe83vHwD+HQ=
30-
golang.org/x/crypto v0.46.0 h1:cKRW/pmt1pKAfetfu+RCEvjvZkA9RimPbh7bhFjGVBU=
31-
golang.org/x/crypto v0.46.0/go.mod h1:Evb/oLKmMraqjZ2iQTwDwvCtJkczlDuTmdJXoZVzqU0=
32-
golang.org/x/crypto v0.50.0 h1:zO47/JPrL6vsNkINmLoo/PH1gcxpls50DNogFvB5ZGI=
33-
golang.org/x/crypto v0.50.0/go.mod h1:3muZ7vA7PBCE6xgPX7nkzzjiUq87kRItoJQM1Yo8S+Q=
34-
golang.org/x/net v0.48.0 h1:zyQRTTrjc33Lhh0fBgT/H3oZq9WuvRR5gPC70xpDiQU=
35-
golang.org/x/net v0.48.0/go.mod h1:+ndRgGjkh8FGtu1w1FGbEC31if4VrNVMuKTgcAAnQRY=
36-
golang.org/x/net v0.53.0 h1:d+qAbo5L0orcWAr0a9JweQpjXF19LMXJE8Ey7hwOdUA=
37-
golang.org/x/net v0.53.0/go.mod h1:JvMuJH7rrdiCfbeHoo3fCQU24Lf5JJwT9W3sJFulfgs=
38-
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
39-
golang.org/x/sys v0.39.0 h1:CvCKL8MeisomCi6qNZ+wbb0DN9E5AATixKsvNtMoMFk=
40-
golang.org/x/sys v0.39.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
41-
golang.org/x/sys v0.43.0 h1:Rlag2XtaFTxp19wS8MXlJwTvoh8ArU6ezoyFsMyCTNI=
42-
golang.org/x/sys v0.43.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
43-
golang.org/x/text v0.32.0 h1:ZD01bjUt1FQ9WJ0ClOL5vxgxOI/sVCNgX1YtKwcY0mU=
44-
golang.org/x/text v0.32.0/go.mod h1:o/rUWzghvpD5TXrTIBuJU77MTaN0ljMWE47kxGJQ7jY=
45-
golang.org/x/text v0.36.0 h1:JfKh3XmcRPqZPKevfXVpI1wXPTqbkE5f7JA92a55Yxg=
46-
golang.org/x/text v0.36.0/go.mod h1:NIdBknypM8iqVmPiuco0Dh6P5Jcdk8lJL0CUebqK164=
47-
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
17+
github.com/weppos/publicsuffix-go v0.50.4-0.20260507075217-1bd47f85b3da h1:fvG9axse5NWVonGRSWkjrIBP5v6jXxJE2yZxcPILBX4=
18+
github.com/weppos/publicsuffix-go v0.50.4-0.20260507075217-1bd47f85b3da/go.mod h1:/rOa781xBykZhHK/I3QeHo92qdDKVmKZKF7s8qAEM/4=
19+
github.com/zmap/zcrypto v0.0.0-20260514033604-a1159eb3cad9 h1:k0GSZUpunq/xV9TchM0Y8WGQn2wzpeF0uTBMNN5up+o=
20+
github.com/zmap/zcrypto v0.0.0-20260514033604-a1159eb3cad9/go.mod h1:fFnCx1pWvIjLONMF4Qkmp3LlwomUZ4VG4aUDYhMDstU=
21+
golang.org/x/crypto v0.51.0 h1:IBPXwPfKxY7cWQZ38ZCIRPI50YLeevDLlLnyC5wRGTI=
22+
golang.org/x/crypto v0.51.0/go.mod h1:8AdwkbraGNABw2kOX6YFPs3WM22XqI4EXEd8g+x7Oc8=
23+
golang.org/x/net v0.54.0 h1:2zJIZAxAHV/OHCDTCOHAYehQzLfSXuf/5SoL/Dv6w/w=
24+
golang.org/x/net v0.54.0/go.mod h1:Sj4oj8jK6XmHpBZU/zWHw3BV3abl4Kvi+Ut7cQcY+cQ=
25+
golang.org/x/sys v0.44.0 h1:ildZl3J4uzeKP07r2F++Op7E9B29JRUy+a27EibtBTQ=
26+
golang.org/x/sys v0.44.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
27+
golang.org/x/text v0.37.0 h1:Cqjiwd9eSg8e0QAkyCaQTNHFIIzWtidPahFWR83rTrc=
28+
golang.org/x/text v0.37.0/go.mod h1:a5sjxXGs9hsn/AJVwuElvCAo9v8QYLzvavO5z2PiM38=
4829
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
4930
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
50-
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
5131
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
5232
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

‎v3/lints/cabf_br/lint_old_root_ca_rsa_mod_less_than_2048_bits.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@ package cabf_br
1515
*/
1616

1717
import (
18-
"crypto/rsa"
19-
18+
"github.com/zmap/zcrypto/rsa"
2019
"github.com/zmap/zcrypto/x509"
2120
"github.com/zmap/zlint/v3/lint"
2221
"github.com/zmap/zlint/v3/util"

‎v3/lints/cabf_br/lint_old_sub_ca_rsa_mod_less_than_1024_bits.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@ package cabf_br
1717
// CHANGE THIS COMMENT TO MATCH SOURCE TEXT
1818

1919
import (
20-
"crypto/rsa"
21-
20+
"github.com/zmap/zcrypto/rsa"
2221
"github.com/zmap/zcrypto/x509"
2322
"github.com/zmap/zlint/v3/lint"
2423
"github.com/zmap/zlint/v3/util"

‎v3/lints/cabf_br/lint_old_sub_cert_rsa_mod_less_than_1024_bits.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@ package cabf_br
1515
*/
1616

1717
import (
18-
"crypto/rsa"
19-
18+
"github.com/zmap/zcrypto/rsa"
2019
"github.com/zmap/zcrypto/x509"
2120
"github.com/zmap/zlint/v3/lint"
2221
"github.com/zmap/zlint/v3/util"

0 commit comments

Comments
 (0)