diff options
| author | markus <> | 2004-04-08 08:03:15 +0000 |
|---|---|---|
| committer | markus <> | 2004-04-08 08:03:15 +0000 |
| commit | 40d673554117d24c9f46be721235d3e302c06e04 (patch) | |
| tree | 341e7f38b840f3e503afb6e471123c0f2ba082c3 /src/lib/libssl/s3_clnt.c | |
| parent | cbf88de39286be06cd20e0c65b6cb7633dce25a5 (diff) | |
| download | openbsd-40d673554117d24c9f46be721235d3e302c06e04.tar.gz openbsd-40d673554117d24c9f46be721235d3e302c06e04.tar.bz2 openbsd-40d673554117d24c9f46be721235d3e302c06e04.zip | |
merge 0.9.7d
Diffstat (limited to 'src/lib/libssl/s3_clnt.c')
| -rw-r--r-- | src/lib/libssl/s3_clnt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/libssl/s3_clnt.c b/src/lib/libssl/s3_clnt.c index d51b60e343..36f4a8b4c3 100644 --- a/src/lib/libssl/s3_clnt.c +++ b/src/lib/libssl/s3_clnt.c | |||
| @@ -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) > SSL_C_EXPORT_PKEYLENGTH(s->s3->tmp.new_cipher)) | 1949 | || RSA_size(rsa)*8 > 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) > SSL_C_EXPORT_PKEYLENGTH(s->s3->tmp.new_cipher)) | 1961 | || DH_size(dh)*8 > 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; |