Support exporting RSA keys

hashicorp · Oct 26, 2017 · 4acd786 · 4acd786
1 parent 9ea5196
commit 4acd786
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/builtin/logical/transit/backend_test.go b/builtin/logical/transit/backend_test.go
@@ -39,10 +39,7 @@ func createBackendWithStorage(t *testing.T) (*backend, logical.Storage) {
 }
 
 func TestTransit_RSA(t *testing.T) {
-	fmt.Printf("now running rsa-2048\n")
 	testTransit_RSA(t, "rsa-2048")
-
-	fmt.Printf("now running rsa-4096\n")
 	testTransit_RSA(t, "rsa-4096")
 }
 

diff --git a/builtin/logical/transit/path_export.go b/builtin/logical/transit/path_export.go
@@ -152,6 +152,16 @@ func getExportKey(policy *keysutil.Policy, key *keysutil.KeyEntry, exportType st
 		switch policy.Type {
 		case keysutil.KeyType_AES256_GCM96:
 			return strings.TrimSpace(base64.StdEncoding.EncodeToString(key.Key)), nil
+
+		case keysutil.KeyType_RSA2048, keysutil.KeyType_RSA4096:
+			derBytes := x509.MarshalPKCS1PrivateKey(key.RSAKey)
+			pemBlock := &pem.Block{
+				Type:  "RSA PRIVATE KEY",
+				Bytes: derBytes,
+			}
+			pemBytes := pem.EncodeToMemory(pemBlock)
+			return string(pemBytes), nil
+
 		}
 
 	case exportTypeSigningKey:

diff --git a/builtin/logical/transit/path_keys.go b/builtin/logical/transit/path_keys.go
@@ -274,7 +274,7 @@ func (b *backend) pathPolicyRead(
 					return nil, fmt.Errorf("error marshaling RSA public key: %v", err)
 				}
 				pemBlock := &pem.Block{
-					Type:  "PUBLIC KEY",
+					Type:  "RSA PUBLIC KEY",
 					Bytes: derBytes,
 				}
 				pemBytes := pem.EncodeToMemory(pemBlock)