generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix kerberos ciphersuite bugs introduced with PR:1336.

Browse Source
This commit is contained in:
Dr. Stephen Henson 2007-03-09 14:06:34 +00:00
parent 3370b694b9
commit 295de18c8a
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ssl/s3_clnt.c
View File

@ -821,7 +821,9 @@ int ssl3_get_server_certificate(SSL *s)
if (!ok) return((int)n); if (!ok) return((int)n);
if (s->s3->tmp.message_type == SSL3_MT_SERVER_KEY_EXCHANGE) if ((s->s3->tmp.message_type == SSL3_MT_SERVER_KEY_EXCHANGE) ||
((s->s3->tmp.new_cipher->algorithms & SSL_aKRB5) &&
(s->s3->tmp.message_type == SSL3_MT_SERVER_DONE)))
{ {
s->s3->tmp.reuse_message=1; s->s3->tmp.reuse_message=1;
return(1); return(1);
@ -2292,18 +2294,18 @@ int ssl3_check_cert_and_algorithm(SSL *s)
sc=s->session->sess_cert; sc=s->session->sess_cert;
if (sc == NULL)
{
SSLerr(SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM,ERR_R_INTERNAL_ERROR);
goto err;
}
algs=s->s3->tmp.new_cipher->algorithms; algs=s->s3->tmp.new_cipher->algorithms;
/* we don't have a certificate */ /* we don't have a certificate */
if (algs & (SSL_aDH|SSL_aNULL|SSL_aKRB5)) if (algs & (SSL_aDH|SSL_aNULL|SSL_aKRB5))
return(1); return(1);
if (sc == NULL)
{
SSLerr(SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM,ERR_R_INTERNAL_ERROR);
goto err;
}
#ifndef OPENSSL_NO_RSA #ifndef OPENSSL_NO_RSA
rsa=s->session->sess_cert->peer_rsa_tmp; rsa=s->session->sess_cert->peer_rsa_tmp;
#endif #endif

5
ssl/s3_srvr.c
View File

@ -1997,7 +1997,7 @@ int ssl3_get_client_key_exchange(SSL *s)
SSL_R_DATA_LENGTH_TOO_LONG); SSL_R_DATA_LENGTH_TOO_LONG);
goto err; goto err;
} }
if (!((p[0] == (s->client_version>>8)) && (p[1] == (s->client_version & 0xff)))) if (!((pms[0] == (s->client_version>>8)) && (pms[1] == (s->client_version & 0xff))))
{ {
/* The premaster secret must contain the same version number as the /* The premaster secret must contain the same version number as the
* ClientHello to detect version rollback attacks (strangely, the * ClientHello to detect version rollback attacks (strangely, the
@ -2007,8 +2007,7 @@ int ssl3_get_client_key_exchange(SSL *s)
* If SSL_OP_TLS_ROLLBACK_BUG is set, tolerate such clients. * If SSL_OP_TLS_ROLLBACK_BUG is set, tolerate such clients.
* (Perhaps we should have a separate BUG value for the Kerberos cipher) * (Perhaps we should have a separate BUG value for the Kerberos cipher)
*/ */
if (!((s->options & SSL_OP_TLS_ROLLBACK_BUG) && if (!(s->options & SSL_OP_TLS_ROLLBACK_BUG))
(p[0] == (s->version>>8)) && (p[1] == (s->version & 0xff))))
{ {
SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE, SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,
SSL_AD_DECODE_ERROR); SSL_AD_DECODE_ERROR);