Fix SSL memory handlig for (EC)DH cipher suites, in particular for
multi-threaded use of ECDH. Security: CVE-2011-3210 Reviewed by: stas Obtained from: OpenSSL CVS Approved by: re (kib)
This commit is contained in:
parent
6a0a87741b
commit
dfdd332056
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=225446
@ -1722,11 +1722,17 @@ void ssl3_clear(SSL *s)
|
|||||||
}
|
}
|
||||||
#ifndef OPENSSL_NO_DH
|
#ifndef OPENSSL_NO_DH
|
||||||
if (s->s3->tmp.dh != NULL)
|
if (s->s3->tmp.dh != NULL)
|
||||||
|
{
|
||||||
DH_free(s->s3->tmp.dh);
|
DH_free(s->s3->tmp.dh);
|
||||||
|
s->s3->tmp.dh = NULL;
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
#ifndef OPENSSL_NO_ECDH
|
#ifndef OPENSSL_NO_ECDH
|
||||||
if (s->s3->tmp.ecdh != NULL)
|
if (s->s3->tmp.ecdh != NULL)
|
||||||
|
{
|
||||||
EC_KEY_free(s->s3->tmp.ecdh);
|
EC_KEY_free(s->s3->tmp.ecdh);
|
||||||
|
s->s3->tmp.ecdh = NULL;
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
rp = s->s3->rbuf.buf;
|
rp = s->s3->rbuf.buf;
|
||||||
|
@ -710,15 +710,20 @@ int ssl3_check_client_hello(SSL *s)
|
|||||||
if (s->s3->tmp.message_type == SSL3_MT_CLIENT_HELLO)
|
if (s->s3->tmp.message_type == SSL3_MT_CLIENT_HELLO)
|
||||||
{
|
{
|
||||||
/* Throw away what we have done so far in the current handshake,
|
/* 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.)
|
* 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 ... */
|
|
||||||
#ifndef OPENSSL_NO_DH
|
#ifndef OPENSSL_NO_DH
|
||||||
if (s->s3->tmp.dh != NULL)
|
if (s->s3->tmp.dh != NULL)
|
||||||
{
|
{
|
||||||
DH_free(s->s3->tmp.dh);
|
DH_free(s->s3->tmp.dh);
|
||||||
s->s3->tmp.dh = NULL;
|
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
|
#endif
|
||||||
return 2;
|
return 2;
|
||||||
}
|
}
|
||||||
@ -1329,7 +1334,6 @@ int ssl3_send_server_key_exchange(SSL *s)
|
|||||||
|
|
||||||
if (s->s3->tmp.dh != NULL)
|
if (s->s3->tmp.dh != NULL)
|
||||||
{
|
{
|
||||||
DH_free(dh);
|
|
||||||
SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE, ERR_R_INTERNAL_ERROR);
|
SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE, ERR_R_INTERNAL_ERROR);
|
||||||
goto err;
|
goto err;
|
||||||
}
|
}
|
||||||
@ -1390,7 +1394,6 @@ int ssl3_send_server_key_exchange(SSL *s)
|
|||||||
|
|
||||||
if (s->s3->tmp.ecdh != NULL)
|
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);
|
SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE, ERR_R_INTERNAL_ERROR);
|
||||||
goto err;
|
goto err;
|
||||||
}
|
}
|
||||||
@ -1401,12 +1404,11 @@ int ssl3_send_server_key_exchange(SSL *s)
|
|||||||
SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,ERR_R_ECDH_LIB);
|
SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,ERR_R_ECDH_LIB);
|
||||||
goto err;
|
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);
|
SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,ERR_R_ECDH_LIB);
|
||||||
goto err;
|
goto err;
|
||||||
}
|
}
|
||||||
ecdh = ecdhp;
|
|
||||||
|
|
||||||
s->s3->tmp.ecdh=ecdh;
|
s->s3->tmp.ecdh=ecdh;
|
||||||
if ((EC_KEY_get0_public_key(ecdh) == NULL) ||
|
if ((EC_KEY_get0_public_key(ecdh) == NULL) ||
|
||||||
@ -2262,6 +2264,12 @@ int ssl3_get_client_key_exchange(SSL *s)
|
|||||||
/* Get encoded point length */
|
/* Get encoded point length */
|
||||||
i = *p;
|
i = *p;
|
||||||
p += 1;
|
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,
|
if (EC_POINT_oct2point(group,
|
||||||
clnt_ecpoint, p, i, bn_ctx) == 0)
|
clnt_ecpoint, p, i, bn_ctx) == 0)
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user