From 7d7ab1937e98d7c19ab678837c811b8e1271ee9d Mon Sep 17 00:00:00 2001
From: Lars Lehtonen <lars.lehtonen@gmail.com>
Date: Wed, 13 Nov 2019 14:27:30 -0800
Subject: [PATCH] tls: fix CreateCertificate() return order

---
 tls/cert.go | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tls/cert.go b/tls/cert.go
index 067744f0..8bf0aec5 100644
--- a/tls/cert.go
+++ b/tls/cert.go
@@ -74,10 +74,10 @@ func CertConfigFromModule(prefix string, m session.SessionModule) (err error, cf
 	return nil, cfg
 }
 
-func CreateCertificate(cfg CertConfig, ca bool) (error, *rsa.PrivateKey, []byte) {
+func CreateCertificate(cfg CertConfig, ca bool) (*rsa.PrivateKey, []byte, error) {
 	priv, err := rsa.GenerateKey(rand.Reader, cfg.Bits)
 	if err != nil {
-		return err, nil, nil
+		return nil, nil, err
 	}
 
 	notBefore := time.Now()
@@ -86,7 +86,7 @@ func CreateCertificate(cfg CertConfig, ca bool) (error, *rsa.PrivateKey, []byte)
 	serialNumberLimit := new(big.Int).Lsh(big.NewInt(1), 128)
 	serialNumber, err := rand.Int(rand.Reader, serialNumberLimit)
 	if err != nil {
-		return err, nil, nil
+		return nil, nil, err
 	}
 
 	template := x509.Certificate{
@@ -108,10 +108,10 @@ func CreateCertificate(cfg CertConfig, ca bool) (error, *rsa.PrivateKey, []byte)
 
 	cert, err := x509.CreateCertificate(rand.Reader, &template, &template, &priv.PublicKey, priv)
 	if err != nil {
-		return err, nil, nil
+		return nil, nil, err
 	}
 
-	return nil, priv, cert
+	return priv, cert, err
 }
 
 func Generate(cfg CertConfig, certPath string, keyPath string, ca bool) error {
@@ -127,7 +127,7 @@ func Generate(cfg CertConfig, certPath string, keyPath string, ca bool) error {
 	}
 	defer certFile.Close()
 
-	err, priv, cert := CreateCertificate(cfg, ca)
+	priv, cert, err := CreateCertificate(cfg, ca)
 	if err != nil {
 		return err
 	}