From 06cea1f784ce6c029faece94ebd1ff85e5aad669 Mon Sep 17 00:00:00 2001
From: Viktor Popov <viktor.popov@vereign.com>
Date: Fri, 10 Aug 2018 20:32:45 +0300
Subject: [PATCH] Store certificate in PEM, fixed keys PEM type
---
handler/generate_certificate.go | 9 ++++++++-
handler/generate_keypair.go | 4 ++--
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/handler/generate_certificate.go b/handler/generate_certificate.go
index c14ac82..ceb1477 100644
--- a/handler/generate_certificate.go
+++ b/handler/generate_certificate.go
@@ -116,7 +116,14 @@ func generateCertificate(publicKeyBytes []byte, caCertFilePath string, caPrivate
return nil, err
}
- return certificateBytes, nil
+ certificatePemBlock := &pem.Block{
+ Type: "CERTIFICATE",
+ Bytes: certificateBytes,
+ }
+
+ certificatePemBytes := pem.EncodeToMemory(certificatePemBlock)
+
+ return certificatePemBytes, nil
}
func readPrivateKeyFromFile(fileName string) (*rsa.PrivateKey, error) {
diff --git a/handler/generate_keypair.go b/handler/generate_keypair.go
index febe5ab..aadb6c9 100644
--- a/handler/generate_keypair.go
+++ b/handler/generate_keypair.go
@@ -136,7 +136,7 @@ func generateKeyPair(keySize int) ([]byte, []byte, error) {
}
privateKeyPemBlock := &pem.Block{
- Type: "RSA PRIVATE KEY",
+ Type: "PRIVATE KEY",
Bytes: pkcs8PrivateKeyBytes,
}
@@ -148,7 +148,7 @@ func generateKeyPair(keySize int) ([]byte, []byte, error) {
}
publicKeyPemBlock := &pem.Block{
- Type: "RSA PRIVATE KEY",
+ Type: "PUBLIC KEY",
Bytes: pkixPublicKeyBytes,
}
--
GitLab