Remove MD2 test from WIN32 as we don't compile it in by default any more.

[openssl.git] / crypto / mdc2 / mdc2test.c

diff --git a/crypto/mdc2/mdc2test.c b/crypto/mdc2/mdc2test.c
index 6a50e9debe9c79e1cc07d5f0c4895fc12fcae9d1..017b31add2eae2f9ff634afc39f4dfd48dc4718c 100644 (file)
--- a/crypto/mdc2/mdc2test.c
+++ b/crypto/mdc2/mdc2test.c
@@ -60,6 +60,8 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "../e_os.h"
+
 #if defined(OPENSSL_NO_DES) && !defined(OPENSSL_NO_MDC2)
 #define OPENSSL_NO_MDC2
 #endif
@@ -71,6 +73,7 @@ int main(int argc, char *argv[])
     return(0);
 }
 #else
+#include <openssl/evp.h>
 #include <openssl/mdc2.h>
 
 #ifdef CHARSET_EBCDIC
@@ -92,16 +95,17 @@ int main(int argc, char *argv[])
        int ret=0;
        unsigned char md[MDC2_DIGEST_LENGTH];
        int i;
-       MDC2_CTX c;
+       EVP_MD_CTX c;
        static char *text="Now is the time for all ";
 
 #ifdef CHARSET_EBCDIC
        ebcdic2ascii(text,text,strlen(text));
 #endif
 
-       MDC2_Init(&c);
-       MDC2_Update(&c,(unsigned char *)text,strlen(text));
-       MDC2_Final(&(md[0]),&c);
+       EVP_MD_CTX_init(&c);
+       EVP_DigestInit_ex(&c,EVP_mdc2(), NULL);
+       EVP_DigestUpdate(&c,(unsigned char *)text,strlen(text));
+       EVP_DigestFinal_ex(&c,&(md[0]),NULL);
 
        if (memcmp(md,pad1,MDC2_DIGEST_LENGTH) != 0)
                {
@@ -116,10 +120,11 @@ int main(int argc, char *argv[])
        else
                printf("pad1 - ok\n");
 
-       MDC2_Init(&c);
-       c.pad_type=2;
-       MDC2_Update(&c,(unsigned char *)text,strlen(text));
-       MDC2_Final(&(md[0]),&c);
+       EVP_DigestInit_ex(&c,EVP_mdc2(), NULL);
+       /* FIXME: use a ctl function? */
+       ((MDC2_CTX *)c.md_data)->pad_type=2;
+       EVP_DigestUpdate(&c,(unsigned char *)text,strlen(text));
+       EVP_DigestFinal_ex(&c,&(md[0]),NULL);
 
        if (memcmp(md,pad2,MDC2_DIGEST_LENGTH) != 0)
                {
@@ -134,7 +139,11 @@ int main(int argc, char *argv[])
        else
                printf("pad2 - ok\n");
 
-       exit(ret);
+       EVP_MD_CTX_cleanup(&c);
+#ifdef OPENSSL_SYS_NETWARE
+    if (ret) printf("ERROR: %d\n", ret);
+#endif
+       EXIT(ret);
        return(ret);
        }
 #endif