github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kubeadm: allow RSA and ECDSA format keys in preflight check

Browse Source
This commit is contained in:
SataQiu
2022-09-16 18:50:45 +08:00
parent 0f582f7c3f
commit de4aeecd48
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
cmd/kubeadm/app/util/pkiutil/pki_helpers.go
View File

@@ -348,7 +348,7 @@ func TryLoadCSRAndKeyFromDisk(pkiPath, name string) (*x509.CertificateRequest, c
} }
// TryLoadPrivatePublicKeyFromDisk tries to load the key from the disk and validates that it is valid // TryLoadPrivatePublicKeyFromDisk tries to load the key from the disk and validates that it is valid
func TryLoadPrivatePublicKeyFromDisk(pkiPath, name string) (*rsa.PrivateKey, *rsa.PublicKey, error) { func TryLoadPrivatePublicKeyFromDisk(pkiPath, name string) (crypto.PrivateKey, crypto.PublicKey, error) {
privateKeyPath := pathForKey(pkiPath, name) privateKeyPath := pathForKey(pkiPath, name)
// Parse the private key from a file // Parse the private key from a file
@@ -365,15 +365,15 @@ func TryLoadPrivatePublicKeyFromDisk(pkiPath, name string) (*rsa.PrivateKey, *rs
return nil, nil, errors.Wrapf(err, "couldn't load the public key file %s", publicKeyPath) return nil, nil, errors.Wrapf(err, "couldn't load the public key file %s", publicKeyPath)
} }
// Allow RSA format only // Allow RSA and ECDSA formats only
k, ok := privKey.(*rsa.PrivateKey) switch k := privKey.(type) {
if !ok { case *rsa.PrivateKey:
return nil, nil, errors.Errorf("the private key file %s isn't in RSA format", privateKeyPath) return k, pubKeys[0].(*rsa.PublicKey), nil
case *ecdsa.PrivateKey:
return k, pubKeys[0].(*ecdsa.PublicKey), nil
default:
return nil, nil, errors.Errorf("the private key file %s is neither in RSA nor ECDSA format", privateKeyPath)
} }
p := pubKeys[0].(*rsa.PublicKey)
return k, p, nil
} }
// TryLoadCSRFromDisk tries to load the CSR from the disk // TryLoadCSRFromDisk tries to load the CSR from the disk