445e522432
- This PR adds two fields to CertificateSpec:
- `keyAlgorithm`, denotes which algorithm to use when generating
a private key. Can be either `rsa` or `ecdsa`. When not set, the
default algorithm used `rsa`.
- `keySize`, denotes the key size of the private key being generated.
For `rsa`, minimum key size is 2048 and maximum is 8192.
For `ecdsa`, sizes 224, 256, 384 & 521 are supported.
See https://golang.org/pkg/crypto/elliptic
- `keySize` can be set without being explicit about `keyAlgorithm`.
- If `keySize` is specified and `keyAlgorithm` is not provided, `rsa` will
be used as the key algorithm.
- `keyAlgorithm` can be set without being explicit about `keySize`.
- If `keyAlgorithm` is specified and `keySize` is not provided, key size
key size of `256` will be used for `ecdsa` key algorithm and
key size of `2048` will be used for `rsa` key algorithm.
- helper functions in `pki` package now return crypto.PrivateKey
80 lines
2.1 KiB
Go
80 lines
2.1 KiB
Go
package pki
|
|
|
|
import (
|
|
"crypto"
|
|
"crypto/rsa"
|
|
"crypto/x509"
|
|
"encoding/pem"
|
|
|
|
"github.com/jetstack/cert-manager/pkg/util/errors"
|
|
)
|
|
|
|
func DecodePrivateKeyBytes(keyBytes []byte) (crypto.PrivateKey, error) {
|
|
// decode the private key pem
|
|
block, _ := pem.Decode(keyBytes)
|
|
if block == nil {
|
|
return nil, errors.NewInvalidData("error decoding private key PEM block")
|
|
}
|
|
|
|
switch block.Type {
|
|
case "EC PRIVATE KEY":
|
|
key, err := x509.ParseECPrivateKey(block.Bytes)
|
|
if err != nil {
|
|
return nil, errors.NewInvalidData("error parsing ecdsa private key: %s", err.Error())
|
|
}
|
|
|
|
return key, nil
|
|
case "RSA PRIVATE KEY":
|
|
key, err := x509.ParsePKCS1PrivateKey(block.Bytes)
|
|
if err != nil {
|
|
return nil, errors.NewInvalidData("error parsing rsa private key: %s", err.Error())
|
|
}
|
|
|
|
err = key.Validate()
|
|
if err != nil {
|
|
return nil, errors.NewInvalidData("rsa private key failed validation: %s", err.Error())
|
|
}
|
|
|
|
return key, nil
|
|
default:
|
|
return nil, errors.NewInvalidData("unknown private key type: %s", block.Type)
|
|
}
|
|
}
|
|
|
|
func DecodePKCS1PrivateKeyBytes(keyBytes []byte) (*rsa.PrivateKey, error) {
|
|
// decode the private key pem
|
|
block, _ := pem.Decode(keyBytes)
|
|
if block == nil {
|
|
return nil, errors.NewInvalidData("error decoding private key PEM block")
|
|
}
|
|
// parse the private key
|
|
key, err := x509.ParsePKCS1PrivateKey(block.Bytes)
|
|
if err != nil {
|
|
return nil, errors.NewInvalidData("error parsing private key: %s", err.Error())
|
|
}
|
|
// validate the private key
|
|
if err = key.Validate(); err != nil {
|
|
return nil, errors.NewInvalidData("private key failed validation: %s", err.Error())
|
|
}
|
|
return key, nil
|
|
}
|
|
|
|
func DecodeX509CertificateBytes(certBytes []byte) (*x509.Certificate, error) {
|
|
// decode the tls certificate pem
|
|
block, _ := pem.Decode(certBytes)
|
|
if block == nil {
|
|
return nil, errors.NewInvalidData("error decoding cert PEM block")
|
|
}
|
|
// parse the tls certificate
|
|
cert, err := x509.ParseCertificate(block.Bytes)
|
|
if err != nil {
|
|
return nil, errors.NewInvalidData("error parsing TLS certificate: %s", err.Error())
|
|
}
|
|
|
|
return cert, nil
|
|
}
|
|
|
|
func DecodeDERCertificateBytes(derBytes []byte) (*x509.Certificate, error) {
|
|
return x509.ParseCertificate(derBytes)
|
|
}
|