From dd9d6eb8bb694ec4237606db0dd1c70d0875b914 Mon Sep 17 00:00:00 2001
From: Gibheer <gibheer@gmail.com>
Date: Wed, 24 Dec 2014 11:48:45 +0100
Subject: move sign request handling into own file

---
 main.go         | 57 ++--------------------------------------------------
 sign_request.go | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 64 insertions(+), 55 deletions(-)
 create mode 100644 sign_request.go

diff --git a/main.go b/main.go
index 657c64e..d0fdef6 100644
--- a/main.go
+++ b/main.go
@@ -1,16 +1,13 @@
 package main
 
 import (
-  "flag"
+  "crypto/x509"
+  "encoding/pem"
   "fmt"
   "io"
   "io/ioutil"
   "os"
   "path/filepath"
-  "crypto/x509"
-  "crypto/x509/pkix"
-  "crypto/rand"
-  "encoding/pem"
 //  "code.google.com/p/go.crypto/ssh/terminal"
 //  "math/big"
 //  "time"
@@ -28,17 +25,6 @@ var (
   EcdsaLength = []int{224, 256, 384, 521}
 )
 
-type (
-  SignFlags struct {
-    PrivateKeyPath string // path to the private key
-    Output         string // path where to store the CSR
-    BaseAttributes pkix.Name
-
-    private_key PrivateKey
-    output_stream io.WriteCloser // the output stream for the CSR
-  }
-)
-
 func main() {
   if len(os.Args) == 1 {
     crash_with_help(1, "No module selected!")
@@ -53,45 +39,6 @@ func main() {
   }
 }
 
-// create a sign request with a private key
-func create_sign_request() {
-  flags := parse_sign_flags()
-  flags.private_key = load_private_key(flags.PrivateKeyPath)
-
-  var err error
-  flags.output_stream, err = open_output_stream(flags.Output)
-  if err != nil {
-    crash_with_help(2, fmt.Sprintf("Error when creating file %s: %s", flags.Output, err))
-  }
-  defer flags.output_stream.Close()
-
-  csr_template := &x509.CertificateRequest{
-    Subject: flags.BaseAttributes,
-  }
-  csr_raw, err := x509.CreateCertificateRequest(rand.Reader, csr_template, flags.private_key)
-  if err != nil {
-    fmt.Fprintln(os.Stderr, "Error when generating CSR: ", err)
-    os.Exit(3)
-  }
-  block := &pem.Block{Type: TypeLabelCSR, Bytes: csr_raw}
-  pem.Encode(flags.output_stream, block)
-}
-
-// parse the flags to create a certificate sign request
-func parse_sign_flags() SignFlags {
-  flags := SignFlags{}
-  fs := flag.NewFlagSet("create-cert-sign", flag.ExitOnError)
-  fs.StringVar(&flags.PrivateKeyPath, "private-key", "", "path to the private key file")
-  fs.StringVar(&flags.Output, "output", "STDOUT", "path where the generated csr should be stored")
-
-  flags.BaseAttributes = pkix.Name{}
-  fs.StringVar(&flags.BaseAttributes.CommonName, "common-name", "", "the name of the resource")
-  fs.StringVar(&flags.BaseAttributes.SerialNumber, "serial", "1", "serial number for the request")
-
-  fs.Parse(os.Args[2:])
-  return flags
-}
-
 // get information on file (private key, sign request, certificate, ...)
 func info_on_file() {}
 // sign a certificate request to create a new certificate
diff --git a/sign_request.go b/sign_request.go
new file mode 100644
index 0000000..db41f5a
--- /dev/null
+++ b/sign_request.go
@@ -0,0 +1,62 @@
+package main
+
+import (
+  "crypto/rand"
+  "crypto/x509"
+  "crypto/x509/pkix"
+  "encoding/pem"
+  "fmt"
+  "flag"
+  "io"
+  "os"
+)
+
+type (
+  SignFlags struct {
+    PrivateKeyPath string // path to the private key
+    Output         string // path where to store the CSR
+    BaseAttributes pkix.Name
+
+    private_key PrivateKey
+    output_stream io.WriteCloser // the output stream for the CSR
+  }
+)
+
+// create a sign request with a private key
+func create_sign_request() {
+  flags := parse_sign_flags()
+  flags.private_key = load_private_key(flags.PrivateKeyPath)
+
+  var err error
+  flags.output_stream, err = open_output_stream(flags.Output)
+  if err != nil {
+    crash_with_help(2, fmt.Sprintf("Error when creating file %s: %s", flags.Output, err))
+  }
+  defer flags.output_stream.Close()
+
+  csr_template := &x509.CertificateRequest{
+    Subject: flags.BaseAttributes,
+  }
+  csr_raw, err := x509.CreateCertificateRequest(rand.Reader, csr_template, flags.private_key)
+  if err != nil {
+    fmt.Fprintln(os.Stderr, "Error when generating CSR: ", err)
+    os.Exit(3)
+  }
+  block := &pem.Block{Type: TypeLabelCSR, Bytes: csr_raw}
+  pem.Encode(flags.output_stream, block)
+}
+
+// parse the flags to create a certificate sign request
+func parse_sign_flags() SignFlags {
+  flags := SignFlags{}
+  fs := flag.NewFlagSet("create-cert-sign", flag.ExitOnError)
+  fs.StringVar(&flags.PrivateKeyPath, "private-key", "", "path to the private key file")
+  fs.StringVar(&flags.Output, "output", "STDOUT", "path where the generated csr should be stored")
+
+  flags.BaseAttributes = pkix.Name{}
+  fs.StringVar(&flags.BaseAttributes.CommonName, "common-name", "", "the name of the resource")
+  fs.StringVar(&flags.BaseAttributes.SerialNumber, "serial", "1", "serial number for the request")
+
+  fs.Parse(os.Args[2:])
+  return flags
+}
-- 
cgit v1.2.3-70-g09d2