diff options
| author | Markus Friedl <markus@cvs.openbsd.org> | 2002-09-14 11:18:05 +0000 |
|---|---|---|
| committer | Markus Friedl <markus@cvs.openbsd.org> | 2002-09-14 11:18:05 +0000 |
| commit | f4428d8101c504f427625270a1dfb1d4be89987f (patch) | |
| tree | ee462389672345f98c9a6edd8bbded5bb36bd3d0 /lib/libssl/s3_srvr.c | |
| parent | 7d5614b00acb8f7a6a52cac536b12db6326859c3 (diff) | |
merge with openssl-0.9.7-stable-SNAP-20020911,
new minor for libcrypto (_X509_REQ_print_ex)
tested by miod@, pb@
Diffstat (limited to 'lib/libssl/s3_srvr.c')
| -rw-r--r-- | lib/libssl/s3_srvr.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/libssl/s3_srvr.c b/lib/libssl/s3_srvr.c index dfffed7165e..2e1b0eb892b 100644 --- a/lib/libssl/s3_srvr.c +++ b/lib/libssl/s3_srvr.c @@ -966,7 +966,11 @@ static int ssl3_send_server_hello(SSL *s) s->session->session_id_length=0; sl=s->session->session_id_length; - die(sl <= sizeof s->session->session_id); + if (sl > sizeof s->session->session_id) + { + SSLerr(SSL_F_SSL3_SEND_SERVER_HELLO, ERR_R_INTERNAL_ERROR); + return -1; + } *(p++)=sl; memcpy(p,s->session->session_id,sl); p+=sl; |