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

pki --pub and --keyid accept pkcs10 as input

Browse Source
This commit is contained in:
Andreas Steffen
2009-09-15 06:24:14 +02:00
parent 0912f0d2bc
commit 622e558cb0
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pki/commands/keyid.c
+7 -1
View File
@@ -57,6 +57,11 @@ static int keyid(int argc, char *argv[])
type = CRED_PUBLIC_KEY;
subtype = KEY_ANY;
}
else if (streq(optarg, "pkcs10"))
{
type = CRED_CERTIFICATE;
subtype = CERT_PKCS10_REQUEST;
}
else if (streq(optarg, "x509"))
{
type = CRED_CERTIFICATE;
@@ -150,7 +155,8 @@ static void __attribute__ ((constructor))reg()
command_register((command_t)
{ keyid, 'k', "keyid",
"calculate key identifiers of a key/certificate",
{"[--in file] [--type rsa-priv|ecdsa-priv|pub|x509]"},
{"[--in file] [--type rsa-priv|ecdsa-priv|pub|pkcs10|x509]",
"[--debug 0|1|2|3|4]"},
{
{"help", 'h', 0, "show usage information"},
{"in", 'i', 1, "input file, default: stdin"},
src/pki/commands/pub.c
+7 -1
View File
@@ -53,6 +53,11 @@ static int pub(int argc, char *argv[])
type = CRED_PRIVATE_KEY;
subtype = KEY_ECDSA;
}
else if (streq(optarg, "pkcs10"))
{
type = CRED_CERTIFICATE;
subtype = CERT_PKCS10_REQUEST;
}
else if (streq(optarg, "x509"))
{
type = CRED_CERTIFICATE;
@@ -142,7 +147,8 @@ static void __attribute__ ((constructor))reg()
command_register((command_t) {
pub, 'p', "pub",
"extract the public key from a private key/certificate",
{"[--in file] [--type rsa|ecdsa|x509] [--outform der|pem|pgp]"},
{"[--in file] [--type rsa|ecdsa|pkcs10|x509] [--outform der|pem|pgp]",
"[--debug 0|1|2|3|4]"},
{
{"help", 'h', 0, "show usage information"},
{"in", 'i', 1, "input file, default: stdin"},