From 978ad7e2b6e30bad43678c36f20c58ce2ab8bcf6 Mon Sep 17 00:00:00 2001 From: Mariano Cano Date: Tue, 21 Jul 2020 14:34:55 -0700 Subject: [PATCH] Fix merged tests. --- authority/tls_test.go | 16 +++++++++++----- go.mod | 4 +--- go.sum | 10 ++-------- 3 files changed, 14 insertions(+), 16 deletions(-) diff --git a/authority/tls_test.go b/authority/tls_test.go index 77c90e05..46d2250a 100644 --- a/authority/tls_test.go +++ b/authority/tls_test.go @@ -653,6 +653,13 @@ func TestAuthority_Rekey(t *testing.T) { CommonName: "renew", } + certModToWithOptions := func(m provisioner.CertificateModifierFunc) x509util.WithOption { + return func(p x509util.Profile) error { + crt := p.Subject() + return m.Modify(crt, provisioner.Options{}) + } + } + now := time.Now().UTC() nb1 := now.Add(-time.Minute * 7) na1 := now @@ -663,7 +670,7 @@ func TestAuthority_Rekey(t *testing.T) { leaf, err := x509util.NewLeafProfile("renew", a.x509Issuer, a.x509Signer, x509util.WithNotBeforeAfterDuration(so.NotBefore.Time(), so.NotAfter.Time(), 0), - withDefaultASN1DN(a.config.AuthorityConfig.Template), + certModToWithOptions(withDefaultASN1DN(a.config.AuthorityConfig.Template)), x509util.WithPublicKey(pub), x509util.WithHosts("test.smallstep.com,test"), withProvisionerOID("Max", a.config.AuthorityConfig.Provisioners[0].(*provisioner.JWK).Key.KeyID)) assert.FatalError(t, err) @@ -674,7 +681,7 @@ func TestAuthority_Rekey(t *testing.T) { leafNoRenew, err := x509util.NewLeafProfile("norenew", a.x509Issuer, a.x509Signer, x509util.WithNotBeforeAfterDuration(so.NotBefore.Time(), so.NotAfter.Time(), 0), - withDefaultASN1DN(a.config.AuthorityConfig.Template), + certModToWithOptions(withDefaultASN1DN(a.config.AuthorityConfig.Template)), x509util.WithPublicKey(pub), x509util.WithHosts("test.smallstep.com,test"), withProvisionerOID("dev", a.config.AuthorityConfig.Provisioners[2].(*provisioner.JWK).Key.KeyID), ) @@ -809,10 +816,9 @@ func TestAuthority_Rekey(t *testing.T) { } assert.Equals(t, leaf.PublicKey, expectedPK) - pubBytes, err := x509.MarshalPKIXPublicKey(expectedPK) + subjectKeyID, err := generateSubjectKeyID(expectedPK) assert.FatalError(t, err) - hash := sha1.Sum(pubBytes) - assert.Equals(t, leaf.SubjectKeyId, hash[:]) + assert.Equals(t, leaf.SubjectKeyId, subjectKeyID) if tc.pk == nil { assert.Equals(t, leaf.SubjectKeyId, cert.SubjectKeyId) } diff --git a/go.mod b/go.mod index 119cac88..fa518bb5 100644 --- a/go.mod +++ b/go.mod @@ -9,14 +9,12 @@ require ( github.com/go-chi/chi v4.0.2+incompatible github.com/go-piv/piv-go v1.5.0 github.com/googleapis/gax-go/v2 v2.0.5 - github.com/juju/ansiterm v0.0.0-20180109212912-720a0952cc2a // indirect - github.com/lunixbochs/vtclean v1.0.0 // indirect github.com/newrelic/go-agent v2.15.0+incompatible github.com/pkg/errors v0.9.1 github.com/rs/xid v1.2.1 github.com/sirupsen/logrus v1.4.2 github.com/smallstep/assert v0.0.0-20200103212524-b99dc1097b15 - github.com/smallstep/cli v0.14.7-0.20200716213216-e7fdc9eac986 + github.com/smallstep/cli v0.14.7-rc.1.0.20200721180458-731b7c4c8c95 github.com/smallstep/nosql v0.3.0 github.com/urfave/cli v1.22.2 golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59 diff --git a/go.sum b/go.sum index a752ece6..fa7accea 100644 --- a/go.sum +++ b/go.sum @@ -468,17 +468,11 @@ github.com/smallstep/assert v0.0.0-20180720014142-de77670473b5 h1:lX6ybsQW9Agn3q github.com/smallstep/assert v0.0.0-20180720014142-de77670473b5/go.mod h1:TC9A4+RjIOS+HyTH7wG17/gSqVv95uDw2J64dQZx7RE= github.com/smallstep/assert v0.0.0-20200103212524-b99dc1097b15 h1:kSImCuenAkXtCaBeQ1UhmzzJGRhSm8sVH7I3sHE2Qdg= github.com/smallstep/assert v0.0.0-20200103212524-b99dc1097b15/go.mod h1:MyOHs9Po2fbM1LHej6sBUT8ozbxmMOFG+E+rx/GSGuc= -github.com/smallstep/certificates v0.14.4/go.mod h1:Y9ug0+ZTB0k22BBV/2K+LAZIVDCMjAAtbQ0XWS+E870= github.com/smallstep/certificates v0.14.5/go.mod h1:zzpB8wMz967gL8FmK6zvCNB4pDVwFDKjPg1diTVc1h8= -github.com/smallstep/certinfo v1.2.1/go.mod h1:1gQJekdPwPvUwFWGTi7bZELmQT09cxC9wJ0VBkBNiwU= github.com/smallstep/certinfo v1.3.0/go.mod h1:1gQJekdPwPvUwFWGTi7bZELmQT09cxC9wJ0VBkBNiwU= -github.com/smallstep/cli v0.14.3 h1:GghXS0NBoj7psz10Cds86vvcrz6Pmww8aMGKEiD04AI= -github.com/smallstep/cli v0.14.3/go.mod h1:U3WVQBS6udgpyHg+d0FQxodNGXBwikoXbERyfgcAhs8= -github.com/smallstep/cli v0.14.5-0.20200625223147-c7938f88d455 h1:RTKmTtnS+Qhhm7fwDXtBT43JrFXpFxIlxtKCVGFMp0E= -github.com/smallstep/cli v0.14.5-0.20200625223147-c7938f88d455/go.mod h1:15nK9y3F82JyN3VI/7+oy9D0LM4MfUSQ5F0lB6yy5EM= github.com/smallstep/cli v0.14.5/go.mod h1:mRFuqC3cGwQESBGJvog4o76jZZZ7bMjkE+hAnq2QyR8= -github.com/smallstep/cli v0.14.7-0.20200716213216-e7fdc9eac986 h1:VEliHvkW3l5K9es2+Xfj9Mj1OUJEn+TJ4zKSARcDvUQ= -github.com/smallstep/cli v0.14.7-0.20200716213216-e7fdc9eac986/go.mod h1:7aWHk7WwJMpEP4PYyav86FMpaI9vuA0uJRliUAqCwxg= +github.com/smallstep/cli v0.14.7-rc.1.0.20200721180458-731b7c4c8c95 h1:TcCYqEqh6EIEiFabRdtG0IGyFK01kRLTjx6TIKqjxX8= +github.com/smallstep/cli v0.14.7-rc.1.0.20200721180458-731b7c4c8c95/go.mod h1:7aWHk7WwJMpEP4PYyav86FMpaI9vuA0uJRliUAqCwxg= github.com/smallstep/nosql v0.3.0 h1:V1X5vfDsDt89499h3jZFUlR4VnnsYYs5tXaQZ0w8z5U= github.com/smallstep/nosql v0.3.0/go.mod h1:QG7gNOpidifn99MjZaiNbm7HPesIyBd97F/OfacNz8Q= github.com/smallstep/truststore v0.9.3/go.mod h1:PRSkpRIhAYBK/KLWkHNgRdYgzWMEy45bN7PSJCfKKGE=