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

Added support for empty subjects DNs to pki --issue

Browse Source
This commit is contained in:
Martin Willi
2011-01-05 16:46:07 +01:00
parent 97d30f0010
commit 3fd3f8dea8
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pki/commands/issue.c
+7 -8
View File
@@ -270,12 +270,6 @@ static int issue()
} }
break; break;
} }
if (!pkcs10 && !dn)
{
error = "--dn is required";
goto usage;
}
if (!cacert) if (!cacert)
{ {
error = "--cacert is required"; error = "--cacert is required";
@@ -286,7 +280,7 @@ static int issue()
error = "--cakey or --keyid is required"; error = "--cakey or --keyid is required";
goto usage; goto usage;
} }
if (dn) if (dn && *dn)
{ {
id = identification_create_from_string(dn); id = identification_create_from_string(dn);
if (id->get_type(id) != ID_DER_ASN1_DN) if (id->get_type(id) != ID_DER_ASN1_DN)
@@ -295,6 +289,11 @@ static int issue()
goto end; goto end;
} }
} }
else
{
id = identification_create_from_encoding(ID_DER_ASN1_DN,
chunk_from_chars(ASN1_SEQUENCE, 0));
}
DBG2(DBG_LIB, "Reading ca certificate:"); DBG2(DBG_LIB, "Reading ca certificate:");
ca = lib->creds->create(lib->creds, CRED_CERTIFICATE, CERT_X509, ca = lib->creds->create(lib->creds, CRED_CERTIFICATE, CERT_X509,
@@ -511,7 +510,7 @@ static void __attribute__ ((constructor))reg()
issue, 'i', "issue", issue, 'i', "issue",
"issue a certificate using a CA certificate and key", "issue a certificate using a CA certificate and key",
{"[--in file] [--type pub|pkcs10] --cakey file | --cakeyid hex", {"[--in file] [--type pub|pkcs10] --cakey file | --cakeyid hex",
" --cacert file --dn subject-dn [--san subjectAltName]+", " --cacert file [--dn subject-dn] [--san subjectAltName]+",
"[--lifetime days] [--serial hex] [--crl uri [--crlissuer i] ]+ [--ocsp uri]+", "[--lifetime days] [--serial hex] [--crl uri [--crlissuer i] ]+ [--ocsp uri]+",
"[--ca] [--pathlen len] [--flag serverAuth|clientAuth|crlSign|ocspSigning]+", "[--ca] [--pathlen len] [--flag serverAuth|clientAuth|crlSign|ocspSigning]+",
"[--nc-permitted name] [--nc-excluded name]", "[--nc-permitted name] [--nc-excluded name]",