File openssl-0.9.7d-CVE-2008-5077.patch of Package compat-openssl097g.import4909
diff -X /tmp/work/10.3/BUILD_openssl/x -pur openssl-0.9.7d.orig/apps/speed.c openssl-0.9.7d/apps/speed.c
--- openssl-0.9.7d.orig/apps/speed.c 2004-01-08 08:46:12.000000000 +0100
+++ openssl-0.9.7d/apps/speed.c 2009-01-20 16:34:55.000000000 +0100
@@ -1485,7 +1485,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 -X /tmp/work/10.3/BUILD_openssl/x -pur openssl-0.9.7d.orig/apps/spkac.c openssl-0.9.7d/apps/spkac.c
--- openssl-0.9.7d.orig/apps/spkac.c 2003-01-30 18:37:36.000000000 +0100
+++ openssl-0.9.7d/apps/spkac.c 2009-01-20 16:34:55.000000000 +0100
@@ -284,7 +284,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 -X /tmp/work/10.3/BUILD_openssl/x -pur openssl-0.9.7d.orig/apps/verify.c openssl-0.9.7d/apps/verify.c
--- openssl-0.9.7d.orig/apps/verify.c 2003-01-30 18:37:36.000000000 +0100
+++ openssl-0.9.7d/apps/verify.c 2009-01-20 16:34:55.000000000 +0100
@@ -275,7 +275,7 @@ static int check(X509_STORE *ctx, char *
ret=0;
end:
- if (i)
+ if (i > 0)
{
fprintf(stdout,"OK\n");
ret=1;
@@ -365,4 +365,3 @@ static int MS_CALLBACK cb(int ok, X509_S
ERR_clear_error();
return(ok);
}
-
diff -X /tmp/work/10.3/BUILD_openssl/x -pur openssl-0.9.7d.orig/apps/x509.c openssl-0.9.7d/apps/x509.c
--- openssl-0.9.7d.orig/apps/x509.c 2004-03-16 14:50:18.000000000 +0100
+++ openssl-0.9.7d/apps/x509.c 2009-01-20 16:34:55.000000000 +0100
@@ -1096,7 +1096,7 @@ static int x509_certify(X509_STORE *ctx,
/* 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 -X /tmp/work/10.3/BUILD_openssl/x -pur openssl-0.9.7d.orig/ssl/s2_clnt.c openssl-0.9.7d/ssl/s2_clnt.c
--- openssl-0.9.7d.orig/ssl/s2_clnt.c 2009-01-20 16:15:47.000000000 +0100
+++ openssl-0.9.7d/ssl/s2_clnt.c 2009-01-20 16:34:55.000000000 +0100
@@ -1059,7 +1059,7 @@ int ssl2_set_certificate(SSL *s, int typ
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 -X /tmp/work/10.3/BUILD_openssl/x -pur openssl-0.9.7d.orig/ssl/s2_srvr.c openssl-0.9.7d/ssl/s2_srvr.c
--- openssl-0.9.7d.orig/ssl/s2_srvr.c 2003-12-27 17:09:58.000000000 +0100
+++ openssl-0.9.7d/ssl/s2_srvr.c 2009-01-20 16:34:55.000000000 +0100
@@ -1067,7 +1067,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;
@@ -1096,7 +1096,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 -X /tmp/work/10.3/BUILD_openssl/x -pur openssl-0.9.7d.orig/ssl/s3_clnt.c openssl-0.9.7d/ssl/s3_clnt.c
--- openssl-0.9.7d.orig/ssl/s3_clnt.c 2003-12-27 17:09:58.000000000 +0100
+++ openssl-0.9.7d/ssl/s3_clnt.c 2009-01-20 16:34:55.000000000 +0100
@@ -831,7 +831,7 @@ static int ssl3_get_server_certificate(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->algorithms & (SSL_MKEY_MASK|SSL_AUTH_MASK))
!= (SSL_aKRB5|SSL_kKRB5)
@@ -1195,7 +1195,7 @@ static 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 -X /tmp/work/10.3/BUILD_openssl/x -pur openssl-0.9.7d.orig/ssl/s3_srvr.c openssl-0.9.7d/ssl/s3_srvr.c
--- openssl-0.9.7d.orig/ssl/s3_srvr.c 2009-01-20 16:15:47.000000000 +0100
+++ openssl-0.9.7d/ssl/s3_srvr.c 2009-01-20 16:34:55.000000000 +0100
@@ -2004,7 +2004,7 @@ static int ssl3_get_client_certificate(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 -X /tmp/work/10.3/BUILD_openssl/x -pur openssl-0.9.7d.orig/ssl/s3_srvr.c openssl-0.9.7d/ssl/s3_srvr.c
--- openssl-0.9.7d.orig/ssl/ssltest.c 2009-01-20 16:15:47.000000000 +0100
+++ openssl-0.9.7d/ssl/ssltest.c 2009-01-20 16:34:55.000000000 +0100
@@ -2072,7 +2072,7 @@ static int MS_CALLBACK app_verify_callba
if (cb_arg->proxy_auth)
{
- if (ok)
+ if (ok > 0)
{
const char *cond_end = NULL;
