jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

wolfSSL: Fix altSubjectName handling

Browse source 
Signed-off-by: Sean Parkinson <sean@wolfssl.com>
This commit is contained in:
Sean Parkinson 2018-03-29 14:55:55 +10:00 committed by Jouni Malinen
parent 7be462084e
commit ca620a3642
1 changed files with 0 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/crypto/tls_wolfssl.c
View file

@ -563,10 +563,6 @@ static int tls_connection_private_key(void *tls_ctx,
} }
#define GEN_EMAIL 1
#define GEN_DNS ALT_NAMES_OID
#define GEN_URI 6
static int tls_match_alt_subject_component(WOLFSSL_X509 *cert, int type, static int tls_match_alt_subject_component(WOLFSSL_X509 *cert, int type,
const char *value, size_t len) const char *value, size_t len)
{ {
@ -879,19 +875,16 @@ static void wolfssl_tls_cert_event(struct tls_connection *conn,
if (num_alt_subject == TLS_MAX_ALT_SUBJECT) if (num_alt_subject == TLS_MAX_ALT_SUBJECT)
break; break;
gen = wolfSSL_sk_value((void *) ext, i); gen = wolfSSL_sk_value((void *) ext, i);
#if 0
if (gen->type != GEN_EMAIL && if (gen->type != GEN_EMAIL &&
gen->type != GEN_DNS && gen->type != GEN_DNS &&
gen->type != GEN_URI) gen->type != GEN_URI)
continue; continue;
#endif
pos = os_malloc(10 + os_strlen((char *) gen->obj) + 1); pos = os_malloc(10 + os_strlen((char *) gen->obj) + 1);
if (!pos) if (!pos)
break; break;
alt_subject[num_alt_subject++] = pos; alt_subject[num_alt_subject++] = pos;
#if 0
switch (gen->type) { switch (gen->type) {
case GEN_EMAIL: case GEN_EMAIL:
os_memcpy(pos, "EMAIL:", 6); os_memcpy(pos, "EMAIL:", 6);
@ -906,10 +899,6 @@ static void wolfssl_tls_cert_event(struct tls_connection *conn,
pos += 4; pos += 4;
break; break;
} }
#else
os_memcpy(pos, "DNS:", 4);
pos += 4;
#endif
os_memcpy(pos, gen->obj, os_strlen((char *)gen->obj)); os_memcpy(pos, gen->obj, os_strlen((char *)gen->obj));
pos += os_strlen((char *)gen->obj); pos += os_strlen((char *)gen->obj);