luxolus
/
open-vault
2
0
Fork 0
Code Issues 1 Pull Requests Releases Activity

PKI: Fix managed key signatures when using specified signature_bits (#17328) 

* PKI: Fix managed key signatures when using specified signature_bits

 - When calling sign-intermediate and other apis with signature_bits
   value overridden with a backing managed key we did not use that
   value as tests for the private key type were not working.

* Add cl
This commit is contained in:
Steven Clark 2022-09-28 09:08:23 -04:00 committed by GitHub
parent 542570c289
commit 1f459a2df6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changelog/17328.txt Normal file
View File

@ -0,0 +1,3 @@
```release-note:bug
secrets/pki: Do not ignore provided signature bits value when signing intermediate and leaf certificates with a managed key
```

7
sdk/helper/certutil/helpers.go
View File

@ -1127,7 +1127,12 @@ func signCertificate(data *CreationBundle, randReader io.Reader) (*ParsedCertBun
certTemplate.NotBefore = time.Now().Add(-1 * data.Params.NotBeforeDuration) certTemplate.NotBefore = time.Now().Add(-1 * data.Params.NotBeforeDuration)
} }
switch data.SigningBundle.PrivateKeyType { privateKeyType := data.SigningBundle.PrivateKeyType
if privateKeyType == ManagedPrivateKey {
privateKeyType = GetPrivateKeyTypeFromSigner(data.SigningBundle.PrivateKey)
}
switch privateKeyType {
case RSAPrivateKey: case RSAPrivateKey:
certTemplateSetSigAlgo(certTemplate, data) certTemplateSetSigAlgo(certTemplate, data)
case ECPrivateKey: case ECPrivateKey:

12
sdk/helper/certutil/types.go
View File

@ -148,16 +148,16 @@ type KeyBundle struct {
} }
func GetPrivateKeyTypeFromSigner(signer crypto.Signer) PrivateKeyType { func GetPrivateKeyTypeFromSigner(signer crypto.Signer) PrivateKeyType {
switch signer.(type) { // We look at the public key types to work-around limitations/typing of managed keys.
case *rsa.PrivateKey: switch signer.Public().(type) {
case *rsa.PublicKey:
return RSAPrivateKey return RSAPrivateKey
case *ecdsa.PrivateKey: case *ecdsa.PublicKey:
return ECPrivateKey return ECPrivateKey
case ed25519.PrivateKey: case ed25519.PublicKey:
return Ed25519PrivateKey return Ed25519PrivateKey
default:
return UnknownPrivateKey
} }
return UnknownPrivateKey
} }
// ToPEMBundle converts a string-based certificate bundle // ToPEMBundle converts a string-based certificate bundle