mirror of
https://abf.rosa.ru/djam/openssl.git
synced 2025-02-23 08:12:50 +00:00
112 lines
3.3 KiB
Diff
112 lines
3.3 KiB
Diff
|
|
http://cvs.openssl.org/chngview?cn=21337
|
|
|
|
diff -Naurp openssl-1.0.0d/ssl/d1_srvr.c openssl-1.0.0d.oden/ssl/d1_srvr.c
|
|
--- openssl-1.0.0d/ssl/d1_srvr.c 2010-02-01 16:49:42.000000000 +0000
|
|
+++ openssl-1.0.0d.oden/ssl/d1_srvr.c 2011-09-23 06:39:03.000000000 +0000
|
|
@@ -1017,12 +1017,11 @@ int dtls1_send_server_key_exchange(SSL *
|
|
SSLerr(SSL_F_DTLS1_SEND_SERVER_KEY_EXCHANGE,ERR_R_ECDH_LIB);
|
|
goto err;
|
|
}
|
|
- if (!EC_KEY_up_ref(ecdhp))
|
|
+ if ((ecdh = EC_KEY_dup(ecdhp)) == NULL)
|
|
{
|
|
SSLerr(SSL_F_DTLS1_SEND_SERVER_KEY_EXCHANGE,ERR_R_ECDH_LIB);
|
|
goto err;
|
|
}
|
|
- ecdh = ecdhp;
|
|
|
|
s->s3->tmp.ecdh=ecdh;
|
|
if ((EC_KEY_get0_public_key(ecdh) == NULL) ||
|
|
diff -Naurp openssl-1.0.0d/ssl/s3_lib.c openssl-1.0.0d.oden/ssl/s3_lib.c
|
|
--- openssl-1.0.0d/ssl/s3_lib.c 2009-10-16 15:24:19.000000000 +0000
|
|
+++ openssl-1.0.0d.oden/ssl/s3_lib.c 2011-09-23 06:39:03.000000000 +0000
|
|
@@ -2198,11 +2198,17 @@ void ssl3_clear(SSL *s)
|
|
}
|
|
#ifndef OPENSSL_NO_DH
|
|
if (s->s3->tmp.dh != NULL)
|
|
+ {
|
|
DH_free(s->s3->tmp.dh);
|
|
+ s->s3->tmp.dh = NULL;
|
|
+ }
|
|
#endif
|
|
#ifndef OPENSSL_NO_ECDH
|
|
if (s->s3->tmp.ecdh != NULL)
|
|
+ {
|
|
EC_KEY_free(s->s3->tmp.ecdh);
|
|
+ s->s3->tmp.ecdh = NULL;
|
|
+ }
|
|
#endif
|
|
|
|
rp = s->s3->rbuf.buf;
|
|
diff -Naurp openssl-1.0.0d/ssl/s3_srvr.c openssl-1.0.0d.oden/ssl/s3_srvr.c
|
|
--- openssl-1.0.0d/ssl/s3_srvr.c 2010-12-02 18:24:55.000000000 +0000
|
|
+++ openssl-1.0.0d.oden/ssl/s3_srvr.c 2011-09-23 06:39:03.000000000 +0000
|
|
@@ -768,9 +768,7 @@ int ssl3_check_client_hello(SSL *s)
|
|
if (s->s3->tmp.message_type == SSL3_MT_CLIENT_HELLO)
|
|
{
|
|
/* Throw away what we have done so far in the current handshake,
|
|
- * which will now be aborted. (A full SSL_clear would be too much.)
|
|
- * I hope that tmp.dh is the only thing that may need to be cleared
|
|
- * when a handshake is not completed ... */
|
|
+ * which will now be aborted. (A full SSL_clear would be too much.) */
|
|
#ifndef OPENSSL_NO_DH
|
|
if (s->s3->tmp.dh != NULL)
|
|
{
|
|
@@ -778,6 +776,13 @@ int ssl3_check_client_hello(SSL *s)
|
|
s->s3->tmp.dh = NULL;
|
|
}
|
|
#endif
|
|
+#ifndef OPENSSL_NO_ECDH
|
|
+ if (s->s3->tmp.ecdh != NULL)
|
|
+ {
|
|
+ EC_KEY_free(s->s3->tmp.ecdh);
|
|
+ s->s3->tmp.ecdh = NULL;
|
|
+ }
|
|
+#endif
|
|
return 2;
|
|
}
|
|
return 1;
|
|
@@ -1491,7 +1496,6 @@ int ssl3_send_server_key_exchange(SSL *s
|
|
|
|
if (s->s3->tmp.dh != NULL)
|
|
{
|
|
- DH_free(dh);
|
|
SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE, ERR_R_INTERNAL_ERROR);
|
|
goto err;
|
|
}
|
|
@@ -1552,7 +1556,6 @@ int ssl3_send_server_key_exchange(SSL *s
|
|
|
|
if (s->s3->tmp.ecdh != NULL)
|
|
{
|
|
- EC_KEY_free(s->s3->tmp.ecdh);
|
|
SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE, ERR_R_INTERNAL_ERROR);
|
|
goto err;
|
|
}
|
|
@@ -1563,12 +1566,11 @@ int ssl3_send_server_key_exchange(SSL *s
|
|
SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,ERR_R_ECDH_LIB);
|
|
goto err;
|
|
}
|
|
- if (!EC_KEY_up_ref(ecdhp))
|
|
+ if ((ecdh = EC_KEY_dup(ecdhp)) == NULL)
|
|
{
|
|
SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,ERR_R_ECDH_LIB);
|
|
goto err;
|
|
}
|
|
- ecdh = ecdhp;
|
|
|
|
s->s3->tmp.ecdh=ecdh;
|
|
if ((EC_KEY_get0_public_key(ecdh) == NULL) ||
|
|
@@ -2440,6 +2442,12 @@ int ssl3_get_client_key_exchange(SSL *s)
|
|
/* Get encoded point length */
|
|
i = *p;
|
|
p += 1;
|
|
+ if (n != 1 + i)
|
|
+ {
|
|
+ SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,
|
|
+ ERR_R_EC_LIB);
|
|
+ goto err;
|
|
+ }
|
|
if (EC_POINT_oct2point(group,
|
|
clnt_ecpoint, p, i, bn_ctx) == 0)
|
|
{
|