denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added crl support to pki --print

Browse Source
This commit is contained in:
Martin Willi
2010-08-30 11:23:45 +02:00
parent 0433b4172b
commit 21f80e9dbc
1 changed files with 52 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pki/commands/print.c
+52 -7
View File
@@ -17,6 +17,7 @@
#include <credentials/certificates/certificate.h> #include <credentials/certificates/certificate.h>
#include <credentials/certificates/x509.h> #include <credentials/certificates/x509.h>
#include <credentials/certificates/crl.h>
#include <selectors/traffic_selector.h> #include <selectors/traffic_selector.h>
#include <time.h> #include <time.h>
@@ -201,6 +202,44 @@ static void print_x509(x509_t *x509)
} }
} }
/**
* Print CRL specific information
*/
static void print_crl(crl_t *crl)
{
enumerator_t *enumerator;
time_t ts;
crl_reason_t reason;
chunk_t chunk;
int count = 0;
char buf[64];
struct tm tm;
chunk = crl->get_serial(crl);
printf("serial: %#B\n", &chunk);
chunk = crl->get_authKeyIdentifier(crl);
printf("authKeyId: %#B\n", &chunk);
enumerator = crl->create_enumerator(crl);
while (enumerator->enumerate(enumerator, &chunk, &ts, &reason))
{
count++;
}
enumerator->destroy(enumerator);
printf("%d revoked certificate%s%s\n", count,
count == 1 ? "" : "s", count ? ":" : "");
enumerator = crl->create_enumerator(crl);
while (enumerator->enumerate(enumerator, &chunk, &ts, &reason))
{
localtime_r(&ts, &tm);
strftime(buf, sizeof(buf), "%F %T", &tm);
printf(" %#B %N %s\n", &chunk, crl_reason_names, reason, buf);
count++;
}
enumerator->destroy(enumerator);
}
/** /**
* Print certificate information * Print certificate information
*/ */
@@ -212,7 +251,10 @@ static void print_cert(certificate_t *cert)
now = time(NULL); now = time(NULL);
printf("cert: %N\n", certificate_type_names, cert->get_type(cert)); printf("cert: %N\n", certificate_type_names, cert->get_type(cert));
printf("subject: \"%Y\"\n", cert->get_subject(cert)); if (cert->get_type(cert) != CERT_X509_CRL)
{
printf("subject: \"%Y\"\n", cert->get_subject(cert));
}
printf("issuer: \"%Y\"\n", cert->get_issuer(cert)); printf("issuer: \"%Y\"\n", cert->get_issuer(cert));
cert->get_validity(cert, &now, &notBefore, &notAfter); cert->get_validity(cert, &now, &notBefore, &notAfter);
@@ -240,22 +282,20 @@ static void print_cert(certificate_t *cert)
case CERT_X509: case CERT_X509:
print_x509((x509_t*)cert); print_x509((x509_t*)cert);
break; break;
case CERT_X509_CRL:
print_crl((crl_t*)cert);
break;
default: default:
printf("parsing certificate subtype %N not implemented\n", printf("parsing certificate subtype %N not implemented\n",
certificate_type_names, cert->get_type(cert)); certificate_type_names, cert->get_type(cert));
break; break;
} }
key = cert->get_public_key(cert); key = cert->get_public_key(cert);
if (key) if (key)
{ {
print_pubkey(key); print_pubkey(key);
key->destroy(key); key->destroy(key);
} }
else
{
printf("unable to extract public key\n");
}
} }
/** /**
@@ -280,6 +320,11 @@ static int print()
type = CRED_CERTIFICATE; type = CRED_CERTIFICATE;
subtype = CERT_X509; subtype = CERT_X509;
} }
else if (streq(arg, "crl"))
{
type = CRED_CERTIFICATE;
subtype = CERT_X509_CRL;
}
else if (streq(arg, "pub")) else if (streq(arg, "pub"))
{ {
type = CRED_PUBLIC_KEY; type = CRED_PUBLIC_KEY;
@@ -358,7 +403,7 @@ static void __attribute__ ((constructor))reg()
command_register((command_t) command_register((command_t)
{ print, 'a', "print", { print, 'a', "print",
"print a credential in a human readable form", "print a credential in a human readable form",
{"[--in file] [--type rsa-priv|ecdsa-priv|pub|x509]"}, {"[--in file] [--type rsa-priv|ecdsa-priv|pub|x509|crl]"},
{ {
{"help", 'h', 0, "show usage information"}, {"help", 'h', 0, "show usage information"},
{"in", 'i', 1, "input file, default: stdin"}, {"in", 'i', 1, "input file, default: stdin"},