Use 0 for tbslen to perform strlen.

diff --git a/crypto/dsa/dsa_key.c b/crypto/dsa/dsa_key.c
index c758987..942000e 100644 (file)
--- 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.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();
                {
                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 59bc084..ad3022f 100644 (file)
--- 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.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();
                {
                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 8f798c0..484468d 100644 (file)
--- 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 */
        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)
                        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)
                        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 */
                        NULL, 0, NULL, RSA_PKCS1_PSS_PADDING, NULL))
                goto err;
        /* Now perform pairwise consistency encrypt/decrypt test */