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

agent: Support signatures with Ed25519/Ed448 keys

Browse Source
This commit is contained in:
Tobias Brunner
2018-10-26 11:01:10 +02:00
parent 87dd08b139
commit 8f23e64ee5
1 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/plugins/agent/agent_private_key.c
+16 -5
View File
@@ -248,6 +248,12 @@ static bool scheme_supported(private_agent_private_key_t *this,
break; break;
} }
return FALSE; return FALSE;
case KEY_ED25519:
*prefix = "ssh-ed25519";
return scheme == SIGN_ED25519;
case KEY_ED448:
*prefix = "ssh-ed448";
return scheme == SIGN_ED448;
case KEY_ECDSA: case KEY_ECDSA:
return scheme == SIGN_ECDSA_256 || return scheme == SIGN_ECDSA_256 ||
scheme == SIGN_ECDSA_384 || scheme == SIGN_ECDSA_384 ||
@@ -261,6 +267,7 @@ METHOD(private_key_t, sign, bool,
private_agent_private_key_t *this, signature_scheme_t scheme, void *params, private_agent_private_key_t *this, signature_scheme_t scheme, void *params,
chunk_t data, chunk_t *signature) chunk_t data, chunk_t *signature)
{ {
key_type_t type;
uint32_t len, flags = 0; uint32_t len, flags = 0;
char buf[2048], *prefix = NULL; char buf[2048], *prefix = NULL;
chunk_t blob; chunk_t blob;
@@ -321,9 +328,9 @@ METHOD(private_key_t, sign, bool,
DBG1(DBG_LIB, "ssh-agent didn't return requested %s signature", prefix); DBG1(DBG_LIB, "ssh-agent didn't return requested %s signature", prefix);
return FALSE; return FALSE;
} }
type = this->pubkey->get_type(this->pubkey);
if (this->pubkey->get_type(this->pubkey) == KEY_RSA) if (type == KEY_RSA || type == KEY_ED25519 || type == KEY_ED448)
{ /* for RSA, the signature has no special encoding */ { /* for RSA/EdDSA, the signature has no special encoding */
blob = read_string(&blob); blob = read_string(&blob);
if (blob.len) if (blob.len)
{ {
@@ -429,12 +436,16 @@ static enumerator_t *create_rsa_enumerator(private_agent_private_key_t *this)
METHOD(private_key_t, supported_signature_schemes, enumerator_t*, METHOD(private_key_t, supported_signature_schemes, enumerator_t*,
private_agent_private_key_t *this) private_agent_private_key_t *this)
{ {
switch (get_type(this)) key_type_t type = get_type(this);
switch (type)
{ {
case KEY_RSA: case KEY_RSA:
return create_rsa_enumerator(this); return create_rsa_enumerator(this);
case KEY_ED25519:
case KEY_ED448:
case KEY_ECDSA: case KEY_ECDSA:
return signature_schemes_for_key(KEY_ECDSA, get_keysize(this)); return signature_schemes_for_key(type, get_keysize(this));
default: default:
break; break;
} }