diff options
Diffstat (limited to 'src/lib/libssl/s3_clnt.c')
-rw-r--r-- | src/lib/libssl/s3_clnt.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/libssl/s3_clnt.c b/src/lib/libssl/s3_clnt.c index 26ce0cb963..d51b60e343 100644 --- a/src/lib/libssl/s3_clnt.c +++ b/src/lib/libssl/s3_clnt.c | |||
@@ -168,7 +168,7 @@ int ssl3_connect(SSL *s) | |||
168 | long num1; | 168 | long num1; |
169 | void (*cb)(const SSL *ssl,int type,int val)=NULL; | 169 | void (*cb)(const SSL *ssl,int type,int val)=NULL; |
170 | int ret= -1; | 170 | int ret= -1; |
171 | int new_state,state,skip=0;; | 171 | int new_state,state,skip=0; |
172 | 172 | ||
173 | RAND_add(&Time,sizeof(Time),0); | 173 | RAND_add(&Time,sizeof(Time),0); |
174 | ERR_clear_error(); | 174 | ERR_clear_error(); |
@@ -1946,7 +1946,7 @@ static int ssl3_check_cert_and_algorithm(SSL *s) | |||
1946 | if (algs & SSL_kRSA) | 1946 | if (algs & SSL_kRSA) |
1947 | { | 1947 | { |
1948 | if (rsa == NULL | 1948 | if (rsa == NULL |
1949 | || RSA_size(rsa)*8 > SSL_C_EXPORT_PKEYLENGTH(s->s3->tmp.new_cipher)) | 1949 | || RSA_size(rsa) > SSL_C_EXPORT_PKEYLENGTH(s->s3->tmp.new_cipher)) |
1950 | { | 1950 | { |
1951 | SSLerr(SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM,SSL_R_MISSING_EXPORT_TMP_RSA_KEY); | 1951 | SSLerr(SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM,SSL_R_MISSING_EXPORT_TMP_RSA_KEY); |
1952 | goto f_err; | 1952 | goto f_err; |
@@ -1958,7 +1958,7 @@ static int ssl3_check_cert_and_algorithm(SSL *s) | |||
1958 | if (algs & (SSL_kEDH|SSL_kDHr|SSL_kDHd)) | 1958 | if (algs & (SSL_kEDH|SSL_kDHr|SSL_kDHd)) |
1959 | { | 1959 | { |
1960 | if (dh == NULL | 1960 | if (dh == NULL |
1961 | || DH_size(dh)*8 > SSL_C_EXPORT_PKEYLENGTH(s->s3->tmp.new_cipher)) | 1961 | || DH_size(dh) > SSL_C_EXPORT_PKEYLENGTH(s->s3->tmp.new_cipher)) |
1962 | { | 1962 | { |
1963 | SSLerr(SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM,SSL_R_MISSING_EXPORT_TMP_DH_KEY); | 1963 | SSLerr(SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM,SSL_R_MISSING_EXPORT_TMP_DH_KEY); |
1964 | goto f_err; | 1964 | goto f_err; |