From bab534057b855a7dbf98261d494897b3542bd9d5 Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Wed, 7 Jan 2009 23:44:27 +0000 Subject: [PATCH] Updatde from stable branch. --- CHANGES | 6 +++++- apps/speed.c | 2 +- apps/spkac.c | 2 +- apps/verify.c | 3 +-- apps/x509.c | 2 +- crypto/camellia/.cvsignore | 1 + ssl/s2_clnt.c | 2 +- ssl/s2_srvr.c | 4 ++-- ssl/s3_clnt.c | 6 +++--- ssl/s3_srvr.c | 2 +- ssl/ssltest.c | 2 +- 11 files changed, 18 insertions(+), 14 deletions(-) diff --git a/CHANGES b/CHANGES index 213927b375..dce8985ad8 100644 --- a/CHANGES +++ b/CHANGES @@ -727,7 +727,11 @@ *) Change 'Configure' script to enable Camellia by default. [NTT] - Changes between 0.9.8i and 0.9.8j [xx XXX xxxx] + Changes between 0.9.8i and 0.9.8j [07 Jan 2009] + + *) Properly check EVP_VerifyFinal() and similar return values + (CVE-2008-5077). + [Ben Laurie, Bodo Moeller, Google Security Team] *) Allow the CHIL engine to be loaded, whether the application is multithreaded or not. (This does not release the developer from the diff --git a/apps/speed.c b/apps/speed.c index 209c0e6464..1bd2ce264c 100644 --- a/apps/speed.c +++ b/apps/speed.c @@ -1994,7 +1994,7 @@ int MAIN(int argc, char **argv) { ret=RSA_verify(NID_md5_sha1, buf,36, buf2, rsa_num, rsa_key[j]); - if (ret == 0) + if (ret <= 0) { BIO_printf(bio_err, "RSA verify failure\n"); diff --git a/apps/spkac.c b/apps/spkac.c index ae2d88694f..0e01ea9947 100644 --- a/apps/spkac.c +++ b/apps/spkac.c @@ -285,7 +285,7 @@ bad: pkey = NETSCAPE_SPKI_get_pubkey(spki); if(verify) { i = NETSCAPE_SPKI_verify(spki, pkey); - if(i) BIO_printf(bio_err, "Signature OK\n"); + if (i > 0) BIO_printf(bio_err, "Signature OK\n"); else { BIO_printf(bio_err, "Signature Failure\n"); ERR_print_errors(bio_err); diff --git a/apps/verify.c b/apps/verify.c index 9ff32cb068..20cc9e354c 100644 --- a/apps/verify.c +++ b/apps/verify.c @@ -266,7 +266,7 @@ static int check(X509_STORE *ctx, char *file, STACK_OF(X509) *uchain, STACK_OF(X ret=0; end: - if (i) + if (i > 0) { fprintf(stdout,"OK\n"); ret=1; @@ -367,4 +367,3 @@ static int MS_CALLBACK cb(int ok, X509_STORE_CTX *ctx) ERR_clear_error(); return(ok); } - diff --git a/apps/x509.c b/apps/x509.c index e08fdac8b9..f1b1c6f7b6 100644 --- a/apps/x509.c +++ b/apps/x509.c @@ -1130,7 +1130,7 @@ static int x509_certify(X509_STORE *ctx, char *CAfile, const EVP_MD *digest, /* NOTE: this certificate can/should be self signed, unless it was * a certificate request in which case it is not. */ X509_STORE_CTX_set_cert(&xsc,x); - if (!reqfile && !X509_verify_cert(&xsc)) + if (!reqfile && X509_verify_cert(&xsc) <= 0) goto end; if (!X509_check_private_key(xca,pkey)) diff --git a/crypto/camellia/.cvsignore b/crypto/camellia/.cvsignore index c6d03a9dbc..b7f68a8535 100644 --- a/crypto/camellia/.cvsignore +++ b/crypto/camellia/.cvsignore @@ -1,2 +1,3 @@ lib Makefile.save +cmll-*.s diff --git a/ssl/s2_clnt.c b/ssl/s2_clnt.c index e976ba82e9..00ac158f9b 100644 --- a/ssl/s2_clnt.c +++ b/ssl/s2_clnt.c @@ -1046,7 +1046,7 @@ int ssl2_set_certificate(SSL *s, int type, int len, const unsigned char *data) i=ssl_verify_cert_chain(s,sk); - if ((s->verify_mode != SSL_VERIFY_NONE) && (!i)) + if ((s->verify_mode != SSL_VERIFY_NONE) && (i <= 0)) { SSLerr(SSL_F_SSL2_SET_CERTIFICATE,SSL_R_CERTIFICATE_VERIFY_FAILED); goto err; diff --git a/ssl/s2_srvr.c b/ssl/s2_srvr.c index b43a046aa6..c3b4e1d1c7 100644 --- a/ssl/s2_srvr.c +++ b/ssl/s2_srvr.c @@ -1054,7 +1054,7 @@ static int request_certificate(SSL *s) i=ssl_verify_cert_chain(s,sk); - if (i) /* we like the packet, now check the chksum */ + if (i > 0) /* we like the packet, now check the chksum */ { EVP_MD_CTX ctx; EVP_PKEY *pkey=NULL; @@ -1083,7 +1083,7 @@ static int request_certificate(SSL *s) EVP_PKEY_free(pkey); EVP_MD_CTX_cleanup(&ctx); - if (i) + if (i > 0) { if (s->session->peer != NULL) X509_free(s->session->peer); diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c index af97a7e138..5d89086571 100644 --- a/ssl/s3_clnt.c +++ b/ssl/s3_clnt.c @@ -1018,7 +1018,7 @@ int ssl3_get_server_certificate(SSL *s) } i=ssl_verify_cert_chain(s,sk); - if ((s->verify_mode != SSL_VERIFY_NONE) && (!i) + if ((s->verify_mode != SSL_VERIFY_NONE) && (i <= 0) #ifndef OPENSSL_NO_KRB5 && !((s->s3->tmp.new_cipher->algorithm_mkey & SSL_kKRB5) && (s->s3->tmp.new_cipher->algorithm_auth & SSL_aKRB5)) @@ -1554,7 +1554,7 @@ int ssl3_get_key_exchange(SSL *s) EVP_VerifyUpdate(&md_ctx,&(s->s3->client_random[0]),SSL3_RANDOM_SIZE); EVP_VerifyUpdate(&md_ctx,&(s->s3->server_random[0]),SSL3_RANDOM_SIZE); EVP_VerifyUpdate(&md_ctx,param,param_len); - if (!EVP_VerifyFinal(&md_ctx,p,(int)n,pkey)) + if (EVP_VerifyFinal(&md_ctx,p,(int)n,pkey) <= 0) { /* bad signature */ al=SSL_AD_DECRYPT_ERROR; @@ -1572,7 +1572,7 @@ int ssl3_get_key_exchange(SSL *s) EVP_VerifyUpdate(&md_ctx,&(s->s3->client_random[0]),SSL3_RANDOM_SIZE); EVP_VerifyUpdate(&md_ctx,&(s->s3->server_random[0]),SSL3_RANDOM_SIZE); EVP_VerifyUpdate(&md_ctx,param,param_len); - if (!EVP_VerifyFinal(&md_ctx,p,(int)n,pkey)) + if (EVP_VerifyFinal(&md_ctx,p,(int)n,pkey) <= 0) { /* bad signature */ al=SSL_AD_DECRYPT_ERROR; diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c index eaaadde3ad..44a67f86d5 100644 --- a/ssl/s3_srvr.c +++ b/ssl/s3_srvr.c @@ -2844,7 +2844,7 @@ int ssl3_get_client_certificate(SSL *s) else { i=ssl_verify_cert_chain(s,sk); - if (!i) + if (i <= 0) { al=ssl_verify_alarm_type(s->verify_result); SSLerr(SSL_F_SSL3_GET_CLIENT_CERTIFICATE,SSL_R_NO_CERTIFICATE_RETURNED); diff --git a/ssl/ssltest.c b/ssl/ssltest.c index c76f6677b4..9ef43dfa88 100644 --- a/ssl/ssltest.c +++ b/ssl/ssltest.c @@ -2177,7 +2177,7 @@ static int MS_CALLBACK app_verify_callback(X509_STORE_CTX *ctx, void *arg) if (cb_arg->proxy_auth) { - if (ok) + if (ok > 0) { const char *cond_end = NULL; -- 2.39.2