diff options
| author | Parménides GV <parmegv@sdf.org> | 2014-12-12 18:02:40 +0100 |
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2014-12-12 18:04:08 +0100 |
| commit | 97aded26654ede8204a313dd6967b678a72a2a10 (patch) | |
| tree | 5c519d75774eff664df41881777cbae171caddf5 /app/openssl/ssl/d1_srvr.c | |
| parent | 0e7e4005460964cf8dac080e3d99e1df2a1bdc4d (diff) | |
Updated ics-openvpn to last rev 14 Nov 2014.
Material design!
It still doesn't run properly on my tablet, openvpn keeps getting down
and exiting.
Diffstat (limited to 'app/openssl/ssl/d1_srvr.c')
| -rw-r--r-- | app/openssl/ssl/d1_srvr.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/app/openssl/ssl/d1_srvr.c b/app/openssl/ssl/d1_srvr.c index c181db6d..03b20a27 100644 --- a/app/openssl/ssl/d1_srvr.c +++ b/app/openssl/ssl/d1_srvr.c @@ -598,10 +598,11 @@ int dtls1_accept(SSL *s) s->state = SSL3_ST_SR_CLNT_HELLO_C; } else { - /* could be sent for a DH cert, even if we - * have not asked for it :-) */ - ret=ssl3_get_client_certificate(s); - if (ret <= 0) goto end; + if (s->s3->tmp.cert_request) + { + ret=ssl3_get_client_certificate(s); + if (ret <= 0) goto end; + } s->init_num=0; s->state=SSL3_ST_SR_KEY_EXCH_A; } @@ -980,6 +981,11 @@ int dtls1_send_server_hello(SSL *s) #endif #ifndef OPENSSL_NO_TLSEXT + if (ssl_prepare_serverhello_tlsext(s) <= 0) + { + SSLerr(SSL_F_DTLS1_SEND_SERVER_HELLO,SSL_R_SERVERHELLO_TLSEXT); + return -1; + } if ((p = ssl_add_serverhello_tlsext(s, p, buf+SSL3_RT_MAX_PLAIN_LENGTH)) == NULL) { SSLerr(SSL_F_DTLS1_SEND_SERVER_HELLO,ERR_R_INTERNAL_ERROR); |