diff options
| author | Martin Willi <martin@revosec.ch> | 2010-07-13 14:14:39 +0200 |
|---|---|---|
| committer | Martin Willi <martin@revosec.ch> | 2010-07-13 14:14:39 +0200 |
| commit | b5b95c75deb01c6a7342f6174c4d79fe90bd8766 (patch) | |
| tree | e47ba3b21aa564e23cdb9d72cf71864dee74a067 /src/pki/commands/signcrl.c | |
| parent | e3b987f79b44f6e03f1cc58294a319faadd30c77 (diff) | |
| download | strongswan-b5b95c75deb01c6a7342f6174c4d79fe90bd8766.tar.bz2 strongswan-b5b95c75deb01c6a7342f6174c4d79fe90bd8766.tar.xz | |
Added pki PEM encoding support for certificates, CRLs and PKCS10 requests
Diffstat (limited to 'src/pki/commands/signcrl.c')
| -rw-r--r-- | src/pki/commands/signcrl.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/pki/commands/signcrl.c b/src/pki/commands/signcrl.c index 3d8339289..b7163a153 100644 --- a/src/pki/commands/signcrl.c +++ b/src/pki/commands/signcrl.c @@ -102,6 +102,7 @@ static int read_serial(char *file, char *buf, int buflen) */ static int sign_crl() { + cred_encoding_type_t form = CERT_ASN1_DER; private_key_t *private = NULL; public_key_t *public = NULL; certificate_t *ca = NULL, *crl = NULL; @@ -224,6 +225,12 @@ static int sign_crl() goto usage; } continue; + case 'f': + if (!get_form(arg, &form, CRED_CERTIFICATE)) + { + return command_usage("invalid output format"); + } + continue; case EOF: break; default: @@ -314,7 +321,7 @@ static int sign_crl() error = "generating CRL failed"; goto error; } - if (!crl->get_encoding(crl, CERT_ASN1_DER, &encoding)) + if (!crl->get_encoding(crl, form, &encoding)) { error = "encoding CRL failed"; goto error; @@ -357,7 +364,7 @@ static void __attribute__ ((constructor))reg() " superseded|cessation-of-operation|certificate-hold]", " [--date timestamp]", " --cert file | --serial hex ]*", - "[--digest md5|sha1|sha224|sha256|sha384|sha512]"}, + "[--digest md5|sha1|sha224|sha256|sha384|sha512] [--outform der|pem]"}, { {"help", 'h', 0, "show usage information"}, {"cacert", 'c', 1, "CA certificate file"}, @@ -369,6 +376,7 @@ static void __attribute__ ((constructor))reg() {"reason", 'r', 1, "reason for certificate revocation"}, {"date", 'd', 1, "revocation date as unix timestamp, default: now"}, {"digest", 'g', 1, "digest for signature creation, default: sha1"}, + {"outform", 'f', 1, "encoding of generated crl, default: der"}, } }); } |