Skip to content

Commit cfa680e

Browse files
marainodopey
authored andcommitted
Remove the use of custom x509 package.
Upgrade cli dependency.
1 parent 26f3ef0 commit cfa680e

File tree

3 files changed

+469
-8
lines changed

3 files changed

+469
-8
lines changed

authority/provisioner/sign_options_test.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import (
1313
"github.com/smallstep/assert"
1414
"github.com/smallstep/cli/crypto/pemutil"
1515
"github.com/smallstep/cli/crypto/x509util"
16-
stepx509 "github.com/smallstep/cli/pkg/x509"
1716
)
1817

1918
func Test_emailOnlyIdentity_Valid(t *testing.T) {
@@ -64,9 +63,9 @@ func Test_defaultPublicKeyValidator_Valid(t *testing.T) {
6463
ecdsaCSR, ok := _ecdsa.(*x509.CertificateRequest)
6564
assert.Fatal(t, ok)
6665

67-
_ed25519, err := pemutil.Read("./testdata/ed25519.csr", pemutil.WithStepCrypto())
66+
_ed25519, err := pemutil.Read("./testdata/ed25519.csr")
6867
assert.FatalError(t, err)
69-
ed25519CSR, ok := _ed25519.(*stepx509.CertificateRequest)
68+
ed25519CSR, ok := _ed25519.(*x509.CertificateRequest)
7069
assert.Fatal(t, ok)
7170

7271
v := defaultPublicKeyValidator{}
@@ -97,7 +96,7 @@ func Test_defaultPublicKeyValidator_Valid(t *testing.T) {
9796
},
9897
{
9998
"ok/ed25519",
100-
x509util.ToX509CertificateRequest(ed25519CSR),
99+
ed25519CSR,
101100
nil,
102101
},
103102
}

go.mod

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ require (
1010
github.com/rs/xid v1.2.1
1111
github.com/sirupsen/logrus v1.4.2
1212
github.com/smallstep/assert v0.0.0-20200103212524-b99dc1097b15
13-
github.com/smallstep/cli v0.14.0-rc.1.0.20191218000521-3e7348324838
13+
github.com/smallstep/cli v0.14.0-rc.1.0.20200110185014-8a0d0cd3202e
1414
github.com/smallstep/nosql v0.2.0
15-
github.com/urfave/cli v1.20.1-0.20181029213200-b67dcf995b6a
16-
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550
17-
golang.org/x/net v0.0.0-20190620200207-3b0461eec859
15+
github.com/urfave/cli v1.22.2
16+
golang.org/x/crypto v0.0.0-20191227163750-53104e6ec876
17+
golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553
1818
gopkg.in/square/go-jose.v2 v2.4.0
1919
)
2020

0 commit comments

Comments
 (0)