From 60d877f35d52cf7d1df5d84e076094eaff24c685 Mon Sep 17 00:00:00 2001
From: zhj4478 <zhj4478@gmail.com>
Date: Wed, 6 Jun 2018 14:05:57 -0700
Subject: [PATCH] add config to key generation

---
 armor.go | 2 +-
 key.go   | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/armor.go b/armor.go
index 0bac15b..071f4ad 100644
--- a/armor.go
+++ b/armor.go
@@ -22,7 +22,7 @@ func ArmorKey(input []byte) (string, error) {
 // ArmorWithType make bytes input to armor format
 func ArmorWithType(input []byte, armorType string) (string, error) {
 	var b bytes.Buffer
-	w, err := armor.Encode(&b, armorType, nil)
+	w, err := armor.Encode(&b, armorType, armorHeader)
 	if err != nil {
 		return "", err
 	}
diff --git a/key.go b/key.go
index a86d492..d6b9c8c 100644
--- a/key.go
+++ b/key.go
@@ -2,6 +2,7 @@ package pm
 
 import (
 	"bytes"
+	"crypto"
 	"encoding/hex"
 	"errors"
 	"fmt"
@@ -162,7 +163,13 @@ func (o *OpenPGP) GenerateKey(userName string, domain string, passphrase string,
 		return o.getNow()
 	}
 
-	cfg := &packet.Config{RSABits: bits, Time: timeNow}
+	cfg := &packet.Config{
+		RSABits:       bits,
+		Time:          timeNow,
+		DefaultHash:   crypto.SHA256,
+		DefaultCipher: packet.CipherAES256,
+	}
+
 	newEntity, err := openpgp.NewEntity(email, comments, email, cfg)
 	if err != nil {
 		return "", err