sharpetronics/strongswan
1
0
Fork 0
mirror of https://github.com/strongswan/strongswan.git synced 2025-11-27 00:00:29 -05:00
Code Issues Projects Releases Wiki Activity

if end id is missing assign IP address to raw public key

Browse Source
This commit is contained in:
Andreas Steffen 2009-12-09 07:24:43 +01:00
parent a07531250e
commit ee2679ec25
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/starter/starterwhack.c
View File

@ -226,13 +226,14 @@ starter_whack_add_pubkey (starter_conn_t *conn, starter_end_t *end
{ {
const char *err; const char *err;
static char keyspace[1024 + 4]; static char keyspace[1024 + 4];
char buf[ADDRTOT_BUF];
whack_message_t msg; whack_message_t msg;
init_whack_msg(&msg); init_whack_msg(&msg);
msg.whack_key = TRUE; msg.whack_key = TRUE;
msg.pubkey_alg = PUBKEY_ALG_RSA; msg.pubkey_alg = PUBKEY_ALG_RSA;
if (end->id && end->rsakey) if (end->rsakey)
{ {
/* special values to ignore */ /* special values to ignore */
if (streq(end->rsakey, "") if (streq(end->rsakey, "")
@ -242,18 +243,23 @@ starter_whack_add_pubkey (starter_conn_t *conn, starter_end_t *end
{ {
return 0; return 0;
} }
msg.keyid = end->id;
err = atobytes(end->rsakey, 0, keyspace, sizeof(keyspace), &msg.keyval.len); err = atobytes(end->rsakey, 0, keyspace, sizeof(keyspace), &msg.keyval.len);
if (err) if (err)
{ {
plog("conn %s/%s: rsakey malformed [%s]", connection_name(conn), lr, err); plog("conn %s/%s: rsakey malformed [%s]", connection_name(conn), lr, err);
return 1; return 1;
} }
if (end->id)
{
msg.keyid = end->id;
}
else else
{ {
msg.keyval.ptr = keyspace; addrtot(&end->addr, 0, buf, sizeof(buf));
return send_whack_msg(&msg); msg.keyid = buf;
} }
msg.keyval.ptr = keyspace;
return send_whack_msg(&msg);
} }
return 0; return 0;
} }