aboutsummaryrefslogtreecommitdiff
path: root/crypto.go
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2016-01-12 23:12:51 +0100
committerDimitri Sokolyuk <demon@dim13.org>2016-01-12 23:12:51 +0100
commit14b97b923d25386e068612f94540dc37e21e09d9 (patch)
tree7cc461e03373ffbd58111c2241c296f81d713db8 /crypto.go
parent9244202a525b9d9a562c26f99545f2b86ede434e (diff)
cleanup
Diffstat (limited to 'crypto.go')
-rw-r--r--crypto.go33
1 files changed, 5 insertions, 28 deletions
diff --git a/crypto.go b/crypto.go
index 21e2bb3..a9c8b4c 100644
--- a/crypto.go
+++ b/crypto.go
@@ -4,8 +4,6 @@ import (
"crypto/rand"
"crypto/rsa"
"crypto/x509"
- "crypto/x509/pkix"
- "encoding/base64"
"encoding/pem"
"io"
"io/ioutil"
@@ -47,33 +45,12 @@ func SaveKey(w io.Writer, key *rsa.PrivateKey) error {
return pem.Encode(w, block)
}
-func NewCSR(altnames []string, key *rsa.PrivateKey) (string, error) {
- tmpl := x509.CertificateRequest{
- Subject: pkix.Name{
- CommonName: altnames[0],
- },
- }
- if len(altnames) > 1 {
- tmpl.DNSNames = altnames
- }
- der, err := x509.CreateCertificateRequest(rand.Reader, &tmpl, key)
- if err != nil {
- return "", err
- }
- return base64.RawURLEncoding.EncodeToString(der), nil
-}
-
-func SaveCert(w io.Writer, crt []*x509.Certificate) error {
- for _, c := range crt {
- block := &pem.Block{
- Type: "CERTIFICATE",
- Bytes: c.Raw,
- }
- if err := pem.Encode(w, block); err != nil {
- return err
- }
+func SaveCert(w io.Writer, crt *x509.Certificate) error {
+ block := &pem.Block{
+ Type: "CERTIFICATE",
+ Bytes: crt.Raw,
}
- return nil
+ return pem.Encode(w, block)
}
func LoadCertFile(fname string) ([]*x509.Certificate, error) {