Always pass size_t varargs to p11_hash_xxx() functions

https://bugzilla.redhat.com/show_bug.cgi?id=985421

diff --git a/trust/extract-jks.c b/trust/extract-jks.c
index 8a39cfd86d677cefc8d2b1ae813c4e98cc388024..e12b2deb71d62841be25a7b3c78578eda7fc2a6f 100644 (file)
--- a/trust/extract-jks.c
+++ b/trust/extract-jks.c
@@ -302,8 +302,8 @@ prepare_jks_buffer (P11KitIter *iter,
        digest = p11_buffer_append (buffer, P11_DIGEST_SHA1_LEN);
        return_val_if_fail (digest != NULL, false);
        p11_digest_sha1 (digest,
-                        "\000c\000h\000a\000n\000g\000e\000i\000t", 16, /* default password */
-                        "Mighty Aphrodite", 16, /* go figure */
+                        "\000c\000h\000a\000n\000g\000e\000i\000t", (size_t)16, /* default password */
+                        "Mighty Aphrodite", (size_t)16, /* go figure */
                         buffer->data, length,
                         NULL);
 

diff --git a/trust/extract-openssl.c b/trust/extract-openssl.c
index c2d37f31753075557ffd93291c361cce6cbf3510..666f18996fc526b5c7258ba7b6b5e2479a48b6a1 100644 (file)
--- a/trust/extract-openssl.c
+++ b/trust/extract-openssl.c
@@ -572,7 +572,7 @@ symlink_for_subject_old_hash (p11_extract_info *ex)
        if (!subject)
                return NULL;
 
-       p11_digest_md5 (md, subject->pValue, subject->ulValueLen, NULL);
+       p11_digest_md5 (md, subject->pValue, (size_t)subject->ulValueLen, NULL);
 
        hash = (
                 ((unsigned long)md[0]       ) | ((unsigned long)md[1] << 8L) |

diff --git a/trust/x509.c b/trust/x509.c
index f49be732cce699c79a2e01b62895c5f094679a8a..b93d26c6c07f680dd9fd599f69c60dc75682a606 100644 (file)
--- a/trust/x509.c
+++ b/trust/x509.c
@@ -98,6 +98,7 @@ p11_x509_calc_keyid (node_asn *cert,
                      unsigned char *keyid)
 {
        int start, end;
+       size_t len;
        int ret;
 
        return_val_if_fail (cert != NULL, NULL);
@@ -108,7 +109,8 @@ p11_x509_calc_keyid (node_asn *cert,
        return_val_if_fail (ret == ASN1_SUCCESS, false);
        return_val_if_fail (end >= start, false);
 
-       p11_digest_sha1 (keyid, (der + start), (end - start) + 1, NULL);
+       len = (end - start) + 1;
+       p11_digest_sha1 (keyid, (der + start), len, NULL);
        return true;
 }