Fix redacted types in SCEP provisioner

This commit uses the same types for the fields in the provisioner.SCEP type and the "redacted" models.SCEP.
smallstep · Sep 25, 2023 · 4d5fbfa · 4d5fbfa
1 parent f505acb
commit 4d5fbfa
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/api/api.go b/api/api.go
@@ -245,10 +245,10 @@ func scepFromProvisioner(p *provisioner.SCEP) *models.SCEP {
 		IncludeRoot:                   p.IncludeRoot,
 		ExcludeIntermediate:           p.ExcludeIntermediate,
 		MinimumPublicKeyLength:        p.MinimumPublicKeyLength,
-		DecrypterCertificate:          redacted,
-		DecrypterKeyPEM:               redacted,
+		DecrypterCertificate:          []byte(redacted),
+		DecrypterKeyPEM:               []byte(redacted),
 		DecrypterKeyURI:               redacted,
-		DecrypterKeyPassword:          redacted,
+		DecrypterKeyPassword:          []byte(redacted),
 		EncryptionAlgorithmIdentifier: p.EncryptionAlgorithmIdentifier,
 		Options:                       p.Options,
 		Claims:                        p.Claims,

diff --git a/api/models/scep.go b/api/models/scep.go
@@ -25,10 +25,10 @@ type SCEP struct {
 	IncludeRoot                   bool                 `json:"includeRoot"`
 	ExcludeIntermediate           bool                 `json:"excludeIntermediate"`
 	MinimumPublicKeyLength        int                  `json:"minimumPublicKeyLength"`
-	DecrypterCertificate          string               `json:"decrypterCertificate"`
-	DecrypterKeyPEM               string               `json:"decrypterKeyPEM"`
+	DecrypterCertificate          []byte               `json:"decrypterCertificate"`
+	DecrypterKeyPEM               []byte               `json:"decrypterKeyPEM"`
 	DecrypterKeyURI               string               `json:"decrypterKey"`
-	DecrypterKeyPassword          string               `json:"decrypterKeyPassword"`
+	DecrypterKeyPassword          []byte               `json:"decrypterKeyPassword"`
 	EncryptionAlgorithmIdentifier int                  `json:"encryptionAlgorithmIdentifier"`
 	Options                       *provisioner.Options `json:"options,omitempty"`
 	Claims                        *provisioner.Claims  `json:"claims,omitempty"`