From 885340ef8f27f81c626626798cdbcd63e2f992b6 Mon Sep 17 00:00:00 2001 From: Gibheer Date: Mon, 23 Mar 2015 09:43:20 +0100 Subject: rename FlagCertificateData This makes it easier to distinguish between the csr data and cert data. --- flags.go | 8 ++++---- main.go | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/flags.go b/flags.go index 3b65d52..745ba39 100644 --- a/flags.go +++ b/flags.go @@ -141,7 +141,7 @@ certificate requests and certificates and sign/verify messages.`, // private key specific stuff FlagPrivateKeyGeneration privateKeyGenerationFlags // a certificate filled with the parameters - FlagCertificateData *pki.CertificateData + FlagCertificateRequestData *pki.CertificateData // the certificate sign request FlagCertificateSignRequest *pki.CertificateRequest ) @@ -392,10 +392,10 @@ func InitFlagCertificateFields(cmd *Command) { // parse the certificate fields into a raw certificate func checkCertificateFields() error { - FlagCertificateData = pki.NewCertificateData() + FlagCertificateRequestData = pki.NewCertificateData() // convert the automatic flags container_type := reflect.ValueOf(&flagContainer.certificateFlags.automatic).Elem() - cert_data_type := reflect.ValueOf(&FlagCertificateData.Subject).Elem() + cert_data_type := reflect.ValueOf(&FlagCertificateRequestData.Subject).Elem() for _, field := range []string{"Country", "Organization", "OrganizationalUnit", "Locality", "Province", "StreetAddress", "PostalCode"} { @@ -406,7 +406,7 @@ func checkCertificateFields() error { } // convert the manual flags - data := FlagCertificateData + data := FlagCertificateRequestData raw_data := flagContainer.certificateFlags.manual data.Subject.SerialNumber = raw_data.serialNumber data.Subject.CommonName = raw_data.commonName diff --git a/main.go b/main.go index 42ecc92..ba8ee0a 100644 --- a/main.go +++ b/main.go @@ -110,7 +110,7 @@ func create_sign_request(cmd *Command, args []string) { crash_with_help(cmd, ErrorFlagInput, "Flags invalid: %s", err) } - csr, err := FlagCertificateData.ToCertificateRequest(FlagPrivateKey) + csr, err := FlagCertificateRequestData.ToCertificateRequest(FlagPrivateKey) if err != nil { crash_with_help(cmd, ErrorProgram, "Could not create certificate sign request: %s", err) } pem_block, err := csr.MarshalPem() if err != nil { crash_with_help(cmd, ErrorProgram, "Error when marshalling to pem: %s", err) } -- cgit v1.2.3-70-g09d2