summaryrefslogtreecommitdiffstats
path: root/lib/libssl/s3_srvr.c
diff options
context:
space:
mode:
authormarkus <markus@openbsd.org>2002-09-14 11:18:01 +0000
committermarkus <markus@openbsd.org>2002-09-14 11:18:01 +0000
commitcf5de1f602bfe31a1de0d5bcba280f0bf0a50ae2 (patch)
tree2658bb71397039b6e8ea6265a0bfe5a109de2a64 /lib/libssl/s3_srvr.c
parentspaces (diff)
downloadwireguard-openbsd-cf5de1f602bfe31a1de0d5bcba280f0bf0a50ae2.tar.xz
wireguard-openbsd-cf5de1f602bfe31a1de0d5bcba280f0bf0a50ae2.zip
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.c6
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;