summaryrefslogtreecommitdiffstats
path: root/lib/libssl/s3_lib.c
diff options
context:
space:
mode:
authormarkus <markus@openbsd.org>2009-11-10 09:09:40 +0000
committermarkus <markus@openbsd.org>2009-11-10 09:09:40 +0000
commit66a15954f5845cbbe38e8561ce13fc3bb20b68b8 (patch)
treef53091c24474a6910d6836e46486845d29db1196 /lib/libssl/s3_lib.c
parentfix typo: in the example use ``rate'' instead of ``sample_rate'', (diff)
downloadwireguard-openbsd-66a15954f5845cbbe38e8561ce13fc3bb20b68b8.tar.xz
wireguard-openbsd-66a15954f5845cbbe38e8561ce13fc3bb20b68b8.zip
pull Ben Lauries blind prefix injection fix for CVE-2009-3555 from
openssl 0.9.8l; crank minor version; ok djm@ deraadt@; initially from jsg@
Diffstat (limited to 'lib/libssl/s3_lib.c')
-rw-r--r--lib/libssl/s3_lib.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/libssl/s3_lib.c b/lib/libssl/s3_lib.c
index 8916a0b1b3c..5aa7bb21da1 100644
--- a/lib/libssl/s3_lib.c
+++ b/lib/libssl/s3_lib.c
@@ -2592,6 +2592,9 @@ int ssl3_renegotiate(SSL *s)
if (s->s3->flags & SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS)
return(0);
+ if (!(s->s3->flags & SSL3_FLAGS_ALLOW_UNSAFE_LEGACY_RENEGOTIATION))
+ return(0);
+
s->s3->renegotiate=1;
return(1);
}