From 240b7320583abd8bbafed1d5be28baf62f97756a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= <zebob.m@gmail.com>
Date: Thu, 30 Jan 2020 19:49:33 +0100
Subject: [PATCH] Convert BasicKeyRequest to KeyRequest to use cloudflare/cfssl
 1.4.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Robert-André Mauchin <zebob.m@gmail.com>
---
 ca/certificates.go      | 4 ++--
 ca/certificates_test.go | 4 ++--
 ca/testutils/cautils.go | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ca/certificates.go b/ca/certificates.go
index dd0297ab..7bca4def 100644
--- a/ca/certificates.go
+++ b/ca/certificates.go
@@ -772,7 +772,7 @@ func CreateRootCA(rootCN string) (RootCA, error) {
 	// Create a simple CSR for the CA using the default CA validator and policy
 	req := cfcsr.CertificateRequest{
 		CN:         rootCN,
-		KeyRequest: &cfcsr.BasicKeyRequest{A: RootKeyAlgo, S: RootKeySize},
+		KeyRequest: &cfcsr.KeyRequest{A: RootKeyAlgo, S: RootKeySize},
 		CA:         &cfcsr.CAConfig{Expiry: RootCAExpiration},
 	}
 
@@ -922,7 +922,7 @@ func SaveRootCA(rootCA RootCA, paths CertPaths) error {
 // GenerateNewCSR returns a newly generated key and CSR signed with said key
 func GenerateNewCSR() ([]byte, []byte, error) {
 	req := &cfcsr.CertificateRequest{
-		KeyRequest: cfcsr.NewBasicKeyRequest(),
+		KeyRequest: cfcsr.NewKeyRequest(),
 	}
 
 	csr, key, err := cfcsr.ParseRequest(req)
diff --git a/ca/certificates_test.go b/ca/certificates_test.go
index 9feb479b..53dea5ee 100644
--- a/ca/certificates_test.go
+++ b/ca/certificates_test.go
@@ -230,7 +230,7 @@ func TestParseValidateAndSignMaliciousCSR(t *testing.T) {
 		},
 		CN:         "maliciousCN",
 		Hosts:      []string{"docker.com"},
-		KeyRequest: &cfcsr.BasicKeyRequest{A: "ecdsa", S: 256},
+		KeyRequest: &cfcsr.KeyRequest{A: "ecdsa", S: 256},
 	}
 
 	csr, _, err := cfcsr.ParseRequest(req)
@@ -1461,7 +1461,7 @@ func TestRootCACrossSignCACertificate(t *testing.T) {
 
 	rsaReq := cfcsr.CertificateRequest{
 		CN: "rootCNRSA",
-		KeyRequest: &cfcsr.BasicKeyRequest{
+		KeyRequest: &cfcsr.KeyRequest{
 			A: "rsa",
 			S: 2048,
 		},
diff --git a/ca/testutils/cautils.go b/ca/testutils/cautils.go
index 2f0ceaef..ac0a6c5e 100644
--- a/ca/testutils/cautils.go
+++ b/ca/testutils/cautils.go
@@ -345,7 +345,7 @@ func createNode(s *store.MemoryStore, nodeID, role string, csr, cert []byte) err
 
 func genSecurityConfig(s *store.MemoryStore, rootCA ca.RootCA, krw *ca.KeyReadWriter, role, org, tmpDir string, nonSigningRoot bool) (*ca.SecurityConfig, func() error, error) {
 	req := &cfcsr.CertificateRequest{
-		KeyRequest: cfcsr.NewBasicKeyRequest(),
+		KeyRequest: cfcsr.NewKeyRequest(),
 	}
 
 	csr, key, err := cfcsr.ParseRequest(req)
@@ -448,7 +448,7 @@ func CreateRootCertAndKey(rootCN string) ([]byte, []byte, error) {
 	// Create a simple CSR for the CA using the default CA validator and policy
 	req := cfcsr.CertificateRequest{
 		CN:         rootCN,
-		KeyRequest: cfcsr.NewBasicKeyRequest(),
+		KeyRequest: cfcsr.NewKeyRequest(),
 		CA:         &cfcsr.CAConfig{Expiry: ca.RootCAExpiration},
 	}
 
@@ -490,7 +490,7 @@ func ReDateCert(t *testing.T, cert, signerCert, signerKey []byte, notBefore, not
 func CreateCertFromSigner(rootCN string, priv crypto.Signer) ([]byte, error) {
 	req := cfcsr.CertificateRequest{
 		CN:         rootCN,
-		KeyRequest: &cfcsr.BasicKeyRequest{A: ca.RootKeyAlgo, S: ca.RootKeySize},
+		KeyRequest: &cfcsr.KeyRequest{A: ca.RootKeyAlgo, S: ca.RootKeySize},
 		CA:         &cfcsr.CAConfig{Expiry: ca.RootCAExpiration},
 	}
 	cert, _, err := initca.NewFromSigner(&req, priv)
-- 
2.24.1