patches for easier mirroring, to eliminate a special copy, to make www.freebsd.org/security a full copy of security.freebsd.org and be eventually be the same. For now files are just sitting there. The symlinks are missing. Discussed on: www (repository location) Discussed with: simon (so)
57 lines
1.9 KiB
Diff
57 lines
1.9 KiB
Diff
Index: crypto/openssl/ssl/s3_pkt.c
|
|
===================================================================
|
|
--- crypto/openssl/ssl/s3_pkt.c (revision 199950)
|
|
+++ crypto/openssl/ssl/s3_pkt.c (working copy)
|
|
@@ -983,9 +983,7 @@
|
|
if (s->msg_callback)
|
|
s->msg_callback(0, s->version, SSL3_RT_HANDSHAKE, s->s3->handshake_fragment, 4, s, s->msg_callback_arg);
|
|
|
|
- if (SSL_is_init_finished(s) &&
|
|
- !(s->s3->flags & SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS) &&
|
|
- !s->s3->renegotiate)
|
|
+ if (0)
|
|
{
|
|
ssl3_renegotiate(s);
|
|
if (ssl3_renegotiate_check(s))
|
|
@@ -1116,8 +1114,7 @@
|
|
/* Unexpected handshake message (Client Hello, or protocol violation) */
|
|
if ((s->s3->handshake_fragment_len >= 4) && !s->in_handshake)
|
|
{
|
|
- if (((s->state&SSL_ST_MASK) == SSL_ST_OK) &&
|
|
- !(s->s3->flags & SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS))
|
|
+ if (0)
|
|
{
|
|
#if 0 /* worked only because C operator preferences are not as expected (and
|
|
* because this is not really needed for clients except for detecting
|
|
Index: crypto/openssl/ssl/s3_srvr.c
|
|
===================================================================
|
|
--- crypto/openssl/ssl/s3_srvr.c (revision 199950)
|
|
+++ crypto/openssl/ssl/s3_srvr.c (working copy)
|
|
@@ -718,6 +718,13 @@
|
|
#endif
|
|
STACK_OF(SSL_CIPHER) *ciphers=NULL;
|
|
|
|
+ if (s->new_session)
|
|
+ {
|
|
+ al=SSL_AD_HANDSHAKE_FAILURE;
|
|
+ SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO, ERR_R_INTERNAL_ERROR);
|
|
+ goto f_err;
|
|
+ }
|
|
+
|
|
/* We do this so that we will respond with our native type.
|
|
* If we are TLSv1 and we get SSLv3, we will respond with TLSv1,
|
|
* This down switching should be handled by a different method.
|
|
Index: crypto/openssl/ssl/s3_lib.c
|
|
===================================================================
|
|
--- crypto/openssl/ssl/s3_lib.c (revision 199950)
|
|
+++ crypto/openssl/ssl/s3_lib.c (working copy)
|
|
@@ -2592,6 +2592,9 @@
|
|
if (s->s3->flags & SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS)
|
|
return(0);
|
|
|
|
+ if (1)
|
|
+ return(0);
|
|
+
|
|
s->s3->renegotiate=1;
|
|
return(1);
|
|
}
|