From 5687b0d5dc62f8ffdebf3faf34eca4617f3d139f Mon Sep 17 00:00:00 2001
From: John Gardiner Myers <jgmyers@proofpoint.com>
Date: Mon, 21 Jun 2021 23:11:47 -0700
Subject: [PATCH] Weaken some interfaces

---
 pkg/model/awsmodel/oidc_provider.go              | 2 +-
 pkg/pki/certificate_test.go                      | 3 +--
 pkg/pki/csr.go                                   | 6 +-----
 pkg/pki/privatekey.go                            | 6 +++---
 upup/pkg/fi/nodeup/nodetasks/bootstrap_client.go | 3 +--
 5 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/pkg/model/awsmodel/oidc_provider.go b/pkg/model/awsmodel/oidc_provider.go
index fba361649a..063c71c829 100644
--- a/pkg/model/awsmodel/oidc_provider.go
+++ b/pkg/model/awsmodel/oidc_provider.go
@@ -25,7 +25,7 @@ import (
 // OIDCProviderBuilder configures IAM OIDC Provider
 type OIDCProviderBuilder struct {
 	*AWSModelContext
-	KeyStore  fi.CAStore
+	KeyStore  fi.Keystore
 	Lifecycle fi.Lifecycle
 }
 
diff --git a/pkg/pki/certificate_test.go b/pkg/pki/certificate_test.go
index 2b2988e104..80db63174d 100644
--- a/pkg/pki/certificate_test.go
+++ b/pkg/pki/certificate_test.go
@@ -18,7 +18,6 @@ package pki
 
 import (
 	"bytes"
-	"crypto/rsa"
 	"crypto/x509"
 	"crypto/x509/pkix"
 	"encoding/pem"
@@ -42,7 +41,7 @@ func TestGenerateCertificate(t *testing.T) {
 
 	{
 		var b bytes.Buffer
-		pkData, err := x509.MarshalPKIXPublicKey(key.Key.(*rsa.PrivateKey).Public())
+		pkData, err := x509.MarshalPKIXPublicKey(key.Key.Public())
 		require.NoError(t, err, "MarshalPKIXPublicKey")
 
 		err = pem.Encode(&b, &pem.Block{Type: "RSA PUBLIC KEY", Bytes: pkData})
diff --git a/pkg/pki/csr.go b/pkg/pki/csr.go
index 6de5478a07..ccc3f6ea0e 100644
--- a/pkg/pki/csr.go
+++ b/pkg/pki/csr.go
@@ -18,7 +18,6 @@ package pki
 
 import (
 	crypto_rand "crypto/rand"
-	"crypto/rsa"
 	"crypto/x509"
 	"fmt"
 	"math/big"
@@ -47,10 +46,7 @@ func BuildPKISerial(timestamp int64) *big.Int {
 
 func signNewCertificate(privateKey *PrivateKey, template *x509.Certificate, signer *x509.Certificate, signerPrivateKey *PrivateKey) (*Certificate, error) {
 	if template.PublicKey == nil {
-		rsaPrivateKey, ok := privateKey.Key.(*rsa.PrivateKey)
-		if ok {
-			template.PublicKey = rsaPrivateKey.Public()
-		}
+		template.PublicKey = privateKey.Key.Public()
 	}
 
 	if template.PublicKey == nil {
diff --git a/pkg/pki/privatekey.go b/pkg/pki/privatekey.go
index b75f7b4fd5..637c921457 100644
--- a/pkg/pki/privatekey.go
+++ b/pkg/pki/privatekey.go
@@ -72,7 +72,7 @@ func GeneratePrivateKey() (*PrivateKey, error) {
 }
 
 type PrivateKey struct {
-	Key crypto.PrivateKey
+	Key crypto.Signer
 }
 
 func (k *PrivateKey) AsString() (string, error) {
@@ -177,7 +177,7 @@ func (k *PrivateKey) WriteToFile(filename string, perm os.FileMode) error {
 	return err
 }
 
-func parsePEMPrivateKey(pemData []byte) (crypto.PrivateKey, error) {
+func parsePEMPrivateKey(pemData []byte) (crypto.Signer, error) {
 	for {
 		block, rest := pem.Decode(pemData)
 		if block == nil {
@@ -193,7 +193,7 @@ func parsePEMPrivateKey(pemData []byte) (crypto.PrivateKey, error) {
 			if err != nil {
 				return nil, err
 			}
-			return k.(crypto.PrivateKey), nil
+			return k.(crypto.Signer), nil
 		} else {
 			klog.Infof("Ignoring unexpected PEM block: %q", block.Type)
 		}
diff --git a/upup/pkg/fi/nodeup/nodetasks/bootstrap_client.go b/upup/pkg/fi/nodeup/nodetasks/bootstrap_client.go
index e795f67269..cfaacfea7e 100644
--- a/upup/pkg/fi/nodeup/nodetasks/bootstrap_client.go
+++ b/upup/pkg/fi/nodeup/nodetasks/bootstrap_client.go
@@ -20,7 +20,6 @@ import (
 	"bufio"
 	"bytes"
 	"context"
-	"crypto/rsa"
 	"crypto/tls"
 	"crypto/x509"
 	"encoding/json"
@@ -103,7 +102,7 @@ func (b *BootstrapClientTask) Run(c *fi.Context) error {
 			b.keys[name] = key
 		}
 
-		pkData, err := x509.MarshalPKIXPublicKey(key.Key.(*rsa.PrivateKey).Public())
+		pkData, err := x509.MarshalPKIXPublicKey(key.Key.Public())
 		if err != nil {
 			return fmt.Errorf("marshalling public key: %v", err)
 		}