Really add the EVP and all of the DES changes.

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

diff --git a/crypto/mdc2/mdc2test.c b/crypto/mdc2/mdc2test.c
index 6fc6c0ed00df2f24c55d1836a464a8c51c86599c..acb517e0cb0ce6cad8f1bf9b9daf73b09ed8f85d 100644 (file)
--- a/crypto/mdc2/mdc2test.c
+++ b/crypto/mdc2/mdc2test.c
@@ -60,19 +60,24 @@
 #include <stdlib.h>
 #include <string.h>
 
-#ifdef NO_DES
-#define NO_MDC2
+#if defined(OPENSSL_NO_DES) && !defined(OPENSSL_NO_MDC2)
+#define OPENSSL_NO_MDC2
 #endif
 
-#ifdef NO_MDC2
+#ifdef OPENSSL_NO_MDC2
 int main(int argc, char *argv[])
 {
     printf("No MDC2 support\n");
     return(0);
 }
 #else
+#include <openssl/evp.h>
 #include <openssl/mdc2.h>
 
+#ifdef CHARSET_EBCDIC
+#include <openssl/ebcdic.h>
+#endif
+
 static unsigned char pad1[16]={
        0x42,0xE5,0x0C,0xD2,0x24,0xBA,0xCE,0xBA,
        0x76,0x0B,0xDD,0x2B,0xD4,0x09,0x28,0x1A
@@ -88,12 +93,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 ";
 
-       MDC2_Init(&c);
-       MDC2_Update(&c,(unsigned char *)text,strlen(text));
-       MDC2_Final(&(md[0]),&c);
+#ifdef CHARSET_EBCDIC
+       ebcdic2ascii(text,text,strlen(text));
+#endif
+
+       EVP_MD_CTX_init(&c);
+       EVP_DigestInit(&c,EVP_mdc2());
+       EVP_DigestUpdate(&c,(unsigned char *)text,strlen(text));
+       EVP_DigestFinal(&c,&(md[0]),NULL);
 
        if (memcmp(md,pad1,MDC2_DIGEST_LENGTH) != 0)
                {
@@ -108,10 +118,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(&c,EVP_mdc2());
+       /* FIXME: use a ctl function? */
+       ((MDC2_CTX *)c.md_data)->pad_type=2;
+       EVP_DigestUpdate(&c,(unsigned char *)text,strlen(text));
+       EVP_DigestFinal(&c,&(md[0]),NULL);
 
        if (memcmp(md,pad2,MDC2_DIGEST_LENGTH) != 0)
                {
@@ -126,6 +137,7 @@ int main(int argc, char *argv[])
        else
                printf("pad2 - ok\n");
 
+       EVP_MD_CTX_cleanup(&c);
        exit(ret);
        return(ret);
        }