stroke: Load general PKCS#8 private keys
This commit is contained in:
parent
9da89eeb4f
commit
bd2f2b11fc
|
@ -1310,7 +1310,7 @@ static void load_secrets(private_stroke_cred_t *this, mem_cred_t *secrets,
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
if (match("RSA", &token) || match("ECDSA", &token) ||
|
if (match("RSA", &token) || match("ECDSA", &token) ||
|
||||||
match("BLISS", &token))
|
match("BLISS", &token) || match("PKCS8", &token))
|
||||||
{
|
{
|
||||||
if (match("RSA", &token))
|
if (match("RSA", &token))
|
||||||
{
|
{
|
||||||
|
@ -1320,10 +1320,14 @@ static void load_secrets(private_stroke_cred_t *this, mem_cred_t *secrets,
|
||||||
{
|
{
|
||||||
key_type = KEY_ECDSA;
|
key_type = KEY_ECDSA;
|
||||||
}
|
}
|
||||||
else
|
else if (match("BLISS", &token))
|
||||||
{
|
{
|
||||||
key_type = KEY_BLISS;
|
key_type = KEY_BLISS;
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
key_type = KEY_ANY;
|
||||||
|
}
|
||||||
if (!load_private(secrets, line, line_nr, prompt, key_type))
|
if (!load_private(secrets, line, line_nr, prompt, key_type))
|
||||||
{
|
{
|
||||||
break;
|
break;
|
||||||
|
@ -1356,7 +1360,7 @@ static void load_secrets(private_stroke_cred_t *this, mem_cred_t *secrets,
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
DBG1(DBG_CFG, "line %d: token must be either RSA, ECDSA, BLISS, "
|
DBG1(DBG_CFG, "line %d: token must be either RSA, ECDSA, BLISS, "
|
||||||
"P12, PIN, PSK, EAP, XAUTH or NTLM", line_nr);
|
"PKCS8 P12, PIN, PSK, EAP, XAUTH or NTLM", line_nr);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -70,6 +70,8 @@ METHOD(plugin_t, get_features, int,
|
||||||
PLUGIN_SDEPEND(PRIVKEY, KEY_ECDSA),
|
PLUGIN_SDEPEND(PRIVKEY, KEY_ECDSA),
|
||||||
PLUGIN_SDEPEND(PRIVKEY, KEY_DSA),
|
PLUGIN_SDEPEND(PRIVKEY, KEY_DSA),
|
||||||
PLUGIN_SDEPEND(PRIVKEY, KEY_BLISS),
|
PLUGIN_SDEPEND(PRIVKEY, KEY_BLISS),
|
||||||
|
PLUGIN_SDEPEND(PRIVKEY, KEY_ED25519),
|
||||||
|
PLUGIN_SDEPEND(PRIVKEY, KEY_ED448),
|
||||||
PLUGIN_SDEPEND(CERT_DECODE, CERT_ANY),
|
PLUGIN_SDEPEND(CERT_DECODE, CERT_ANY),
|
||||||
PLUGIN_SDEPEND(CERT_DECODE, CERT_X509),
|
PLUGIN_SDEPEND(CERT_DECODE, CERT_X509),
|
||||||
PLUGIN_SDEPEND(CERT_DECODE, CERT_X509_CRL),
|
PLUGIN_SDEPEND(CERT_DECODE, CERT_X509_CRL),
|
||||||
|
|
Loading…
Reference in New Issue