Skip to content

Commit 533ad0c

Browse files
marainomaraino
committed
Use always go.step.sm/crypto/x509util
1 parent 8c2d542 commit 533ad0c

File tree

6 files changed

+26
-31
lines changed

6 files changed

+26
-31
lines changed

‎ca/ca_test.go

+17-20
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ import (
2727
"github.com/smallstep/certificates/errs"
2828
"github.com/smallstep/cli/crypto/keys"
2929
"github.com/smallstep/cli/crypto/pemutil"
30-
"github.com/smallstep/cli/crypto/x509util"
3130
stepJOSE "github.com/smallstep/cli/jose"
3231
"go.step.sm/crypto/randutil"
32+
"go.step.sm/crypto/x509util"
3333
jose "gopkg.in/square/go-jose.v2"
3434
"gopkg.in/square/go-jose.v2/jwt"
3535
)
@@ -93,13 +93,9 @@ func TestCASign(t *testing.T) {
9393
config.AuthorityConfig.Template = asn1dn
9494
ca, err := New(config)
9595
assert.FatalError(t, err)
96-
97-
intermediateIdentity, err := x509util.LoadIdentityFromDisk("testdata/secrets/intermediate_ca.crt",
98-
"testdata/secrets/intermediate_ca_key", pemutil.WithPassword([]byte("password")))
96+
intermediateCert, err := pemutil.ReadCertificate("testdata/secrets/intermediate_ca.crt")
9997
assert.FatalError(t, err)
100-
101-
clijwk, err := stepJOSE.ParseKey("testdata/secrets/step_cli_key_priv.jwk",
102-
stepJOSE.WithPassword([]byte("pass")))
98+
clijwk, err := stepJOSE.ParseKey("testdata/secrets/step_cli_key_priv.jwk", stepJOSE.WithPassword([]byte("pass")))
10399
assert.FatalError(t, err)
104100
sig, err := jose.NewSigner(jose.SigningKey{Algorithm: jose.ES256, Key: clijwk.Key},
105101
(&jose.SignerOptions{}).WithType("JWT").WithHeader("kid", clijwk.KeyID))
@@ -321,9 +317,9 @@ ZEp7knvU2psWRw==
321317
assert.FatalError(t, err)
322318
assert.Equals(t, leaf.SubjectKeyId, subjectKeyID)
323319

324-
assert.Equals(t, leaf.AuthorityKeyId, intermediateIdentity.Crt.SubjectKeyId)
320+
assert.Equals(t, leaf.AuthorityKeyId, intermediateCert.SubjectKeyId)
325321

326-
realIntermediate, err := x509.ParseCertificate(intermediateIdentity.Crt.Raw)
322+
realIntermediate, err := x509.ParseCertificate(intermediateCert.Raw)
327323
assert.FatalError(t, err)
328324
assert.Equals(t, intermediate, realIntermediate)
329325
} else {
@@ -555,7 +551,7 @@ func TestCAHealth(t *testing.T) {
555551
}
556552

557553
func TestCARenew(t *testing.T) {
558-
pub, _, err := keys.GenerateDefaultKeyPair()
554+
pub, priv, err := keys.GenerateDefaultKeyPair()
559555
assert.FatalError(t, err)
560556

561557
asn1dn := &authority.ASN1DN{
@@ -574,8 +570,9 @@ func TestCARenew(t *testing.T) {
574570
assert.FatalError(t, err)
575571
assert.FatalError(t, err)
576572

577-
intermediateIdentity, err := x509util.LoadIdentityFromDisk("testdata/secrets/intermediate_ca.crt",
578-
"testdata/secrets/intermediate_ca_key", pemutil.WithPassword([]byte("password")))
573+
intermediateCert, err := pemutil.ReadCertificate("testdata/secrets/intermediate_ca.crt")
574+
assert.FatalError(t, err)
575+
intermediateKey, err := pemutil.Read("testdata/secrets/intermediate_ca_key", pemutil.WithPassword([]byte("password")))
579576
assert.FatalError(t, err)
580577

581578
now := time.Now().UTC()
@@ -605,15 +602,15 @@ func TestCARenew(t *testing.T) {
605602
}
606603
},
607604
"success": func(t *testing.T) *renewTest {
608-
profile, err := x509util.NewLeafProfile("test", intermediateIdentity.Crt,
609-
intermediateIdentity.Key, x509util.WithPublicKey(pub),
610-
x509util.WithNotBeforeAfterDuration(now, leafExpiry, 0), x509util.WithHosts("funk"))
605+
cr, err := x509util.CreateCertificateRequest("test", []string{"funk"}, priv.(crypto.Signer))
611606
assert.FatalError(t, err)
612-
crtBytes, err := profile.CreateCertificate()
607+
cert, err := x509util.NewCertificate(cr)
613608
assert.FatalError(t, err)
614-
crt, err := x509.ParseCertificate(crtBytes)
609+
crt := cert.GetCertificate()
610+
crt.NotBefore = time.Now()
611+
crt.NotAfter = leafExpiry
612+
crt, err = x509util.CreateCertificate(crt, intermediateCert, pub, intermediateKey.(crypto.Signer))
615613
assert.FatalError(t, err)
616-
617614
return &renewTest{
618615
ca: ca,
619616
tlsConnState: &tls.ConnectionState{
@@ -661,9 +658,9 @@ func TestCARenew(t *testing.T) {
661658
subjectKeyID, err := generateSubjectKeyID(pub)
662659
assert.FatalError(t, err)
663660
assert.Equals(t, leaf.SubjectKeyId, subjectKeyID)
664-
assert.Equals(t, leaf.AuthorityKeyId, intermediateIdentity.Crt.SubjectKeyId)
661+
assert.Equals(t, leaf.AuthorityKeyId, intermediateCert.SubjectKeyId)
665662

666-
realIntermediate, err := x509.ParseCertificate(intermediateIdentity.Crt.Raw)
663+
realIntermediate, err := x509.ParseCertificate(intermediateCert.Raw)
667664
assert.FatalError(t, err)
668665
assert.Equals(t, intermediate, realIntermediate)
669666

‎ca/client.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import (
3030
"github.com/smallstep/cli/config"
3131
"github.com/smallstep/cli/crypto/keys"
3232
"github.com/smallstep/cli/crypto/pemutil"
33-
"github.com/smallstep/cli/crypto/x509util"
33+
"go.step.sm/crypto/x509util"
3434
"golang.org/x/net/http2"
3535
"gopkg.in/square/go-jose.v2/jwt"
3636
)

‎ca/client_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"github.com/smallstep/certificates/authority"
2323
"github.com/smallstep/certificates/authority/provisioner"
2424
"github.com/smallstep/certificates/errs"
25-
"github.com/smallstep/cli/crypto/x509util"
25+
"go.step.sm/crypto/x509util"
2626
"golang.org/x/crypto/ssh"
2727
)
2828

‎ca/provisioner_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import (
88
"time"
99

1010
"github.com/smallstep/cli/crypto/pemutil"
11-
"github.com/smallstep/cli/crypto/x509util"
1211
"github.com/smallstep/cli/jose"
12+
"go.step.sm/crypto/x509util"
1313
)
1414

1515
func getTestProvisioner(t *testing.T, caURL string) *Provisioner {

‎go.mod

+4-3
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ require (
1717
github.com/smallstep/cli v0.14.7-rc.1.0.20200721180458-731b7c4c8c95
1818
github.com/smallstep/nosql v0.3.0
1919
github.com/urfave/cli v1.22.2
20-
go.step.sm/crypto v0.1.0
20+
go.step.sm/crypto v0.1.1
2121
golang.org/x/crypto v0.0.0-20200414173820-0848c9571904
2222
golang.org/x/net v0.0.0-20200202094626-16171245cfb2
2323
google.golang.org/api v0.15.0
@@ -26,5 +26,6 @@ require (
2626
gopkg.in/square/go-jose.v2 v2.4.0
2727
)
2828

29-
//replace github.com/smallstep/cli => ../cli
30-
//replace github.com/smallstep/nosql => ../nosql
29+
// replace github.com/smallstep/cli => ../cli
30+
// replace github.com/smallstep/nosql => ../nosql
31+
// replace go.step.sm/crypto => ../crypto

‎go.sum

+2-5
Original file line numberDiff line numberDiff line change
@@ -479,7 +479,6 @@ github.com/smallstep/assert v0.0.0-20200103212524-b99dc1097b15/go.mod h1:MyOHs9P
479479
github.com/smallstep/certificates v0.14.5/go.mod h1:zzpB8wMz967gL8FmK6zvCNB4pDVwFDKjPg1diTVc1h8=
480480
github.com/smallstep/certinfo v1.3.0/go.mod h1:1gQJekdPwPvUwFWGTi7bZELmQT09cxC9wJ0VBkBNiwU=
481481
github.com/smallstep/cli v0.14.5/go.mod h1:mRFuqC3cGwQESBGJvog4o76jZZZ7bMjkE+hAnq2QyR8=
482-
github.com/smallstep/cli v0.14.6 h1:xc9rawDKB70Vgvg10gfQAh9EpDWS3k1O002J5bApqUk=
483482
github.com/smallstep/cli v0.14.7-rc.1.0.20200721180458-731b7c4c8c95 h1:TcCYqEqh6EIEiFabRdtG0IGyFK01kRLTjx6TIKqjxX8=
484483
github.com/smallstep/cli v0.14.7-rc.1.0.20200721180458-731b7c4c8c95/go.mod h1:7aWHk7WwJMpEP4PYyav86FMpaI9vuA0uJRliUAqCwxg=
485484
github.com/smallstep/nosql v0.3.0 h1:V1X5vfDsDt89499h3jZFUlR4VnnsYYs5tXaQZ0w8z5U=
@@ -578,10 +577,8 @@ go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
578577
go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
579578
go.opencensus.io v0.22.2 h1:75k/FF0Q2YM8QYo07VPddOLBslDt1MZOdEslOHvmzAs=
580579
go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
581-
go.step.sm/crypto v0.0.0-20200805202904-ec18b6df3cf0 h1:FymMl8TrXGxFf80BWpO0CnkSfLnw0BkDdRrhbMGf5zE=
582-
go.step.sm/crypto v0.0.0-20200805202904-ec18b6df3cf0/go.mod h1:8VYxmvSKt5yOTBx3MGsD2Gk4F1Es/3FIxrjnfeYWE8U=
583-
go.step.sm/crypto v0.1.0 h1:SLo25kNU3C6u8Ne5BnavI9bhtA+PBrMnnNZKYIWhKFU=
584-
go.step.sm/crypto v0.1.0/go.mod h1:cIoSWTfTQ5xqvwTeZH9ZXZzi6jdMepjK4A/TDWMUvw8=
580+
go.step.sm/crypto v0.1.1 h1:xg3kUS30hEnwgbxtKwq9a4MJaeiU616HSug60LU9B2E=
581+
go.step.sm/crypto v0.1.1/go.mod h1:cIoSWTfTQ5xqvwTeZH9ZXZzi6jdMepjK4A/TDWMUvw8=
585582
go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
586583
go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
587584
go.uber.org/atomic v1.5.1 h1:rsqfU5vBkVknbhUGbAUwQKR2H4ItV8tjJ+6kJX4cxHM=

0 commit comments

Comments
 (0)