Move Vault's customized pkcs7 fork into a shared location (#24658)

- The PKI plugin needs to use the customized pkcs7 fork so move it out from the aws credential plugin's package into a shared location
hashicorp · Jan 3, 2024 · 610c8a4 · 610c8a4
1 parent 7325490
commit 610c8a4
Show file tree

Hide file tree

Showing 15 changed files with 4 additions and 4 deletions.
diff --git a/.copywrite.hcl b/.copywrite.hcl
@@ -8,7 +8,7 @@ project {
   # Supports doublestar glob patterns for more flexibility in defining which
   # files or folders should be ignored
   header_ignore = [
-    "builtin/credential/aws/pkcs7/**",
+    "helper/pkcs7/**",
     "ui/node_modules/**",
     "enos/modules/k8s_deploy_vault/raft-config.hcl",
     "plugins/database/postgresql/scram/**",

diff --git a/builtin/credential/aws/path_login.go b/builtin/credential/aws/path_login.go
@@ -26,14 +26,14 @@ import (
 	"github.com/aws/aws-sdk-go/service/iam"
 	"github.com/aws/aws-sdk-go/service/sts"
 	"github.com/hashicorp/errwrap"
-	cleanhttp "github.com/hashicorp/go-cleanhttp"
+	"github.com/hashicorp/go-cleanhttp"
 	"github.com/hashicorp/go-retryablehttp"
 	"github.com/hashicorp/go-secure-stdlib/awsutil"
 	"github.com/hashicorp/go-secure-stdlib/parseutil"
 	"github.com/hashicorp/go-secure-stdlib/strutil"
-	uuid "github.com/hashicorp/go-uuid"
+	"github.com/hashicorp/go-uuid"
 
-	"github.com/hashicorp/vault/builtin/credential/aws/pkcs7"
+	"github.com/hashicorp/vault/helper/pkcs7"
 	"github.com/hashicorp/vault/sdk/framework"
 	"github.com/hashicorp/vault/sdk/helper/cidrutil"
 	"github.com/hashicorp/vault/sdk/helper/jsonutil"

diff --git a/builtin/credential/aws/pkcs7/LICENSE → helper/pkcs7/LICENSE b/builtin/credential/aws/pkcs7/LICENSE → helper/pkcs7/LICENSE
diff --git a/builtin/credential/aws/pkcs7/README.md → helper/pkcs7/README.md b/builtin/credential/aws/pkcs7/README.md → helper/pkcs7/README.md
diff --git a/builtin/credential/aws/pkcs7/ber.go → helper/pkcs7/ber.go b/builtin/credential/aws/pkcs7/ber.go → helper/pkcs7/ber.go
diff --git a/builtin/credential/aws/pkcs7/ber_test.go → helper/pkcs7/ber_test.go b/builtin/credential/aws/pkcs7/ber_test.go → helper/pkcs7/ber_test.go
diff --git a/builtin/credential/aws/pkcs7/decrypt.go → helper/pkcs7/decrypt.go b/builtin/credential/aws/pkcs7/decrypt.go → helper/pkcs7/decrypt.go
diff --git a/builtin/credential/aws/pkcs7/decrypt_test.go → helper/pkcs7/decrypt_test.go b/builtin/credential/aws/pkcs7/decrypt_test.go → helper/pkcs7/decrypt_test.go
diff --git a/builtin/credential/aws/pkcs7/encrypt.go → helper/pkcs7/encrypt.go b/builtin/credential/aws/pkcs7/encrypt.go → helper/pkcs7/encrypt.go
diff --git a/builtin/credential/aws/pkcs7/encrypt_test.go → helper/pkcs7/encrypt_test.go b/builtin/credential/aws/pkcs7/encrypt_test.go → helper/pkcs7/encrypt_test.go
diff --git a/builtin/credential/aws/pkcs7/pkcs7.go → helper/pkcs7/pkcs7.go b/builtin/credential/aws/pkcs7/pkcs7.go → helper/pkcs7/pkcs7.go
diff --git a/builtin/credential/aws/pkcs7/pkcs7_test.go → helper/pkcs7/pkcs7_test.go b/builtin/credential/aws/pkcs7/pkcs7_test.go → helper/pkcs7/pkcs7_test.go
diff --git a/builtin/credential/aws/pkcs7/sign.go → helper/pkcs7/sign.go b/builtin/credential/aws/pkcs7/sign.go → helper/pkcs7/sign.go
diff --git a/builtin/credential/aws/pkcs7/sign_test.go → helper/pkcs7/sign_test.go b/builtin/credential/aws/pkcs7/sign_test.go → helper/pkcs7/sign_test.go
diff --git a/builtin/credential/aws/pkcs7/verify.go → helper/pkcs7/verify.go b/builtin/credential/aws/pkcs7/verify.go → helper/pkcs7/verify.go