Merge branch 'put-certificate-in-pem-and-fix-public-key-pem-type' into 'master'

Store certificate in PEM, fixed keys PEM type

See merge request !5

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) {

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,
 	}