From: Dr. Stephen Henson <steve@openssl.org>
Date: Tue, 19 Apr 2011 11:10:54 +0000 (+0000)
Subject: Use 0 for tbslen to perform strlen.
X-Git-Tag: OpenSSL-fips-2_0-rc1~529
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=8c7096835b48d773463cee4fe97fbc334e911cc9;p=oweals%2Fopenssl.git

Use 0 for tbslen to perform strlen.
---

diff --git a/crypto/dsa/dsa_key.c b/crypto/dsa/dsa_key.c
index c7589873a4..942000e3a5 100644
--- a/crypto/dsa/dsa_key.c
+++ b/crypto/dsa/dsa_key.c
@@ -79,7 +79,7 @@ static int fips_check_dsa(DSA *dsa)
     	pk.pkey.dsa = dsa;
 
 	if (!fips_pkey_signature_test(FIPS_TEST_PAIRWISE,
-					&pk, tbs, -1, NULL, 0, NULL, 0, NULL))
+					&pk, tbs, 0, NULL, 0, NULL, 0, NULL))
 		{
 		FIPSerr(FIPS_F_FIPS_CHECK_DSA,FIPS_R_PAIRWISE_TEST_FAILED);
 		fips_set_selftest_fail();
diff --git a/crypto/ec/ec_key.c b/crypto/ec/ec_key.c
index 59bc08494e..ad3022f868 100644
--- a/crypto/ec/ec_key.c
+++ b/crypto/ec/ec_key.c
@@ -244,7 +244,7 @@ static int fips_check_ec(EC_KEY *key)
     	pk.pkey.ec = key;
 
 	if (!fips_pkey_signature_test(FIPS_TEST_PAIRWISE,
-					&pk, tbs, -1, NULL, 0, NULL, 0, NULL))
+					&pk, tbs, 0, NULL, 0, NULL, 0, NULL))
 		{
 		FIPSerr(FIPS_F_FIPS_CHECK_EC,FIPS_R_PAIRWISE_TEST_FAILED);
 		fips_set_selftest_fail();
diff --git a/crypto/rsa/rsa_gen.c b/crypto/rsa/rsa_gen.c
index 8f798c0dec..484468da05 100644
--- a/crypto/rsa/rsa_gen.c
+++ b/crypto/rsa/rsa_gen.c
@@ -86,11 +86,11 @@ int fips_check_rsa(RSA *rsa)
     	pk.pkey.rsa = rsa;
 
 	/* Perform pairwise consistency signature test */
-	if (!fips_pkey_signature_test(FIPS_TEST_PAIRWISE, &pk, tbs, -1,
+	if (!fips_pkey_signature_test(FIPS_TEST_PAIRWISE, &pk, tbs, 0,
 			NULL, 0, NULL, RSA_PKCS1_PADDING, NULL)
-		|| !fips_pkey_signature_test(FIPS_TEST_PAIRWISE, &pk, tbs, -1,
+		|| !fips_pkey_signature_test(FIPS_TEST_PAIRWISE, &pk, tbs, 0,
 			NULL, 0, NULL, RSA_X931_PADDING, NULL)
-		|| !fips_pkey_signature_test(FIPS_TEST_PAIRWISE, &pk, tbs, -1,
+		|| !fips_pkey_signature_test(FIPS_TEST_PAIRWISE, &pk, tbs, 0,
 			NULL, 0, NULL, RSA_PKCS1_PSS_PADDING, NULL))
 		goto err;
 	/* Now perform pairwise consistency encrypt/decrypt test */