Attachment 217289 Details for Bug 248709 – svn diff

[patch] svn diff

step-certificates-0.15.0.diff (text/plain), 22.92 KB, created by Markus Wipp on 2020-08-17 18:22:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Markus Wipp

Created: 2020-08-17 18:22:21 UTC

Size: 22.92 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 545149)
>+++ Makefile	(working copy)
>@@ -2,8 +2,8 @@
> 
> PORTNAME=	step-certificates
> DISTVERSIONPREFIX=v
>-DISTVERSION=	0.14.6
>-PORTREVISION=	1
>+DISTVERSION=	0.15.0
>+#PORTREVISION=	1
> CATEGORIES=	security
> 
> MAINTAINER=	mw@wipp.bayern
>@@ -36,8 +36,8 @@
> 		AndreasBriese:bbloom:e2d15f34fcf9:andreasbriese_bbloom/vendor/github.com/AndreasBriese/bbloom \
> 		DataDog:zstd:v1.4.1:datadog_zstd/vendor/github.com/DataDog/zstd \
> 		Masterminds:goutils:v1.1.0:masterminds_goutils/vendor/github.com/Masterminds/goutils \
>-		Masterminds:semver:v3.0.1:masterminds_semver/vendor/github.com/Masterminds/semver/v3 \
>-		Masterminds:sprig:v3.0.0:masterminds_sprig/vendor/github.com/Masterminds/sprig/v3 \
>+		Masterminds:semver:v3.1.0:masterminds_semver/vendor/github.com/Masterminds/semver/v3 \
>+		Masterminds:sprig:v3.1.0:masterminds_sprig/vendor/github.com/Masterminds/sprig/v3 \
> 		aws:aws-sdk-go:v1.30.29:aws_aws_sdk_go/vendor/github.com/aws/aws-sdk-go \
> 		census-instrumentation:opencensus-go:v0.22.2:census_instrumentation_opencensus_go/vendor/go.opencensus.io \
> 		cespare:xxhash:v1.1.0:cespare_xxhash/vendor/github.com/cespare/xxhash \
>@@ -50,10 +50,10 @@
> 		dustin:go-humanize:v1.0.0:dustin_go_humanize/vendor/github.com/dustin/go-humanize \
> 		etcd-io:bbolt:v1.3.2:etcd_io_bbolt/vendor/go.etcd.io/bbolt \
> 		go-chi:chi:v4.0.2:go_chi_chi/vendor/github.com/go-chi/chi \
>-		go-piv:piv-go:a3e5767:go_piv_piv_go/vendor/github.com/go-piv/piv-go \
>+		go-piv:piv-go:cd2ae48:go_piv_piv_go/vendor/github.com/go-piv/piv-go \
> 		go-sql-driver:mysql:v1.5.0:go_sql_driver_mysql/vendor/github.com/go-sql-driver/mysql \
> 		golang:appengine:v1.6.5:golang_appengine/vendor/google.golang.org/appengine \
>-		golang:crypto:0ec3e9974c59:golang_crypto/vendor/golang.org/x/crypto \
>+		golang:crypto:948cd5f35899:golang_crypto/vendor/golang.org/x/crypto \
> 		golang:groupcache:215e87163ea7:golang_groupcache/vendor/github.com/golang/groupcache \
> 		golang:net:16171245cfb2:golang_net/vendor/golang.org/x/net \
> 		golang:oauth2:858c2ad4c8b6:golang_oauth2/vendor/golang.org/x/oauth2 \
>@@ -68,8 +68,8 @@
> 		googleapis:google-api-go-client:v0.15.0:googleapis_google_api_go_client/vendor/google.golang.org/api \
> 		googleapis:google-cloud-go:v0.51.0:googleapis_google_cloud_go/vendor/cloud.google.com/go \
> 		grpc:grpc-go:v1.26.0:grpc_grpc_go/vendor/google.golang.org/grpc \
>-		huandu:xstrings:v1.2.0:huandu_xstrings/vendor/github.com/huandu/xstrings \
>-		imdario:mergo:v0.3.7:imdario_mergo/vendor/github.com/imdario/mergo \
>+		huandu:xstrings:v1.3.1:huandu_xstrings/vendor/github.com/huandu/xstrings \
>+		imdario:mergo:v0.3.8:imdario_mergo/vendor/github.com/imdario/mergo \
> 		jmespath:go-jmespath:v0.3.0:jmespath_go_jmespath/vendor/github.com/jmespath/go-jmespath \
> 		juju:ansiterm:720a0952cc2a:juju_ansiterm/vendor/github.com/juju/ansiterm \
> 		konsorten:go-windows-terminal-sequences:v1.0.2:konsorten_go_windows_terminal_sequences/vendor/github.com/konsorten/go-windows-terminal-sequences \
>@@ -86,13 +86,17 @@
> 		samfoo:ansi:b6bd2ded7189:samfoo_ansi/vendor/github.com/samfoo/ansi \
> 		shurcooL:sanitized_anchor_name:v1.0.0:shurcool_sanitized_anchor_name/vendor/github.com/shurcooL/sanitized_anchor_name \
> 		sirupsen:logrus:v1.4.2:sirupsen_logrus/vendor/github.com/sirupsen/logrus \
>-		smallstep:assert:b99dc1097b15:smallstep_assert/vendor/github.com/smallstep/assert \
>-		smallstep:cli:v0.14.6:smallstep_cli/vendor/github.com/smallstep/cli \
>+		smallstep:assert:82e2b9b3b262:smallstep_assert/vendor/github.com/smallstep/assert \
>+		smallstep:cli:v0.15.0:smallstep_cli/vendor/github.com/smallstep/cli \
> 		smallstep:nosql:v0.3.0:smallstep_nosql/vendor/github.com/smallstep/nosql \
>+		smallstep:crypto:v0.1.1:smallstep_crypto/vendor/github.com/smallstep/crypto \
> 		spf13:cast:v1.3.1:spf13_cast/vendor/github.com/spf13/cast \
> 		square:go-jose:v2.4.0:square_go_jose/vendor/gopkg.in/square/go-jose.v2 \
> 		urfave:cli:v1.22.2:urfave_cli/vendor/github.com/urfave/cli
> 
>+		# Mirrors for the following packages are not currently known, please look them up and handle these tuples manually:
>+		#	::v0.1.1:group_name/vendor/go.step.sm/crypto
>+
> post-install:
> 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/step
> 	${MKDIR} ${STAGEDIR}${DOCSDIR}
>Index: distinfo
>===================================================================
>--- distinfo	(revision 545149)
>+++ distinfo	(working copy)
>@@ -1,6 +1,6 @@
>-TIMESTAMP = 1593765752
>-SHA256 (smallstep-certificates-v0.14.6_GH0.tar.gz) = f06eb1884c1a41ae6ffbd145edfe1b9f483f6e0729adbbed9c33dc6fbaa1019b
>-SIZE (smallstep-certificates-v0.14.6_GH0.tar.gz) = 17573188
>+TIMESTAMP = 1597665234
>+SHA256 (smallstep-certificates-v0.15.0_GH0.tar.gz) = cfee1da53a40413ae937c18064d87e3353c6b53ef37c915632f3679212b2d5e9
>+SIZE (smallstep-certificates-v0.15.0_GH0.tar.gz) = 17584404
> SHA256 (AndreasBriese-bbloom-e2d15f34fcf9_GH0.tar.gz) = e88bd873a2251d70b5d2cbf9dceff24fa25ca5652ac1f99165c303e98df494a1
> SIZE (AndreasBriese-bbloom-e2d15f34fcf9_GH0.tar.gz) = 7704
> SHA256 (DataDog-zstd-v1.4.1_GH0.tar.gz) = 48c0ad82d9bc66d77ca95aa47374bed6b6466510da66a2b2f9215cb239cb8137
>@@ -7,10 +7,10 @@
> SIZE (DataDog-zstd-v1.4.1_GH0.tar.gz) = 498749
> SHA256 (Masterminds-goutils-v1.1.0_GH0.tar.gz) = 053a61c4b0d78e6978600c99562f04d053993c428d549a20b627151cf1aabbae
> SIZE (Masterminds-goutils-v1.1.0_GH0.tar.gz) = 14610
>-SHA256 (Masterminds-semver-v3.0.1_GH0.tar.gz) = 039a09a397f10906343c6d5b65381311e9b574429c2ebdb7ae5b7a75eb6b98c9
>-SIZE (Masterminds-semver-v3.0.1_GH0.tar.gz) = 23977
>-SHA256 (Masterminds-sprig-v3.0.0_GH0.tar.gz) = 6cee82b51e743e3fd9c9dfbb20d1667aeb0a92652db6971fa9c1658b0296633a
>-SIZE (Masterminds-sprig-v3.0.0_GH0.tar.gz) = 47424
>+SHA256 (Masterminds-semver-v3.1.0_GH0.tar.gz) = a91e6fe3121bb0c158bbd89721be3f44cd84e1f76a6d89840e244c1f5524ee28
>+SIZE (Masterminds-semver-v3.1.0_GH0.tar.gz) = 24481
>+SHA256 (Masterminds-sprig-v3.1.0_GH0.tar.gz) = a9e5031c3891ce95e799c5b07de9572eed90acd716e458eb42f1bbcb1b17328a
>+SIZE (Masterminds-sprig-v3.1.0_GH0.tar.gz) = 49979
> SHA256 (aws-aws-sdk-go-v1.30.29_GH0.tar.gz) = 3aa755cbe1137f6bcf29c13eb1cd539b380864ba6cda35565b3224cc448958e5
> SIZE (aws-aws-sdk-go-v1.30.29_GH0.tar.gz) = 14813782
> SHA256 (census-instrumentation-opencensus-go-v0.22.2_GH0.tar.gz) = 0aa930142b669d7c47e2b8343f6adc9f03414a9c45763c5f746de95231d6ad6d
>@@ -35,14 +35,14 @@
> SIZE (etcd-io-bbolt-v1.3.2_GH0.tar.gz) = 93921
> SHA256 (go-chi-chi-v4.0.2_GH0.tar.gz) = 7713a5afd18c440f38e67f853f5ded4f039f08f239dc6a29ed2788be5caaae99
> SIZE (go-chi-chi-v4.0.2_GH0.tar.gz) = 67748
>-SHA256 (go-piv-piv-go-a3e5767_GH0.tar.gz) = a9744ed1332e892656baede675f9a1757f466e15a0e2bab07e6b6999fa2ccc55
>-SIZE (go-piv-piv-go-a3e5767_GH0.tar.gz) = 33795
>+SHA256 (go-piv-piv-go-cd2ae48_GH0.tar.gz) = 43e9855f3918cc8f13bc973b82f124c2cb7ce5b9cf8d83101e229410533be0e1
>+SIZE (go-piv-piv-go-cd2ae48_GH0.tar.gz) = 33762
> SHA256 (go-sql-driver-mysql-v1.5.0_GH0.tar.gz) = 9d98b46623037447a26a51a203540bf605b6e6220d31f2efc7396242fcb660b5
> SIZE (go-sql-driver-mysql-v1.5.0_GH0.tar.gz) = 90474
> SHA256 (golang-appengine-v1.6.5_GH0.tar.gz) = 4e7df5d4ec2dda0f59f26925b36a087843fd1a165adb938712068376bf791316
> SIZE (golang-appengine-v1.6.5_GH0.tar.gz) = 332903
>-SHA256 (golang-crypto-0ec3e9974c59_GH0.tar.gz) = 737fd8da273ec11281d2ff8798d6847ab1be9ebfa94bbc5a7252e0b04e1373a5
>-SIZE (golang-crypto-0ec3e9974c59_GH0.tar.gz) = 1727772
>+SHA256 (golang-crypto-948cd5f35899_GH0.tar.gz) = 4e561431d990f6afd32bb64b7404aa3ab46da67fe239f383866e62b29f762670
>+SIZE (golang-crypto-948cd5f35899_GH0.tar.gz) = 1732509
> SHA256 (golang-groupcache-215e87163ea7_GH0.tar.gz) = 500b097a42fb5c0cd516f1bb56e9c745ba6c1c910b4dc7296aea2b9120ee5e70
> SIZE (golang-groupcache-215e87163ea7_GH0.tar.gz) = 26040
> SHA256 (golang-net-16171245cfb2_GH0.tar.gz) = 941e5a2afb85a131b42f8503fe1a760447a40a0f26539c11ca489f4f24a77e77
>@@ -71,10 +71,10 @@
> SIZE (googleapis-google-cloud-go-v0.51.0_GH0.tar.gz) = 2441854
> SHA256 (grpc-grpc-go-v1.26.0_GH0.tar.gz) = a594cbd8f7d545d181c92b27aafd5d4824459e3a729a8bd67a0c8b99c411f05a
> SIZE (grpc-grpc-go-v1.26.0_GH0.tar.gz) = 765416
>-SHA256 (huandu-xstrings-v1.2.0_GH0.tar.gz) = c43737734bb260e7d77329af8a33bf687f9430abc1b21d3b1f4a8fa6fb3dbde3
>-SIZE (huandu-xstrings-v1.2.0_GH0.tar.gz) = 16628
>-SHA256 (imdario-mergo-v0.3.7_GH0.tar.gz) = ce29171c44a6b4084ed514bc9b4ed6c3c01462c210b7ec6fe5e56691a46eb939
>-SIZE (imdario-mergo-v0.3.7_GH0.tar.gz) = 16668
>+SHA256 (huandu-xstrings-v1.3.1_GH0.tar.gz) = d399f03735391073441145bac6b8d06b36f3b59e005db77ebafde130ddf215bf
>+SIZE (huandu-xstrings-v1.3.1_GH0.tar.gz) = 17797
>+SHA256 (imdario-mergo-v0.3.8_GH0.tar.gz) = 8722e1280a333b1b17541dc05102200e1c9e8ee85f45fc66a4ba629b97a870e6
>+SIZE (imdario-mergo-v0.3.8_GH0.tar.gz) = 18180
> SHA256 (jmespath-go-jmespath-v0.3.0_GH0.tar.gz) = 3ecaa95ad8c9b2805f3de299133f112f198b5829de6ca0e27fa28b9f4801e18a
> SIZE (jmespath-go-jmespath-v0.3.0_GH0.tar.gz) = 49962
> SHA256 (juju-ansiterm-720a0952cc2a_GH0.tar.gz) = 5595c2dc8973aab36a69648d4d94cac75a9ff4a28eb074a7b82b030fc7edbf64
>@@ -107,12 +107,14 @@
> SIZE (shurcooL-sanitized_anchor_name-v1.0.0_GH0.tar.gz) = 2143
> SHA256 (sirupsen-logrus-v1.4.2_GH0.tar.gz) = 67f2ddf467b7e63d2d2529d227946a331e245aeef7e2e4521ae82647b5ef84d9
> SIZE (sirupsen-logrus-v1.4.2_GH0.tar.gz) = 41373
>-SHA256 (smallstep-assert-b99dc1097b15_GH0.tar.gz) = 6aa33efa39730adfc6588c7350bb868ac59f4137aeb42bc5ef97bf469afcdd93
>-SIZE (smallstep-assert-b99dc1097b15_GH0.tar.gz) = 4033
>-SHA256 (smallstep-cli-v0.14.6_GH0.tar.gz) = ee013e267cc38e70dbc3c14b0190c04555710803a64c7a3e1c8dc152375939de
>-SIZE (smallstep-cli-v0.14.6_GH0.tar.gz) = 463213
>+SHA256 (smallstep-assert-82e2b9b3b262_GH0.tar.gz) = 6c19763fe97ee07940c12a5ed7693865146e90ab6862deea4f5e907cac7d4880
>+SIZE (smallstep-assert-82e2b9b3b262_GH0.tar.gz) = 4069
>+SHA256 (smallstep-cli-v0.15.0_GH0.tar.gz) = 2e642bc34c61725c52121926bea97ff4f88c3e52f0790861190018a2f3c9ce26
>+SIZE (smallstep-cli-v0.15.0_GH0.tar.gz) = 476940
> SHA256 (smallstep-nosql-v0.3.0_GH0.tar.gz) = 6020dc16800b55f6fd83be95e0e5c9d0d1ed4aee530a3510e06cd8ce7aa4b470
> SIZE (smallstep-nosql-v0.3.0_GH0.tar.gz) = 21961
>+SHA256 (smallstep-crypto-v0.1.1_GH0.tar.gz) = 18d599662d90feee36c7fc5c55ba75d5631bd7ec1d79446c44b8b24b2368d721
>+SIZE (smallstep-crypto-v0.1.1_GH0.tar.gz) = 45302
> SHA256 (spf13-cast-v1.3.1_GH0.tar.gz) = 4fa8d06903b490ae6f1316e55c5446d5648eea2b450671ebc54d4bbe79bc46b1
> SIZE (spf13-cast-v1.3.1_GH0.tar.gz) = 11102
> SHA256 (square-go-jose-v2.4.0_GH0.tar.gz) = 3824f79c5f851784032a7800d72f32229ce6617612fab28642c18b5150b52493
>Index: files/patch-acme_order.go
>===================================================================
>--- files/patch-acme_order.go	(nonexistent)
>+++ files/patch-acme_order.go	(working copy)
>@@ -0,0 +1,11 @@
>+--- acme/order.go.orig	2020-08-17 11:51:57 UTC
>++++ acme/order.go
>+@@ -11,7 +11,7 @@ import (
>+ 	"github.com/pkg/errors"
>+ 	"github.com/smallstep/certificates/authority/provisioner"
>+ 	"github.com/smallstep/nosql"
>+-	"go.step.sm/crypto/x509util"
>++	"github.com/smallstep/crypto/x509util"
>+ )
>+ 
>+ var defaultOrderExpiry = time.Hour * 24
>
>Property changes on: files/patch-acme_order.go
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-authority_provisioner_aws.go
>===================================================================
>--- files/patch-authority_provisioner_aws.go	(nonexistent)
>+++ files/patch-authority_provisioner_aws.go	(working copy)
>@@ -0,0 +1,11 @@
>+--- authority/provisioner/aws.go.orig	2020-08-17 11:46:30 UTC
>++++ authority/provisioner/aws.go
>+@@ -18,7 +18,7 @@ import (
>+ 	"github.com/pkg/errors"
>+ 	"github.com/smallstep/certificates/errs"
>+ 	"github.com/smallstep/cli/jose"
>+-	"go.step.sm/crypto/x509util"
>++	"github.com/smallstep/crypto/x509util"
>+ )
>+ 
>+ // awsIssuer is the string used as issuer in the generated tokens.
>
>Property changes on: files/patch-authority_provisioner_aws.go
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-authority_provisioner_azure.go
>===================================================================
>--- files/patch-authority_provisioner_azure.go	(nonexistent)
>+++ files/patch-authority_provisioner_azure.go	(working copy)
>@@ -0,0 +1,11 @@
>+--- authority/provisioner/azure.go.orig	2020-08-17 11:46:38 UTC
>++++ authority/provisioner/azure.go
>+@@ -15,7 +15,7 @@ import (
>+ 	"github.com/pkg/errors"
>+ 	"github.com/smallstep/certificates/errs"
>+ 	"github.com/smallstep/cli/jose"
>+-	"go.step.sm/crypto/x509util"
>++	"github.com/smallstep/crypto/x509util"
>+ )
>+ 
>+ // azureOIDCBaseURL is the base discovery url for Microsoft Azure tokens.
>
>Property changes on: files/patch-authority_provisioner_azure.go
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-authority_provisioner_gcp.go
>===================================================================
>--- files/patch-authority_provisioner_gcp.go	(nonexistent)
>+++ files/patch-authority_provisioner_gcp.go	(working copy)
>@@ -0,0 +1,11 @@
>+--- authority/provisioner/gcp.go.orig	2020-08-17 11:46:45 UTC
>++++ authority/provisioner/gcp.go
>+@@ -16,7 +16,7 @@ import (
>+ 	"github.com/pkg/errors"
>+ 	"github.com/smallstep/certificates/errs"
>+ 	"github.com/smallstep/cli/jose"
>+-	"go.step.sm/crypto/x509util"
>++	"github.com/smallstep/crypto/x509util"
>+ )
>+ 
>+ // gcpCertsURL is the url that serves Google OAuth2 public keys.
>
>Property changes on: files/patch-authority_provisioner_gcp.go
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-authority_provisioner_jwk.go
>===================================================================
>--- files/patch-authority_provisioner_jwk.go	(nonexistent)
>+++ files/patch-authority_provisioner_jwk.go	(working copy)
>@@ -0,0 +1,11 @@
>+--- authority/provisioner/jwk.go.orig	2020-08-17 11:46:54 UTC
>++++ authority/provisioner/jwk.go
>+@@ -9,7 +9,7 @@ import (
>+ 	"github.com/pkg/errors"
>+ 	"github.com/smallstep/certificates/errs"
>+ 	"github.com/smallstep/cli/jose"
>+-	"go.step.sm/crypto/x509util"
>++	"github.com/smallstep/crypto/x509util"
>+ )
>+ 
>+ // jwtPayload extends jwt.Claims with step attributes.
>
>Property changes on: files/patch-authority_provisioner_jwk.go
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-authority_provisioner_k8sSA.go
>===================================================================
>--- files/patch-authority_provisioner_k8sSA.go	(nonexistent)
>+++ files/patch-authority_provisioner_k8sSA.go	(working copy)
>@@ -0,0 +1,11 @@
>+--- authority/provisioner/k8sSA.go.orig	2020-08-17 11:47:00 UTC
>++++ authority/provisioner/k8sSA.go
>+@@ -13,7 +13,7 @@ import (
>+ 	"github.com/smallstep/certificates/errs"
>+ 	"github.com/smallstep/cli/crypto/pemutil"
>+ 	"github.com/smallstep/cli/jose"
>+-	"go.step.sm/crypto/x509util"
>++	"github.com/smallstep/crypto/x509util"
>+ )
>+ 
>+ // NOTE: There can be at most one kubernetes service account provisioner configured
>
>Property changes on: files/patch-authority_provisioner_k8sSA.go
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-authority_provisioner_oidc.go
>===================================================================
>--- files/patch-authority_provisioner_oidc.go	(nonexistent)
>+++ files/patch-authority_provisioner_oidc.go	(working copy)
>@@ -0,0 +1,11 @@
>+--- authority/provisioner/oidc.go.orig	2020-08-17 11:47:08 UTC
>++++ authority/provisioner/oidc.go
>+@@ -14,7 +14,7 @@ import (
>+ 	"github.com/pkg/errors"
>+ 	"github.com/smallstep/certificates/errs"
>+ 	"github.com/smallstep/cli/jose"
>+-	"go.step.sm/crypto/x509util"
>++	"github.com/smallstep/crypto/x509util"
>+ )
>+ 
>+ // openIDConfiguration contains the necessary properties in the
>
>Property changes on: files/patch-authority_provisioner_oidc.go
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-authority_provisioner_options.go
>===================================================================
>--- files/patch-authority_provisioner_options.go	(nonexistent)
>+++ files/patch-authority_provisioner_options.go	(working copy)
>@@ -0,0 +1,11 @@
>+--- authority/provisioner/options.go.orig	2020-08-17 11:47:26 UTC
>++++ authority/provisioner/options.go
>+@@ -6,7 +6,7 @@ import (
>+ 
>+ 	"github.com/pkg/errors"
>+ 	"github.com/smallstep/cli/jose"
>+-	"go.step.sm/crypto/x509util"
>++	"github.com/smallstep/crypto/x509util"
>+ )
>+ 
>+ // CertificateOptions is an interface that returns a list of options passed when
>
>Property changes on: files/patch-authority_provisioner_options.go
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-authority_provisioner_options__test.go
>===================================================================
>--- files/patch-authority_provisioner_options__test.go	(nonexistent)
>+++ files/patch-authority_provisioner_options__test.go	(working copy)
>@@ -0,0 +1,11 @@
>+--- authority/provisioner/options_test.go.orig	2020-08-17 11:47:15 UTC
>++++ authority/provisioner/options_test.go
>+@@ -8,7 +8,7 @@ import (
>+ 	"testing"
>+ 
>+ 	"github.com/smallstep/cli/crypto/pemutil"
>+-	"go.step.sm/crypto/x509util"
>++	"github.com/smallstep/crypto/x509util"
>+ )
>+ 
>+ func parseCertificateRequest(t *testing.T, filename string) *x509.CertificateRequest {
>
>Property changes on: files/patch-authority_provisioner_options__test.go
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-authority_provisioner_sign__options.go
>===================================================================
>--- files/patch-authority_provisioner_sign__options.go	(nonexistent)
>+++ files/patch-authority_provisioner_sign__options.go	(working copy)
>@@ -0,0 +1,11 @@
>+--- authority/provisioner/sign_options.go.orig	2020-08-17 11:47:32 UTC
>++++ authority/provisioner/sign_options.go
>+@@ -14,7 +14,7 @@ import (
>+ 	"time"
>+ 
>+ 	"github.com/pkg/errors"
>+-	"go.step.sm/crypto/x509util"
>++	"github.com/smallstep/crypto/x509util"
>+ )
>+ 
>+ // DefaultCertValidity is the default validity for a certificate if none is specified.
>
>Property changes on: files/patch-authority_provisioner_sign__options.go
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-authority_provisioner_x5c.go
>===================================================================
>--- files/patch-authority_provisioner_x5c.go	(nonexistent)
>+++ files/patch-authority_provisioner_x5c.go	(working copy)
>@@ -0,0 +1,11 @@
>+--- authority/provisioner/x5c.go.orig	2020-08-17 11:47:39 UTC
>++++ authority/provisioner/x5c.go
>+@@ -10,7 +10,7 @@ import (
>+ 	"github.com/pkg/errors"
>+ 	"github.com/smallstep/certificates/errs"
>+ 	"github.com/smallstep/cli/jose"
>+-	"go.step.sm/crypto/x509util"
>++	"github.com/smallstep/crypto/x509util"
>+ )
>+ 
>+ // x5cPayload extends jwt.Claims with step attributes.
>
>Property changes on: files/patch-authority_provisioner_x5c.go
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-authority_tls.go
>===================================================================
>--- files/patch-authority_tls.go	(nonexistent)
>+++ files/patch-authority_tls.go	(working copy)
>@@ -0,0 +1,11 @@
>+--- authority/tls.go.orig	2020-08-17 11:51:12 UTC
>++++ authority/tls.go
>+@@ -20,7 +20,7 @@ import (
>+ 	"github.com/smallstep/cli/crypto/tlsutil"
>+ 	x509legacy "github.com/smallstep/cli/crypto/x509util"
>+ 	"github.com/smallstep/cli/jose"
>+-	"go.step.sm/crypto/x509util"
>++	"github.com/smallstep/crypto/x509util"
>+ )
>+ 
>+ // GetTLSOptions returns the tls options configured.
>
>Property changes on: files/patch-authority_tls.go
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-vendor_github.com_smallstep_crypto_x509util_options.go
>===================================================================
>--- files/patch-vendor_github.com_smallstep_crypto_x509util_options.go	(nonexistent)
>+++ files/patch-vendor_github.com_smallstep_crypto_x509util_options.go	(working copy)
>@@ -0,0 +1,11 @@
>+--- vendor/github.com/smallstep/crypto/x509util/options.go.orig	2020-08-17 11:50:14 UTC
>++++ vendor/github.com/smallstep/crypto/x509util/options.go
>+@@ -9,7 +9,7 @@ import (
>+ 
>+ 	"github.com/Masterminds/sprig/v3"
>+ 	"github.com/pkg/errors"
>+-	"go.step.sm/crypto/internal/step"
>++	"github.com/smallstep/crypto/internal/step"
>+ )
>+ 
>+ // getFuncMap returns the list of functions provided by sprig. It changes the
>
>Property changes on: files/patch-vendor_github.com_smallstep_crypto_x509util_options.go
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Flags:

mw: maintainer-approval+

Actions: View | Diff

Attachments on bug 248709: 217289