gibheer
/
pkictl
0
0
Fork 0
Code

rename FlagCertificateData 

This makes it easier to distinguish between the csr data and cert data.
This commit is contained in:
Gibheer 2015-03-23 09:43:20 +01:00
parent 97baed49b8
commit 885340ef8f
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
flags.go
View File

@ -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

2
main.go
View File

@ -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) }