summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2003-11-28 23:03:16 +0000
committerRichard Levitte <levitte@openssl.org>2003-11-28 23:03:16 +0000
commite57c110931b81548c9bf907dc7a8393726dc5dbd (patch)
treeba46b71ed54d6efcfd6c9363cff0fc6c9ebe86b2
parentbc4de7940fd3e897dcf09d69be3bd519469442a1 (diff)
RSA_size() and DH_size() return the amount of bytes in a key, and we
compared it to the amount of bits required... PR: 770 Submitted by: c zhang <czhang2005@hotmail.com>
-rw-r--r--ssl/s3_clnt.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c
index b98b79840a..9db9d7fe78 100644
--- a/ssl/s3_clnt.c
+++ b/ssl/s3_clnt.c
@@ -1786,7 +1786,7 @@ static int ssl3_check_cert_and_algorithm(SSL *s)
if (algs & SSL_kRSA)
{
if (rsa == NULL
- || RSA_size(rsa) > SSL_C_EXPORT_PKEYLENGTH(s->s3->tmp.new_cipher))
+ || RSA_size(rsa)*8 > SSL_C_EXPORT_PKEYLENGTH(s->s3->tmp.new_cipher))
{
SSLerr(SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM,SSL_R_MISSING_EXPORT_TMP_RSA_KEY);
goto f_err;
@@ -1798,7 +1798,7 @@ static int ssl3_check_cert_and_algorithm(SSL *s)
if (algs & (SSL_kEDH|SSL_kDHr|SSL_kDHd))
{
if (dh == NULL
- || DH_size(dh) > SSL_C_EXPORT_PKEYLENGTH(s->s3->tmp.new_cipher))
+ || DH_size(dh)*8 > SSL_C_EXPORT_PKEYLENGTH(s->s3->tmp.new_cipher))
{
SSLerr(SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM,SSL_R_MISSING_EXPORT_TMP_DH_KEY);
goto f_err;