Skip to content

Commit b586bec

Browse files
deatildeatil
committed
fix
1 parent 56fb11d commit b586bec

6 files changed

Lines changed: 63 additions & 84 deletions

File tree

‎.github/workflows/test.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@ jobs:
2525
with:
2626
go-version: 1.25.0
2727

28+
- name: Go mod tidy
29+
run: go mod tidy
30+
2831
- name: Unit tests
2932
run: go test ./...
3033

@@ -46,6 +49,9 @@ jobs:
4649
with:
4750
go-version: 1.26.4
4851

52+
- name: Go mod tidy
53+
run: go mod tidy
54+
4955
- name: Unit tests
5056
run: go test -coverprofile=cover.out ./...
5157

‎cryptobin/ca/ca_test.go‎

Lines changed: 51 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ func Test_CreateCA(t *testing.T) {
5050

5151
obj := New().
5252
SetPublicKeyType("RSA").
53-
WithBits(512).
53+
WithBits(2048).
5454
GenerateKey().
5555
MakeCA(pkix.Name{
5656
CommonName: "test.example.com",
@@ -98,7 +98,7 @@ func Test_CreateCAWithIssuer(t *testing.T) {
9898

9999
obj := New().
100100
SetPublicKeyType("RSA").
101-
WithBits(512).
101+
WithBits(2048).
102102
GenerateKey().
103103
MakeCA(pkix.Name{
104104
CommonName: "test.example.com",
@@ -116,7 +116,7 @@ func Test_CreateCAWithIssuer(t *testing.T) {
116116

117117
obj2 := New().
118118
SetPublicKeyType("RSA").
119-
WithBits(512).
119+
WithBits(2048).
120120
GenerateKey().
121121
MakeCA(pkix.Name{
122122
CommonName: "test22.example.com",
@@ -145,7 +145,7 @@ func Test_CreateCert(t *testing.T) {
145145

146146
obj := New().
147147
SetPublicKeyType("RSA").
148-
WithBits(512).
148+
WithBits(2048).
149149
GenerateKey().
150150
MakeCA(pkix.Name{
151151
CommonName: "test.example.com",
@@ -163,7 +163,7 @@ func Test_CreateCert(t *testing.T) {
163163

164164
obj2 := New().
165165
SetPublicKeyType("RSA").
166-
WithBits(512).
166+
WithBits(2048).
167167
GenerateKey().
168168
MakeCert(pkix.Name{
169169
CommonName: "test.example.com",
@@ -198,7 +198,7 @@ func Test_CreateCSR(t *testing.T) {
198198

199199
obj := New().
200200
SetPublicKeyType("RSA").
201-
WithBits(512).
201+
WithBits(2048).
202202
GenerateKey().
203203
MakeCSR(
204204
"test.example.com",
@@ -750,42 +750,66 @@ func Test_CreatePKCS12Cert2(t *testing.T) {
750750

751751
var caRoot2 = `
752752
-----BEGIN CERTIFICATE-----
753-
MIIBpDCCAU6gAwIBAgIEDkDUsTANBgkqhkiG9w0BAQsFADA3MRowGAYDVQQKExFU
754-
ZXN0IE9yZ2FuaXphdGlvbjEZMBcGA1UEAxMQdGVzdC5leGFtcGxlLmNvbTAeFw0y
755-
NTAxMjEwNDU5NDhaFw0yNzAxMjEwNDU5NDhaMDcxGjAYBgNVBAoTEVRlc3QgT3Jn
756-
YW5pemF0aW9uMRkwFwYDVQQDExB0ZXN0LmV4YW1wbGUuY29tMFwwDQYJKoZIhvcN
757-
AQEBBQADSwAwSAJBAL3I4OGdootHGfvDwFpDxpMZvVPlLmuh/7gZWBtbn+bsjJgE
758-
iY7GUEU044n/PFxHTAyPKEWGaUn/YbTcHdWJPTMCAwEAAaNCMEAwDgYDVR0PAQH/
759-
BAQDAgKEMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAPBgNVHRMBAf8E
760-
BTADAQH/MA0GCSqGSIb3DQEBCwUAA0EApskWhn6L3CEUDXZIMYt4fwoLLztsQzc3
761-
5dP4kUkdEkRFzlO2BLqsEGpI+ADc08tPmjv3cstbMr5ktg3z73AgCQ==
753+
MIIEBDCCAuygAwIBAgIDAjppMA0GCSqGSIb3DQEBBQUAMEIxCzAJBgNVBAYTAlVT
754+
MRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMRswGQYDVQQDExJHZW9UcnVzdCBHbG9i
755+
YWwgQ0EwHhcNMTMwNDA1MTUxNTU1WhcNMTUwNDA0MTUxNTU1WjBJMQswCQYDVQQG
756+
EwJVUzETMBEGA1UEChMKR29vZ2xlIEluYzElMCMGA1UEAxMcR29vZ2xlIEludGVy
757+
bmV0IEF1dGhvcml0eSBHMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
758+
AJwqBHdc2FCROgajguDYUEi8iT/xGXAaiEZ+4I/F8YnOIe5a/mENtzJEiaB0C1NP
759+
VaTOgmKV7utZX8bhBYASxF6UP7xbSDj0U/ck5vuR6RXEz/RTDfRK/J9U3n2+oGtv
760+
h8DQUB8oMANA2ghzUWx//zo8pzcGjr1LEQTrfSTe5vn8MXH7lNVg8y5Kr0LSy+rE
761+
ahqyzFPdFUuLH8gZYR/Nnag+YyuENWllhMgZxUYi+FOVvuOAShDGKuy6lyARxzmZ
762+
EASg8GF6lSWMTlJ14rbtCMoU/M4iarNOz0YDl5cDfsCx3nuvRTPPuj5xt970JSXC
763+
DTWJnZ37DhF5iR43xa+OcmkCAwEAAaOB+zCB+DAfBgNVHSMEGDAWgBTAephojYn7
764+
qwVkDBF9qn1luMrMTjAdBgNVHQ4EFgQUSt0GFhu89mi1dvWBtrtiGrpagS8wEgYD
765+
VR0TAQH/BAgwBgEB/wIBADAOBgNVHQ8BAf8EBAMCAQYwOgYDVR0fBDMwMTAvoC2g
766+
K4YpaHR0cDovL2NybC5nZW90cnVzdC5jb20vY3Jscy9ndGdsb2JhbC5jcmwwPQYI
767+
KwYBBQUHAQEEMTAvMC0GCCsGAQUFBzABhiFodHRwOi8vZ3RnbG9iYWwtb2NzcC5n
768+
ZW90cnVzdC5jb20wFwYDVR0gBBAwDjAMBgorBgEEAdZ5AgUBMA0GCSqGSIb3DQEB
769+
BQUAA4IBAQA21waAESetKhSbOHezI6B1WLuxfoNCunLaHtiONgaX4PCVOzf9G0JY
770+
/iLIa704XtE7JW4S615ndkZAkNoUyHgN7ZVm2o6Gb4ChulYylYbc3GrKBIxbf/a/
771+
zG+FA1jDaFETzf3I93k9mTXwVqO94FntT0QJo544evZG0R0SnU++0ED8Vf4GXjza
772+
HFa9llF7b1cq26KqltyMdMKVvvBulRP/F/A8rLIQjcxz++iPAsbw+zOzlTvjwsto
773+
WHPbqCRiOwY1nQ2pM714A5AuTHhdUDqB1O6gyHA43LL5Z/qHQF1hwFGPa4NrzQU6
774+
yuGnBXj8ytqU0CwIPX4WecigUCAkVDNx
762775
-----END CERTIFICATE-----
763776
`
764777

765778
var ca2 = `
766779
-----BEGIN CERTIFICATE-----
767-
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
776800
-----END CERTIFICATE-----
777801
`
778802

779803
func Test_Verify(t *testing.T) {
780804
assertEqual := cryptobin_test.AssertEqualT(t)
781-
assertNoError := cryptobin_test.AssertNoErrorT(t)
805+
assertError := cryptobin_test.AssertErrorT(t)
782806

783807
ok, err := New().Verify(caRoot2, ca2, VerifyOptions{
784808
Intermediates: cryptobin_x509.NewCertPool(),
785809
})
786810

787-
assertNoError(err, "Test_Verify")
788-
assertEqual(ok, true, "Test_Verify")
811+
assertError(err, "Test_Verify")
812+
assertEqual(ok, false, "Test_Verify")
789813
}
790814

791815
func Test_Get(t *testing.T) {

‎pkcs8/pkcs8_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -700,7 +700,7 @@ Z3E/tti8bFM6JjLtiaX7FQ==
700700
`
701701

702702
func Test_EncryptPEMBlock_Scrypt(t *testing.T) {
703-
privateKey, err := rsa.GenerateKey(rand.Reader, 512)
703+
privateKey, err := rsa.GenerateKey(rand.Reader, 2048)
704704
if err != nil {
705705
t.Fatal("GenerateKey error: " + err.Error())
706706
}
@@ -741,7 +741,7 @@ func Test_EncryptPEMBlock_Scrypt(t *testing.T) {
741741
}
742742

743743
func Test_EncryptPEMBlock_Pkcs8(t *testing.T) {
744-
privateKey, err := rsa.GenerateKey(rand.Reader, 512)
744+
privateKey, err := rsa.GenerateKey(rand.Reader, 2048)
745745
if err != nil {
746746
t.Fatal("GenerateKey error: " + err.Error())
747747
}

‎rsa/equal_test.go‎

Lines changed: 0 additions & 51 deletions
This file was deleted.

‎rsa/pss_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ func TestPSSGolden(t *testing.T) {
161161
t.Error(err)
162162
}
163163
default:
164-
t.Fatalf("unknown marker: " + marker)
164+
t.Fatalf("unknown marker: %s", marker)
165165
}
166166
}
167167
}

‎tool/test/assert_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -947,7 +947,7 @@ func Test_DidPanic(t *testing.T) {
947947

948948
if funcDidPanic, msg, _ := didPanic(func() {
949949
panic(nil)
950-
}); !funcDidPanic || msg != nil {
950+
}); !funcDidPanic || msg == nil {
951951
t.Error("didPanic should return true, nil")
952952
}
953953

@@ -985,10 +985,10 @@ func Test_PanicsWithValue(t *testing.T) {
985985
t.Error("PanicsWithValue should return true")
986986
}
987987

988-
if !PanicsWithValue(mockT, nil, func() {
988+
if PanicsWithValue(mockT, "panic called with nil argument", func() {
989989
panic(nil)
990990
}) {
991-
t.Error("PanicsWithValue should return true")
991+
t.Error("PanicsWithValue should return false")
992992
}
993993

994994
if PanicsWithValue(mockT, "Panic!", func() {

0 commit comments

Comments
 (0)