EVP_Digest is size_t-fied, clean up test programs accordingly.

diff --git a/crypto/md2/md2test.c b/crypto/md2/md2test.c
index 13cbec4ab08c0fccae0ddcb977caf2f640cf0096..21b381c3514db51a1e945cd1a0bb4648ce30aabd 100644 (file)
--- a/crypto/md2/md2test.c
+++ b/crypto/md2/md2test.c
@@ -110,7 +110,7 @@ int main(int argc, char *argv[])
        i=1;
        while (*P != NULL)
                {
-               EVP_Digest((unsigned char *)*P,(unsigned long)strlen(*P),md,NULL,EVP_md2(), NULL);
+               EVP_Digest((unsigned char *)*P,strlen(*P),md,NULL,EVP_md2(), NULL);
                p=pt(md);
                if (strcmp(p,*R) != 0)
                        {

diff --git a/crypto/md4/md4test.c b/crypto/md4/md4test.c
index 21a77d96f711fe13fbe747c76eb1b8f465d313ce..5da53382c9f89ecfdc13a37b266debf2a5ca9854 100644 (file)
--- a/crypto/md4/md4test.c
+++ b/crypto/md4/md4test.c
@@ -106,7 +106,7 @@ int main(int argc, char *argv[])
        i=1;
        while (*P != NULL)
                {
-               EVP_Digest(&(P[0][0]),(unsigned long)strlen((char *)*P),md,NULL,EVP_md4(), NULL);
+               EVP_Digest(&(P[0][0]),strlen((char *)*P),md,NULL,EVP_md4(), NULL);
                p=pt(md);
                if (strcmp(p,(char *)*R) != 0)
                        {

diff --git a/crypto/md5/md5test.c b/crypto/md5/md5test.c
index 667b6be3442e4411e38df5459ee947f23acc40f5..0628053fa7ce2071f578e66c84666b3945ca548f 100644 (file)
--- a/crypto/md5/md5test.c
+++ b/crypto/md5/md5test.c
@@ -106,7 +106,7 @@ int main(int argc, char *argv[])
        i=1;
        while (*P != NULL)
                {
-               EVP_Digest(&(P[0][0]),(unsigned long)strlen((char *)*P),md,NULL,EVP_md5(), NULL);
+               EVP_Digest(&(P[0][0]),strlen((char *)*P),md,NULL,EVP_md5(), NULL);
                p=pt(md);
                if (strcmp(p,(char *)*R) != 0)
                        {

diff --git a/crypto/rc4/rc4.c b/crypto/rc4/rc4.c
index b39c070292c98de583bc0aa26cd3db8a55795db3..c900b260554a394107031c708951a02d6d203d92 100644 (file)
--- a/crypto/rc4/rc4.c
+++ b/crypto/rc4/rc4.c
@@ -60,6 +60,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <openssl/rc4.h>
+#include <openssl/evp.h>
 
 char *usage[]={
 "usage: rc4 args\n",
@@ -162,7 +163,7 @@ bad:
                keystr=buf;
                }
 
-       EVP_Digest((unsigned char *)keystr,(unsigned long)strlen(keystr),md,NULL,EVP_md5());
+       EVP_Digest((unsigned char *)keystr,strlen(keystr),md,NULL,EVP_md5(),NULL);
        OPENSSL_cleanse(keystr,strlen(keystr));
        RC4_set_key(&key,MD5_DIGEST_LENGTH,md);
        

diff --git a/crypto/ripemd/rmdtest.c b/crypto/ripemd/rmdtest.c
index d4c709e64667eb05fb67426b5b034fdfaf105864..cbfdf2ae6ff23390818936227a8d6f74adf9b7f5 100644 (file)
--- a/crypto/ripemd/rmdtest.c
+++ b/crypto/ripemd/rmdtest.c
@@ -115,7 +115,7 @@ int main(int argc, char *argv[])
 #ifdef CHARSET_EBCDIC
                ebcdic2ascii((char *)*P, (char *)*P, strlen((char *)*P));
 #endif
-               EVP_Digest(&(P[0][0]),(unsigned long)strlen((char *)*P),md,NULL,EVP_ripemd160(), NULL);
+               EVP_Digest(&(P[0][0]),strlen((char *)*P),md,NULL,EVP_ripemd160(), NULL);
                p=pt(md);
                if (strcmp(p,(char *)*R) != 0)
                        {

diff --git a/crypto/sha/sha1test.c b/crypto/sha/sha1test.c
index cddd598f227606597648cfd862ba5eeeec9d5b99..b0650c7254f2e3e7b1f446b2c393544bab7240c4 100644 (file)
--- a/crypto/sha/sha1test.c
+++ b/crypto/sha/sha1test.c
@@ -123,7 +123,7 @@ int main(int argc, char *argv[])
        i=1;
        while (*P != NULL)
                {
-               EVP_Digest(*P,(unsigned long)strlen((char *)*P),md,NULL,EVP_sha1(), NULL);
+               EVP_Digest(*P,strlen((char *)*P),md,NULL,EVP_sha1(), NULL);
                p=pt(md);
                if (strcmp(p,(char *)*R) != 0)
                        {

diff --git a/crypto/sha/shatest.c b/crypto/sha/shatest.c
index ddb388b6702189ebbd680ee88aa70fc501756ec6..d007cf13ede94a5b5607ca7555ec609a14cf6737 100644 (file)
--- a/crypto/sha/shatest.c
+++ b/crypto/sha/shatest.c
@@ -123,7 +123,7 @@ int main(int argc, char *argv[])
        i=1;
        while (*P != NULL)
                {
-               EVP_Digest(*P,(unsigned long)strlen((char *)*P),md,NULL,EVP_sha(), NULL);
+               EVP_Digest(*P,strlen((char *)*P),md,NULL,EVP_sha(), NULL);
                p=pt(md);
                if (strcmp(p,(char *)*R) != 0)
                        {