Merge pull request #13498 from liggitt/public-key-header

OpenShift Bot · web-flow · commit 743dfa7e9fd4 · 2017-03-28T13:55:00.000-05:00
Merged by openshift-bot
diff --git a/pkg/cmd/server/admin/create_keypair.go b/pkg/cmd/server/admin/create_keypair.go
@@ -131,7 +131,7 @@ func writePublicKeyFile(path string, key *rsa.PublicKey) error {
 	}
 
 	b := bytes.Buffer{}
-	if err := pem.Encode(&b, &pem.Block{Type: "RSA PUBLIC KEY", Bytes: derBytes}); err != nil {
+	if err := pem.Encode(&b, &pem.Block{Type: "PUBLIC KEY", Bytes: derBytes}); err != nil {
 		return err
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ func writePublicKeyFile(path string, key *rsa.PublicKey) error {`
`131`	`131`	`}`
`132`	`132`
`133`	`133`	`b := bytes.Buffer{}`
`134`		`- if err := pem.Encode(&b, &pem.Block{Type: "RSA PUBLIC KEY", Bytes: derBytes}); err != nil {`
	`134`	`+ if err := pem.Encode(&b, &pem.Block{Type: "PUBLIC KEY", Bytes: derBytes}); err != nil {`
`135`	`135`	`return err`
`136`	`136`	`}`
`137`	`137`