diff options
| author | Martin Willi <martin@revosec.ch> | 2012-10-01 15:13:49 +0200 |
|---|---|---|
| committer | Martin Willi <martin@revosec.ch> | 2012-10-16 13:43:54 +0200 |
| commit | 5359c7a437335449f73fb4b66c7b6ba938095c15 (patch) | |
| tree | d03648bb1388d1a5a5881a249bce2f99b3da53db /src/libcharon/plugins/load_tester/load_tester_creds.c | |
| parent | 562b89ccee57a006241789bb6589f336d0b2ad67 (diff) | |
| download | strongswan-5359c7a437335449f73fb4b66c7b6ba938095c15.tar.bz2 strongswan-5359c7a437335449f73fb4b66c7b6ba938095c15.tar.xz | |
Encode non-DN load-tester identities as subjectAltNames
Diffstat (limited to 'src/libcharon/plugins/load_tester/load_tester_creds.c')
| -rw-r--r-- | src/libcharon/plugins/load_tester/load_tester_creds.c | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/src/libcharon/plugins/load_tester/load_tester_creds.c b/src/libcharon/plugins/load_tester/load_tester_creds.c index 751dfc5ed..b42389685 100644 --- a/src/libcharon/plugins/load_tester/load_tester_creds.c +++ b/src/libcharon/plugins/load_tester/load_tester_creds.c @@ -299,6 +299,9 @@ METHOD(credential_set_t, create_cert_enumerator, enumerator_t*, enumerator_t *enumerator; certificate_t *peer_cert, *ca_cert; public_key_t *peer_key, *ca_key; + identification_t *dn = NULL; + linked_list_t *sans; + char buf[128]; u_int32_t serial; time_t now; @@ -344,18 +347,30 @@ METHOD(credential_set_t, create_cert_enumerator, enumerator_t*, /* peer certificate, generate on demand */ serial = htonl(++this->serial); now = time(NULL); + + sans = linked_list_create(); + if (id->get_type(id) != ID_DER_ASN1_DN) + { /* encode as subjectAltName, construct a sane DN */ + sans->insert_last(sans, id); + snprintf(buf, sizeof(buf), "CN=%Y", id); + dn = identification_create_from_string(buf); + } + peer_key = this->private->get_public_key(this->private); peer_cert = lib->creds->create(lib->creds, CRED_CERTIFICATE, CERT_X509, BUILD_SIGNING_KEY, this->private, BUILD_SIGNING_CERT, this->ca, BUILD_DIGEST_ALG, this->digest, BUILD_PUBLIC_KEY, peer_key, - BUILD_SUBJECT, id, + BUILD_SUBJECT, dn ?: id, + BUILD_SUBJECT_ALTNAMES, sans, BUILD_NOT_BEFORE_TIME, now - 60 * 60 * 24, BUILD_NOT_AFTER_TIME, now + 60 * 60 * 24, BUILD_SERIAL, chunk_from_thing(serial), BUILD_END); peer_key->destroy(peer_key); + sans->destroy(sans); + DESTROY_IF(dn); if (peer_cert) { return enumerator_create_single(peer_cert, (void*)peer_cert->destroy); |