mirror of
https://abf.rosa.ru/djam/openssl.git
synced 2025-02-23 16:22:50 +00:00
97 lines
4.1 KiB
Diff
97 lines
4.1 KiB
Diff
|
|
http://cvs.openssl.org/chngview?cn=21927
|
|
http://cvs.openssl.org/chngview?cn=21930
|
|
|
|
diff -Naurp openssl-1.0.0a/ssl/s3_srvr.c openssl-1.0.0a.oden/ssl/s3_srvr.c
|
|
--- openssl-1.0.0a/ssl/s3_srvr.c 2012-01-09 14:49:57.000000000 +0000
|
|
+++ openssl-1.0.0a.oden/ssl/s3_srvr.c 2012-01-09 14:53:04.000000000 +0000
|
|
@@ -258,6 +258,7 @@ int ssl3_accept(SSL *s)
|
|
}
|
|
|
|
s->init_num=0;
|
|
+ s->s3->flags &= ~SSL3_FLAGS_SGC_RESTART_DONE;
|
|
|
|
if (s->state != SSL_ST_RENEGOTIATE)
|
|
{
|
|
@@ -755,6 +756,14 @@ int ssl3_check_client_hello(SSL *s)
|
|
int ok;
|
|
long n;
|
|
|
|
+ /* We only allow the client to restart the handshake once per
|
|
+ * negotiation. */
|
|
+ if (s->s3->flags & SSL3_FLAGS_SGC_RESTART_DONE)
|
|
+ {
|
|
+ SSLerr(SSL_F_SSL3_CHECK_CLIENT_HELLO, SSL_R_MULTIPLE_SGC_RESTARTS);
|
|
+ return -1;
|
|
+ }
|
|
+
|
|
/* this function is called when we really expect a Certificate message,
|
|
* so permit appropriate message length */
|
|
n=s->method->ssl_get_message(s,
|
|
@@ -783,6 +792,7 @@ int ssl3_check_client_hello(SSL *s)
|
|
s->s3->tmp.ecdh = NULL;
|
|
}
|
|
#endif
|
|
+ s->s3->flags |= SSL3_FLAGS_SGC_RESTART_DONE;
|
|
return 2;
|
|
}
|
|
return 1;
|
|
diff -Naurp openssl-1.0.0a/ssl/ssl.h openssl-1.0.0a.oden/ssl/ssl.h
|
|
--- openssl-1.0.0a/ssl/ssl.h 2010-01-06 17:37:38.000000000 +0000
|
|
+++ openssl-1.0.0a.oden/ssl/ssl.h 2012-01-09 14:53:04.000000000 +0000
|
|
@@ -1882,6 +1882,7 @@ void ERR_load_SSL_strings(void);
|
|
#define SSL_F_SSL3_CALLBACK_CTRL 233
|
|
#define SSL_F_SSL3_CHANGE_CIPHER_STATE 129
|
|
#define SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM 130
|
|
+#define SSL_F_SSL3_CHECK_CLIENT_HELLO 304
|
|
#define SSL_F_SSL3_CLIENT_HELLO 131
|
|
#define SSL_F_SSL3_CONNECT 132
|
|
#define SSL_F_SSL3_CTRL 213
|
|
@@ -2139,6 +2140,7 @@ void ERR_load_SSL_strings(void);
|
|
#define SSL_R_MISSING_TMP_RSA_KEY 172
|
|
#define SSL_R_MISSING_TMP_RSA_PKEY 173
|
|
#define SSL_R_MISSING_VERIFY_MESSAGE 174
|
|
+#define SSL_R_MULTIPLE_SGC_RESTARTS 346
|
|
#define SSL_R_NON_SSLV2_INITIAL_PACKET 175
|
|
#define SSL_R_NO_CERTIFICATES_RETURNED 176
|
|
#define SSL_R_NO_CERTIFICATE_ASSIGNED 177
|
|
diff -Naurp openssl-1.0.0a/ssl/ssl3.h openssl-1.0.0a.oden/ssl/ssl3.h
|
|
--- openssl-1.0.0a/ssl/ssl3.h 2010-01-06 17:37:38.000000000 +0000
|
|
+++ openssl-1.0.0a.oden/ssl/ssl3.h 2012-01-09 14:53:07.000000000 +0000
|
|
@@ -379,6 +379,17 @@ typedef struct ssl3_buffer_st
|
|
#define SSL3_FLAGS_POP_BUFFER 0x0004
|
|
#define TLS1_FLAGS_TLS_PADDING_BUG 0x0008
|
|
#define TLS1_FLAGS_SKIP_CERT_VERIFY 0x0010
|
|
+
|
|
+/* SSL3_FLAGS_SGC_RESTART_DONE is set when we
|
|
+ * restart a handshake because of MS SGC and so prevents us
|
|
+ * from restarting the handshake in a loop. It's reset on a
|
|
+ * renegotiation, so effectively limits the client to one restart
|
|
+ * per negotiation. This limits the possibility of a DDoS
|
|
+ * attack where the client handshakes in a loop using SGC to
|
|
+ * restart. Servers which permit renegotiation can still be
|
|
+ * effected, but we can't prevent that.
|
|
+ */
|
|
+#define SSL3_FLAGS_SGC_RESTART_DONE 0x0040
|
|
|
|
typedef struct ssl3_state_st
|
|
{
|
|
diff -Naurp openssl-1.0.0a/ssl/ssl_err.c openssl-1.0.0a.oden/ssl/ssl_err.c
|
|
--- openssl-1.0.0a/ssl/ssl_err.c 2010-01-06 17:37:38.000000000 +0000
|
|
+++ openssl-1.0.0a.oden/ssl/ssl_err.c 2012-01-09 14:53:04.000000000 +0000
|
|
@@ -137,6 +137,7 @@ static ERR_STRING_DATA SSL_str_functs[]=
|
|
{ERR_FUNC(SSL_F_SSL3_CALLBACK_CTRL), "SSL3_CALLBACK_CTRL"},
|
|
{ERR_FUNC(SSL_F_SSL3_CHANGE_CIPHER_STATE), "SSL3_CHANGE_CIPHER_STATE"},
|
|
{ERR_FUNC(SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM), "SSL3_CHECK_CERT_AND_ALGORITHM"},
|
|
+{ERR_FUNC(SSL_F_SSL3_CHECK_CLIENT_HELLO), "SSL3_CHECK_CLIENT_HELLO"},
|
|
{ERR_FUNC(SSL_F_SSL3_CLIENT_HELLO), "SSL3_CLIENT_HELLO"},
|
|
{ERR_FUNC(SSL_F_SSL3_CONNECT), "SSL3_CONNECT"},
|
|
{ERR_FUNC(SSL_F_SSL3_CTRL), "SSL3_CTRL"},
|
|
@@ -397,6 +398,7 @@ static ERR_STRING_DATA SSL_str_reasons[]
|
|
{ERR_REASON(SSL_R_MISSING_TMP_RSA_KEY) ,"missing tmp rsa key"},
|
|
{ERR_REASON(SSL_R_MISSING_TMP_RSA_PKEY) ,"missing tmp rsa pkey"},
|
|
{ERR_REASON(SSL_R_MISSING_VERIFY_MESSAGE),"missing verify message"},
|
|
+{ERR_REASON(SSL_R_MULTIPLE_SGC_RESTARTS) ,"multiple sgc restarts"},
|
|
{ERR_REASON(SSL_R_NON_SSLV2_INITIAL_PACKET),"non sslv2 initial packet"},
|
|
{ERR_REASON(SSL_R_NO_CERTIFICATES_RETURNED),"no certificates returned"},
|
|
{ERR_REASON(SSL_R_NO_CERTIFICATE_ASSIGNED),"no certificate assigned"},
|