bliss: Remove legacy BLISS signatures
This commit is contained in:
committed by
Tobias Brunner
parent
ec982171d9
commit
4833f29b15
@@ -524,8 +524,7 @@ static auth_cfg_t *build_auth_cfg(private_stroke_config_t *this,
|
||||
if (strpfx(auth, "ike:") ||
|
||||
strpfx(auth, "pubkey") ||
|
||||
strpfx(auth, "rsa") ||
|
||||
strpfx(auth, "ecdsa") ||
|
||||
strpfx(auth, "bliss"))
|
||||
strpfx(auth, "ecdsa"))
|
||||
{
|
||||
cfg->add(cfg, AUTH_RULE_AUTH_CLASS, AUTH_CLASS_PUBKEY);
|
||||
build_crl_policy(cfg, local, msg->add_conn.crl_policy);
|
||||
|
||||
@@ -1301,7 +1301,7 @@ static void load_secrets(private_stroke_cred_t *this, mem_cred_t *secrets,
|
||||
break;
|
||||
}
|
||||
if (match("RSA", &token) || match("ECDSA", &token) ||
|
||||
match("BLISS", &token) || match("PKCS8", &token))
|
||||
match("PKCS8", &token))
|
||||
{
|
||||
if (match("RSA", &token))
|
||||
{
|
||||
@@ -1311,10 +1311,6 @@ static void load_secrets(private_stroke_cred_t *this, mem_cred_t *secrets,
|
||||
{
|
||||
key_type = KEY_ECDSA;
|
||||
}
|
||||
else if (match("BLISS", &token))
|
||||
{
|
||||
key_type = KEY_BLISS;
|
||||
}
|
||||
else
|
||||
{
|
||||
key_type = KEY_ANY;
|
||||
@@ -1350,8 +1346,8 @@ static void load_secrets(private_stroke_cred_t *this, mem_cred_t *secrets,
|
||||
}
|
||||
else
|
||||
{
|
||||
DBG1(DBG_CFG, "line %d: token must be either RSA, ECDSA, BLISS, "
|
||||
"PKCS8 P12, PIN, PSK, EAP, XAUTH or NTLM", line_nr);
|
||||
DBG1(DBG_CFG, "line %d: token must be either RSA, ECDSA, PKCS8, "
|
||||
"P12, PIN, PSK, EAP, XAUTH or NTLM", line_nr);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -71,7 +71,6 @@ METHOD(plugin_t, get_features, int,
|
||||
PLUGIN_SDEPEND(PRIVKEY, KEY_RSA),
|
||||
PLUGIN_SDEPEND(PRIVKEY, KEY_ECDSA),
|
||||
PLUGIN_SDEPEND(PRIVKEY, KEY_DSA),
|
||||
PLUGIN_SDEPEND(PRIVKEY, KEY_BLISS),
|
||||
PLUGIN_SDEPEND(PRIVKEY, KEY_ED25519),
|
||||
PLUGIN_SDEPEND(PRIVKEY, KEY_ED448),
|
||||
PLUGIN_SDEPEND(CERT_DECODE, CERT_ANY),
|
||||
|
||||
Reference in New Issue
Block a user