summaryrefslogtreecommitdiffstats
path: root/crypto/openssl/ssl/s3_lib.c
diff options
context:
space:
mode:
authorcperciva <cperciva@FreeBSD.org>2009-12-03 09:18:40 +0000
committercperciva <cperciva@FreeBSD.org>2009-12-03 09:18:40 +0000
commite4106d9e8fc87e2ce9e3c00d81098c4ee822ec94 (patch)
tree634486f3b4fdeff7825df168fb7cdfa087556d06 /crypto/openssl/ssl/s3_lib.c
parent3cb9e82d646d4d75b9d93dd39dc387aac8732e8c (diff)
downloadFreeBSD-src-e4106d9e8fc87e2ce9e3c00d81098c4ee822ec94.zip
FreeBSD-src-e4106d9e8fc87e2ce9e3c00d81098c4ee822ec94.tar.gz
Disable SSL renegotiation in order to protect against a serious
protocol flaw. [09:15] Correctly handle failures from unsetenv resulting from a corrupt environment in rtld-elf. [09:16] Fix permissions in freebsd-update in order to prevent leakage of sensitive files. [09:17] Approved by: so (cperciva) Security: FreeBSD-SA-09:15.ssl Security: FreeBSD-SA-09:16.rtld Security: FreeBSD-SA-09:17.freebsd-udpate
Diffstat (limited to 'crypto/openssl/ssl/s3_lib.c')
-rw-r--r--crypto/openssl/ssl/s3_lib.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/crypto/openssl/ssl/s3_lib.c b/crypto/openssl/ssl/s3_lib.c
index 8916a0b..1b38f72 100644
--- a/crypto/openssl/ssl/s3_lib.c
+++ b/crypto/openssl/ssl/s3_lib.c
@@ -2592,6 +2592,9 @@ int ssl3_renegotiate(SSL *s)
if (s->s3->flags & SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS)
return(0);
+ if (1)
+ return(0);
+
s->s3->renegotiate=1;
return(1);
}
OpenPOWER on IntegriCloud