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

pt-tls-client: Added support of ECDSA keys

Browse Source
This commit is contained in:
Andreas Steffen
2016-08-31 17:06:47 +02:00
parent 288ee54875
commit de44fd748a
1 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pt-tls-client/pt-tls-client.c
+23 -7
View File
@@ -42,7 +42,7 @@ static void usage(FILE *out)
{ {
fprintf(out, fprintf(out,
"Usage: pt-tls --connect <hostname|address> [--port <port>]\n" "Usage: pt-tls --connect <hostname|address> [--port <port>]\n"
" [--cert <file>]+ [--key <file>]\n" " [--cert <file>]+ [--key <file>] [--key-type rsa|ecdsa]\n"
" [--client <client-id>] [--secret <password>]\n" " [--client <client-id>] [--secret <password>]\n"
" [--optionsfrom <filename>] [--quiet] [--debug <level>]\n"); " [--optionsfrom <filename>] [--quiet] [--debug <level>]\n");
} }
@@ -121,11 +121,11 @@ static bool load_certificate(char *filename)
/** /**
* Load private key from file * Load private key from file
*/ */
static bool load_key(char *filename) static bool load_key(char *filename, key_type_t type)
{ {
private_key_t *key; private_key_t *key;
key = lib->creds->create(lib->creds, CRED_PRIVATE_KEY, KEY_RSA, key = lib->creds->create(lib->creds, CRED_PRIVATE_KEY, type,
BUILD_FROM_FILE, filename, BUILD_END); BUILD_FROM_FILE, filename, BUILD_END);
if (!key) if (!key)
{ {
@@ -255,7 +255,8 @@ static void init()
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
char *address = NULL, *identity = "%any", *secret = NULL; char *address = NULL, *identity = "%any", *secret = NULL, *key_file = NULL;
key_type_t key_type = KEY_RSA;
int port = PT_TLS_PORT; int port = PT_TLS_PORT;
init(); init();
@@ -270,6 +271,7 @@ int main(int argc, char *argv[])
{"port", required_argument, NULL, 'p' }, {"port", required_argument, NULL, 'p' },
{"cert", required_argument, NULL, 'x' }, {"cert", required_argument, NULL, 'x' },
{"key", required_argument, NULL, 'k' }, {"key", required_argument, NULL, 'k' },
{"key-type", required_argument, NULL, 't' },
{"mutual", no_argument, NULL, 'm' }, {"mutual", no_argument, NULL, 'm' },
{"quiet", no_argument, NULL, 'q' }, {"quiet", no_argument, NULL, 'q' },
{"debug", required_argument, NULL, 'd' }, {"debug", required_argument, NULL, 'd' },
@@ -290,9 +292,20 @@ int main(int argc, char *argv[])
} }
continue; continue;
case 'k': /* --key <file> */ case 'k': /* --key <file> */
if (!load_key(optarg)) key_file = optarg;
continue;
case 't': /* --key-type <type> */
if (strcaseeq(optarg, "ecdsa"))
{ {
return 1; key_type = KEY_ECDSA;
}
else if (strcaseeq(optarg, "rsa"))
{
key_type = KEY_RSA;
}
else
{
key_type = KEY_ANY;
} }
continue; continue;
case 'c': /* --connect <hostname|address> */ case 'c': /* --connect <hostname|address> */
@@ -339,12 +352,15 @@ int main(int argc, char *argv[])
usage(stderr); usage(stderr);
return 1; return 1;
} }
if (key_file && !load_key(key_file, key_type))
{
return 1;
}
if (secret) if (secret)
{ {
creds->add_shared(creds, shared_key_create(SHARED_EAP, creds->add_shared(creds, shared_key_create(SHARED_EAP,
chunk_clone(chunk_from_str(secret))), chunk_clone(chunk_from_str(secret))),
identification_create_from_string(identity), NULL); identification_create_from_string(identity), NULL);
} }
return client(address, port, identity); return client(address, port, identity);
} }