diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2009-12-01 17:41:42 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2009-12-01 17:41:42 +0000 |
| commit | d5b8c464991797946aca0f3c5c42ddcd5cd8f7df (patch) | |
| tree | 289c95af28f0228620fbcfb0eb002a30cfdb2839 /ssl/d1_srvr.c | |
| parent | 7805e23588be0a8351c0d72a92767fb758f6f9f5 (diff) | |
PR: 2115
Submitted by: Robin Seggelmann <seggelmann@fh-muenster.de>
Approved by: steve@openssl.org
Add Renegotiation extension to DTLS, fix DTLS ClientHello processing bug.
Diffstat (limited to 'ssl/d1_srvr.c')
| -rw-r--r-- | ssl/d1_srvr.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/ssl/d1_srvr.c b/ssl/d1_srvr.c index d79fb1985e..cbef062130 100644 --- a/ssl/d1_srvr.c +++ b/ssl/d1_srvr.c @@ -749,6 +749,8 @@ int dtls1_send_server_hello(SSL *s) p+=sl; /* put the cipher */ + if (s->s3->tmp.new_cipher == NULL) + return -1; i=ssl3_put_cipher_by_char(s->s3->tmp.new_cipher,p); p+=i; @@ -762,6 +764,14 @@ int dtls1_send_server_hello(SSL *s) *(p++)=s->s3->tmp.new_compression->id; #endif +#ifndef OPENSSL_NO_TLSEXT + if ((p = ssl_add_serverhello_dtlsext(s, p, buf+SSL3_RT_MAX_PLAIN_LENGTH)) == NULL) + { + SSLerr(SSL_F_SSL3_SEND_SERVER_HELLO,ERR_R_INTERNAL_ERROR); + return -1; + } +#endif + /* do the header */ l=(p-d); d=buf; |