Added a --signcrl command to the pki utility
This commit is contained in:
Martin Willi
parent
13c593f126
commit
0c73ceff0a
|
|
@ -8,6 +8,7 @@ pki_SOURCES = pki.c pki.h command.c command.h \
|
|||
commands/req.c \
|
||||
commands/self.c \
|
||||
commands/print.c \
|
||||
commands/signcrl.c \
|
||||
commands/verify.c
|
||||
|
||||
pki_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
|
||||
|
|
|
|||
|
|
@ -181,7 +181,7 @@ int command_usage(char *error)
|
|||
{
|
||||
for (i = 0; cmds[i].cmd; i++)
|
||||
{
|
||||
fprintf(out, " pki --%-6s (-%c) %s\n",
|
||||
fprintf(out, " pki --%-7s (-%c) %s\n",
|
||||
cmds[i].cmd, cmds[i].op, cmds[i].description);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,375 @@
|
|||
/*
|
||||
* Copyright (C) 2010 Martin Willi
|
||||
* Copyright (C) 2010 revosec AG
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License as published by the
|
||||
* Free Software Foundation; either version 2 of the License, or (at your
|
||||
* option) any later version. See <http://www.fsf.org/copyleft/gpl.txt>.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful, but
|
||||
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
|
||||
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* for more details.
|
||||
*/
|
||||
|
||||
#include <time.h>
|
||||
|
||||
#include "pki.h"
|
||||
|
||||
#include <debug.h>
|
||||
#include <utils/linked_list.h>
|
||||
#include <credentials/certificates/certificate.h>
|
||||
#include <credentials/certificates/x509.h>
|
||||
#include <credentials/certificates/crl.h>
|
||||
|
||||
|
||||
/**
|
||||
* Entry for a revoked certificate
|
||||
*/
|
||||
typedef struct {
|
||||
chunk_t serial;
|
||||
crl_reason_t reason;
|
||||
time_t date;
|
||||
} revoked_t;
|
||||
|
||||
/**
|
||||
* Add a revocation to the list
|
||||
*/
|
||||
static void add_revoked(linked_list_t *list,
|
||||
chunk_t serial, crl_reason_t reason, time_t date)
|
||||
{
|
||||
revoked_t *revoked;
|
||||
|
||||
INIT(revoked,
|
||||
.serial = chunk_clone(serial),
|
||||
.reason = reason,
|
||||
.date = date,
|
||||
);
|
||||
list->insert_last(list, revoked);
|
||||
}
|
||||
|
||||
/**
|
||||
* Destroy a reason entry
|
||||
*/
|
||||
static void revoked_destroy(revoked_t *revoked)
|
||||
{
|
||||
free(revoked->serial.ptr);
|
||||
free(revoked);
|
||||
}
|
||||
|
||||
/**
|
||||
* Filter for revoked enumerator
|
||||
*/
|
||||
static bool filter(void *data, revoked_t **revoked, chunk_t *serial, void *p2,
|
||||
time_t *date, void *p3, crl_reason_t *reason)
|
||||
{
|
||||
*serial = (*revoked)->serial;
|
||||
*date = (*revoked)->date;
|
||||
*reason = (*revoked)->reason;
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
/**
|
||||
* Extract the serial of a certificate, write it into buf
|
||||
*/
|
||||
static int read_serial(char *file, char *buf, int buflen)
|
||||
{
|
||||
certificate_t *cert;
|
||||
x509_t *x509;
|
||||
chunk_t serial;
|
||||
|
||||
x509 = lib->creds->create(lib->creds, CRED_CERTIFICATE, CERT_X509,
|
||||
BUILD_FROM_FILE, file, BUILD_END);
|
||||
cert = &x509->interface;
|
||||
if (!cert)
|
||||
{
|
||||
return -1;
|
||||
}
|
||||
serial = x509->get_serial(x509);
|
||||
if (serial.len == 0 || serial.len > buflen)
|
||||
{
|
||||
cert->destroy(cert);
|
||||
return -2;
|
||||
}
|
||||
memcpy(buf, serial.ptr, serial.len);
|
||||
cert->destroy(cert);
|
||||
return serial.len;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sign a CRL
|
||||
*/
|
||||
static int sign_crl()
|
||||
{
|
||||
private_key_t *private = NULL;
|
||||
public_key_t *public = NULL;
|
||||
certificate_t *ca = NULL, *crl = NULL;
|
||||
crl_t *lastcrl = NULL;
|
||||
x509_t *x509;
|
||||
hash_algorithm_t digest = HASH_SHA1;
|
||||
char *arg, *cacert = NULL, *cakey = NULL, *lastupdate = NULL, *error = NULL;
|
||||
char serial[512], crl_serial[8];
|
||||
int serial_len = 0;
|
||||
crl_reason_t reason = CRL_REASON_UNSPECIFIED;
|
||||
time_t thisUpdate, nextUpdate, date = time(NULL);
|
||||
int lifetime = 15;
|
||||
linked_list_t *list;
|
||||
enumerator_t *enumerator, *lastenum = NULL;
|
||||
chunk_t encoding = chunk_empty;
|
||||
|
||||
list = linked_list_create();
|
||||
|
||||
memset(crl_serial, 0, sizeof(crl_serial));
|
||||
|
||||
while (TRUE)
|
||||
{
|
||||
switch (command_getopt(&arg))
|
||||
{
|
||||
case 'h':
|
||||
goto usage;
|
||||
case 'g':
|
||||
digest = get_digest(arg);
|
||||
if (digest == HASH_UNKNOWN)
|
||||
{
|
||||
error = "invalid --digest type";
|
||||
goto usage;
|
||||
}
|
||||
continue;
|
||||
case 'c':
|
||||
cacert = arg;
|
||||
continue;
|
||||
case 'k':
|
||||
cakey = arg;
|
||||
continue;
|
||||
case 'a':
|
||||
lastupdate = arg;
|
||||
continue;
|
||||
case 'l':
|
||||
lifetime = atoi(arg);
|
||||
if (!lifetime)
|
||||
{
|
||||
error = "invalid lifetime";
|
||||
goto usage;
|
||||
}
|
||||
continue;
|
||||
case 'z':
|
||||
serial_len = read_serial(arg, serial, sizeof(serial));
|
||||
if (serial_len < 0)
|
||||
{
|
||||
snprintf(serial, sizeof(serial),
|
||||
"parsing certificate '%s' failed", arg);
|
||||
error = serial;
|
||||
goto error;
|
||||
}
|
||||
add_revoked(list, chunk_create(serial, serial_len), reason, date);
|
||||
date = time(NULL);
|
||||
serial_len = 0;
|
||||
reason = CRL_REASON_UNSPECIFIED;
|
||||
continue;
|
||||
case 's':
|
||||
{
|
||||
chunk_t chunk;
|
||||
int hex_len;
|
||||
|
||||
hex_len = strlen(arg);
|
||||
if ((hex_len / 2) + (hex_len % 2) > sizeof(serial))
|
||||
{
|
||||
error = "invalid serial";
|
||||
goto usage;
|
||||
}
|
||||
chunk = chunk_from_hex(chunk_create(arg, hex_len), serial);
|
||||
serial_len = chunk.len;
|
||||
add_revoked(list, chunk_create(serial, serial_len), reason, date);
|
||||
date = time(NULL);
|
||||
serial_len = 0;
|
||||
reason = CRL_REASON_UNSPECIFIED;
|
||||
continue;
|
||||
}
|
||||
case 'r':
|
||||
if (streq(arg, "key-compromise"))
|
||||
{
|
||||
reason = CRL_REASON_KEY_COMPROMISE;
|
||||
}
|
||||
else if (streq(arg, "ca-compromise"))
|
||||
{
|
||||
reason = CRL_REASON_CA_COMPROMISE;
|
||||
}
|
||||
else if (streq(arg, "affiliation-changed"))
|
||||
{
|
||||
reason = CRL_REASON_AFFILIATION_CHANGED;
|
||||
}
|
||||
else if (streq(arg, "superseded"))
|
||||
{
|
||||
reason = CRL_REASON_SUPERSEDED;
|
||||
}
|
||||
else if (streq(arg, "cessation-of-operation"))
|
||||
{
|
||||
reason = CRL_REASON_CESSATION_OF_OPERATON;
|
||||
}
|
||||
else if (streq(arg, "certificate-hold"))
|
||||
{
|
||||
reason = CRL_REASON_CERTIFICATE_HOLD;
|
||||
}
|
||||
else
|
||||
{
|
||||
return command_usage( "invalid revocation reason");
|
||||
}
|
||||
continue;
|
||||
case 'd':
|
||||
date = atol(arg);
|
||||
if (!date)
|
||||
{
|
||||
error = "invalid date";
|
||||
goto usage;
|
||||
}
|
||||
continue;
|
||||
case EOF:
|
||||
break;
|
||||
default:
|
||||
error = "invalid --signcrl option";
|
||||
goto usage;
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
if (!cacert)
|
||||
{
|
||||
error = "--cacert is required";
|
||||
goto usage;
|
||||
}
|
||||
if (!cakey)
|
||||
{
|
||||
error = "--cakey is required";
|
||||
goto usage;
|
||||
}
|
||||
|
||||
ca = lib->creds->create(lib->creds, CRED_CERTIFICATE, CERT_X509,
|
||||
BUILD_FROM_FILE, cacert, BUILD_END);
|
||||
if (!ca)
|
||||
{
|
||||
error = "parsing CA certificate failed";
|
||||
goto error;
|
||||
}
|
||||
x509 = (x509_t*)ca;
|
||||
if (!(x509->get_flags(x509) & X509_CA))
|
||||
{
|
||||
error = "CA certificate misses CA basicConstraint";
|
||||
goto error;
|
||||
}
|
||||
public = ca->get_public_key(ca);
|
||||
if (!public)
|
||||
{
|
||||
error = "extracting CA certificate public key failed";
|
||||
goto error;
|
||||
}
|
||||
private = lib->creds->create(lib->creds, CRED_PRIVATE_KEY,
|
||||
public->get_type(public),
|
||||
BUILD_FROM_FILE, cakey, BUILD_END);
|
||||
if (!private)
|
||||
{
|
||||
error = "parsing CA private key failed";
|
||||
goto error;
|
||||
}
|
||||
if (!private->belongs_to(private, public))
|
||||
{
|
||||
error = "CA private key does not match CA certificate";
|
||||
goto error;
|
||||
}
|
||||
|
||||
thisUpdate = time(NULL);
|
||||
nextUpdate = thisUpdate + lifetime * 24 * 60 * 60;
|
||||
|
||||
if (lastupdate)
|
||||
{
|
||||
lastcrl = lib->creds->create(lib->creds, CRED_CERTIFICATE, CERT_X509_CRL,
|
||||
BUILD_FROM_FILE, lastupdate, BUILD_END);
|
||||
if (!lastcrl)
|
||||
{
|
||||
error = "loading lastUpdate CRL failed";
|
||||
goto error;
|
||||
}
|
||||
memcpy(crl_serial, lastcrl->get_serial(lastcrl).ptr,
|
||||
min(lastcrl->get_serial(lastcrl).len, sizeof(crl_serial)));
|
||||
lastenum = lastcrl->create_enumerator(lastcrl);
|
||||
}
|
||||
|
||||
chunk_increment(chunk_create(crl_serial, sizeof(crl_serial)));
|
||||
|
||||
enumerator = enumerator_create_filter(list->create_enumerator(list),
|
||||
(void*)filter, NULL, NULL);
|
||||
crl = lib->creds->create(lib->creds, CRED_CERTIFICATE, CERT_X509_CRL,
|
||||
BUILD_SIGNING_KEY, private, BUILD_SIGNING_CERT, ca,
|
||||
BUILD_SERIAL, chunk_create(crl_serial, sizeof(crl_serial)),
|
||||
BUILD_NOT_BEFORE_TIME, thisUpdate, BUILD_NOT_AFTER_TIME, nextUpdate,
|
||||
BUILD_REVOKED_ENUMERATOR, enumerator, BUILD_DIGEST_ALG, digest,
|
||||
lastenum ? BUILD_REVOKED_ENUMERATOR : BUILD_END, lastenum,
|
||||
BUILD_END);
|
||||
enumerator->destroy(enumerator);
|
||||
DESTROY_IF(lastenum);
|
||||
DESTROY_IF((certificate_t*)lastcrl);
|
||||
|
||||
if (!crl)
|
||||
{
|
||||
error = "generating CRL failed";
|
||||
goto error;
|
||||
}
|
||||
encoding = crl->get_encoding(crl);
|
||||
if (!encoding.ptr)
|
||||
{
|
||||
error = "encoding CRL failed";
|
||||
goto error;
|
||||
}
|
||||
if (fwrite(encoding.ptr, encoding.len, 1, stdout) != 1)
|
||||
{
|
||||
error = "writing CRL failed";
|
||||
goto error;
|
||||
}
|
||||
|
||||
error:
|
||||
DESTROY_IF(public);
|
||||
DESTROY_IF(private);
|
||||
DESTROY_IF(ca);
|
||||
DESTROY_IF(crl);
|
||||
free(encoding.ptr);
|
||||
list->destroy_function(list, (void*)revoked_destroy);
|
||||
if (error)
|
||||
{
|
||||
fprintf(stderr, "%s\n", error);
|
||||
return 1;
|
||||
}
|
||||
return 0;
|
||||
|
||||
usage:
|
||||
list->destroy_function(list, (void*)revoked_destroy);
|
||||
return command_usage(error);
|
||||
}
|
||||
|
||||
/**
|
||||
* Register the command.
|
||||
*/
|
||||
static void __attribute__ ((constructor))reg()
|
||||
{
|
||||
command_register((command_t) {
|
||||
sign_crl, 'c', "signcrl",
|
||||
"issue a CRL using a CA certificate and key",
|
||||
{"--cacert file --cakey file --lifetime days",
|
||||
"[ [--reason key-compromise|ca-compromise|affiliation-changed|",
|
||||
" superseded|cessation-of-operation|certificate-hold]",
|
||||
" [--date timestamp]",
|
||||
" --cert file | --serial hex ]*",
|
||||
"[--digest md5|sha1|sha224|sha256|sha384|sha512]"},
|
||||
{
|
||||
{"help", 'h', 0, "show usage information"},
|
||||
{"cacert", 'c', 1, "CA certificate file"},
|
||||
{"cakey", 'k', 1, "CA private key file"},
|
||||
{"lifetime",'l', 1, "days the CRL gets a nextUpdate, default: 15"},
|
||||
{"lastcrl", 'a', 1, "CRL of lastUpdate to copy revocations from"},
|
||||
{"cert", 'z', 1, "certificate file to revoke"},
|
||||
{"serial", 's', 1, "hex encoded certificate serial number to revoke"},
|
||||
{"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"},
|
||||
}
|
||||
});
|
||||
}
|
||||
Loading…
Reference in New Issue