|
 |
c4366c |
diff -up openssl-fips-0.9.8e/apps/speed.c.verifysig openssl-fips-0.9.8e/apps/speed.c
|
|
|
c4366c |
--- openssl-fips-0.9.8e/apps/speed.c.verifysig 2007-05-21 14:40:06.000000000 +0200
|
|
|
c4366c |
+++ openssl-fips-0.9.8e/apps/speed.c 2008-12-16 16:44:22.000000000 +0100
|
|
|
c4366c |
@@ -2132,7 +2132,7 @@ int MAIN(int argc, char **argv)
|
|
|
c4366c |
{
|
|
|
c4366c |
ret=RSA_verify(NID_md5_sha1, buf,36, buf2,
|
|
|
c4366c |
rsa_num, rsa_key[j]);
|
|
|
c4366c |
- if (ret == 0)
|
|
|
c4366c |
+ if (ret <= 0)
|
|
|
c4366c |
{
|
|
|
c4366c |
BIO_printf(bio_err,
|
|
|
c4366c |
"RSA verify failure\n");
|
|
|
c4366c |
diff -up openssl-fips-0.9.8e/apps/verify.c.verifysig openssl-fips-0.9.8e/apps/verify.c
|
|
|
c4366c |
--- openssl-fips-0.9.8e/apps/verify.c.verifysig 2004-11-29 12:28:07.000000000 +0100
|
|
|
c4366c |
+++ openssl-fips-0.9.8e/apps/verify.c 2008-12-16 16:44:22.000000000 +0100
|
|
|
c4366c |
@@ -266,7 +266,7 @@ static int check(X509_STORE *ctx, char *
|
|
|
c4366c |
|
|
|
c4366c |
ret=0;
|
|
|
c4366c |
end:
|
|
|
c4366c |
- if (i)
|
|
|
c4366c |
+ if (i > 0)
|
|
|
c4366c |
{
|
|
|
c4366c |
fprintf(stdout,"OK\n");
|
|
|
c4366c |
ret=1;
|
|
|
c4366c |
@@ -367,4 +367,3 @@ static int MS_CALLBACK cb(int ok, X509_S
|
|
|
c4366c |
ERR_clear_error();
|
|
|
c4366c |
return(ok);
|
|
|
c4366c |
}
|
|
|
c4366c |
-
|
|
|
c4366c |
diff -up openssl-fips-0.9.8e/apps/spkac.c.verifysig openssl-fips-0.9.8e/apps/spkac.c
|
|
|
c4366c |
--- openssl-fips-0.9.8e/apps/spkac.c.verifysig 2005-04-05 21:11:18.000000000 +0200
|
|
|
c4366c |
+++ openssl-fips-0.9.8e/apps/spkac.c 2008-12-16 16:44:22.000000000 +0100
|
|
|
c4366c |
@@ -285,7 +285,7 @@ bad:
|
|
|
c4366c |
pkey = NETSCAPE_SPKI_get_pubkey(spki);
|
|
|
c4366c |
if(verify) {
|
|
|
c4366c |
i = NETSCAPE_SPKI_verify(spki, pkey);
|
|
|
c4366c |
- if(i) BIO_printf(bio_err, "Signature OK\n");
|
|
|
c4366c |
+ if (i > 0) BIO_printf(bio_err, "Signature OK\n");
|
|
|
c4366c |
else {
|
|
|
c4366c |
BIO_printf(bio_err, "Signature Failure\n");
|
|
|
c4366c |
ERR_print_errors(bio_err);
|
|
|
c4366c |
diff -up openssl-fips-0.9.8e/apps/x509.c.verifysig openssl-fips-0.9.8e/apps/x509.c
|
|
|
c4366c |
--- openssl-fips-0.9.8e/apps/x509.c.verifysig 2005-07-16 13:13:03.000000000 +0200
|
|
|
c4366c |
+++ openssl-fips-0.9.8e/apps/x509.c 2008-12-16 16:44:22.000000000 +0100
|
|
|
c4366c |
@@ -1144,7 +1144,7 @@ static int x509_certify(X509_STORE *ctx,
|
|
|
c4366c |
/* NOTE: this certificate can/should be self signed, unless it was
|
|
|
c4366c |
* a certificate request in which case it is not. */
|
|
|
c4366c |
X509_STORE_CTX_set_cert(&xsc,x);
|
|
|
c4366c |
- if (!reqfile && !X509_verify_cert(&xsc))
|
|
|
c4366c |
+ if (!reqfile && X509_verify_cert(&xsc) <= 0)
|
|
|
c4366c |
goto end;
|
|
|
c4366c |
|
|
|
c4366c |
if (!X509_check_private_key(xca,pkey))
|
|
|
c4366c |
diff -up openssl-fips-0.9.8e/ssl/s2_clnt.c.verifysig openssl-fips-0.9.8e/ssl/s2_clnt.c
|
|
|
c4366c |
--- openssl-fips-0.9.8e/ssl/s2_clnt.c.verifysig 2006-09-28 13:29:03.000000000 +0200
|
|
|
c4366c |
+++ openssl-fips-0.9.8e/ssl/s2_clnt.c 2008-12-16 16:44:50.000000000 +0100
|
|
|
c4366c |
@@ -1044,7 +1044,7 @@ int ssl2_set_certificate(SSL *s, int typ
|
|
|
c4366c |
|
|
|
c4366c |
i=ssl_verify_cert_chain(s,sk);
|
|
|
c4366c |
|
|
|
c4366c |
- if ((s->verify_mode != SSL_VERIFY_NONE) && (!i))
|
|
|
c4366c |
+ if ((s->verify_mode != SSL_VERIFY_NONE) && (i <= 0))
|
|
|
c4366c |
{
|
|
|
c4366c |
SSLerr(SSL_F_SSL2_SET_CERTIFICATE,SSL_R_CERTIFICATE_VERIFY_FAILED);
|
|
|
c4366c |
goto err;
|
|
|
c4366c |
diff -up openssl-fips-0.9.8e/ssl/s2_srvr.c.verifysig openssl-fips-0.9.8e/ssl/s2_srvr.c
|
|
|
c4366c |
--- openssl-fips-0.9.8e/ssl/s2_srvr.c.verifysig 2005-12-05 18:32:20.000000000 +0100
|
|
|
c4366c |
+++ openssl-fips-0.9.8e/ssl/s2_srvr.c 2008-12-16 16:47:28.000000000 +0100
|
|
|
c4366c |
@@ -1054,7 +1054,7 @@ static int request_certificate(SSL *s)
|
|
|
c4366c |
|
|
|
c4366c |
i=ssl_verify_cert_chain(s,sk);
|
|
|
c4366c |
|
|
|
c4366c |
- if (i) /* we like the packet, now check the chksum */
|
|
|
c4366c |
+ if (i > 0) /* we like the packet, now check the chksum */
|
|
|
c4366c |
{
|
|
|
c4366c |
EVP_MD_CTX ctx;
|
|
|
c4366c |
EVP_PKEY *pkey=NULL;
|
|
|
c4366c |
@@ -1083,7 +1083,7 @@ static int request_certificate(SSL *s)
|
|
|
c4366c |
EVP_PKEY_free(pkey);
|
|
|
c4366c |
EVP_MD_CTX_cleanup(&ctx;;
|
|
|
c4366c |
|
|
|
c4366c |
- if (i)
|
|
|
c4366c |
+ if (i > 0)
|
|
|
c4366c |
{
|
|
|
c4366c |
if (s->session->peer != NULL)
|
|
|
c4366c |
X509_free(s->session->peer);
|
|
|
c4366c |
diff -up openssl-fips-0.9.8e/ssl/s3_clnt.c.verifysig openssl-fips-0.9.8e/ssl/s3_clnt.c
|
|
|
c4366c |
--- openssl-fips-0.9.8e/ssl/s3_clnt.c.verifysig 2008-10-31 09:18:53.000000000 +0100
|
|
|
c4366c |
+++ openssl-fips-0.9.8e/ssl/s3_clnt.c 2008-12-16 16:44:50.000000000 +0100
|
|
|
c4366c |
@@ -886,7 +886,7 @@ int ssl3_get_server_certificate(SSL *s)
|
|
|
c4366c |
}
|
|
|
c4366c |
|
|
|
c4366c |
i=ssl_verify_cert_chain(s,sk);
|
|
|
c4366c |
- if ((s->verify_mode != SSL_VERIFY_NONE) && (!i)
|
|
|
c4366c |
+ if ((s->verify_mode != SSL_VERIFY_NONE) && (i <= 0)
|
|
|
c4366c |
#ifndef OPENSSL_NO_KRB5
|
|
|
c4366c |
&& (s->s3->tmp.new_cipher->algorithms & (SSL_MKEY_MASK|SSL_AUTH_MASK))
|
|
|
c4366c |
!= (SSL_aKRB5|SSL_kKRB5)
|
|
|
c4366c |
@@ -1373,7 +1373,7 @@ int ssl3_get_key_exchange(SSL *s)
|
|
|
c4366c |
EVP_VerifyUpdate(&md_ctx,&(s->s3->client_random[0]),SSL3_RANDOM_SIZE);
|
|
|
c4366c |
EVP_VerifyUpdate(&md_ctx,&(s->s3->server_random[0]),SSL3_RANDOM_SIZE);
|
|
|
c4366c |
EVP_VerifyUpdate(&md_ctx,param,param_len);
|
|
|
c4366c |
- if (!EVP_VerifyFinal(&md_ctx,p,(int)n,pkey))
|
|
|
c4366c |
+ if (EVP_VerifyFinal(&md_ctx,p,(int)n,pkey) <= 0)
|
|
|
c4366c |
{
|
|
|
c4366c |
/* bad signature */
|
|
|
c4366c |
al=SSL_AD_DECRYPT_ERROR;
|
|
|
c4366c |
@@ -1391,7 +1391,7 @@ int ssl3_get_key_exchange(SSL *s)
|
|
|
c4366c |
EVP_VerifyUpdate(&md_ctx,&(s->s3->client_random[0]),SSL3_RANDOM_SIZE);
|
|
|
c4366c |
EVP_VerifyUpdate(&md_ctx,&(s->s3->server_random[0]),SSL3_RANDOM_SIZE);
|
|
|
c4366c |
EVP_VerifyUpdate(&md_ctx,param,param_len);
|
|
|
c4366c |
- if (!EVP_VerifyFinal(&md_ctx,p,(int)n,pkey))
|
|
|
c4366c |
+ if (EVP_VerifyFinal(&md_ctx,p,(int)n,pkey) <= 0)
|
|
|
c4366c |
{
|
|
|
c4366c |
/* bad signature */
|
|
|
c4366c |
al=SSL_AD_DECRYPT_ERROR;
|
|
|
c4366c |
diff -up openssl-fips-0.9.8e/ssl/ssltest.c.verifysig openssl-fips-0.9.8e/ssl/ssltest.c
|
|
|
c4366c |
--- openssl-fips-0.9.8e/ssl/ssltest.c.verifysig 2007-08-21 17:26:51.000000000 +0200
|
|
|
c4366c |
+++ openssl-fips-0.9.8e/ssl/ssltest.c 2008-12-16 16:44:50.000000000 +0100
|
|
|
c4366c |
@@ -2093,7 +2093,7 @@ static int MS_CALLBACK app_verify_callba
|
|
|
c4366c |
|
|
|
c4366c |
if (cb_arg->proxy_auth)
|
|
|
c4366c |
{
|
|
|
c4366c |
- if (ok)
|
|
|
c4366c |
+ if (ok > 0)
|
|
|
c4366c |
{
|
|
|
c4366c |
const char *cond_end = NULL;
|
|
|
c4366c |
|
|
|
c4366c |
diff -up openssl-fips-0.9.8e/ssl/s3_srvr.c.verifysig openssl-fips-0.9.8e/ssl/s3_srvr.c
|
|
|
c4366c |
--- openssl-fips-0.9.8e/ssl/s3_srvr.c.verifysig 2008-10-31 09:18:53.000000000 +0100
|
|
|
c4366c |
+++ openssl-fips-0.9.8e/ssl/s3_srvr.c 2008-12-16 16:44:50.000000000 +0100
|
|
|
c4366c |
@@ -2484,7 +2484,7 @@ int ssl3_get_client_certificate(SSL *s)
|
|
|
c4366c |
else
|
|
|
c4366c |
{
|
|
|
c4366c |
i=ssl_verify_cert_chain(s,sk);
|
|
|
c4366c |
- if (!i)
|
|
|
c4366c |
+ if (i <= 0)
|
|
|
c4366c |
{
|
|
|
c4366c |
al=ssl_verify_alarm_type(s->verify_result);
|
|
|
c4366c |
SSLerr(SSL_F_SSL3_GET_CLIENT_CERTIFICATE,SSL_R_NO_CERTIFICATE_RETURNED);
|