X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=crypto%2Fmd2%2Fmd2test.c;h=c629280ed675908e4c95a9e3e0aba024f14e689c;hp=83725fe32b7693956b0e37bb1ddc1d1b72f9fd05;hb=e815d3015eba4e54f414636b8907e15e249d72cf;hpb=ec577822f95a8bca0023c5c77cef1a4916822d4a

diff --git a/crypto/md2/md2test.c b/crypto/md2/md2test.c
index 83725fe32b..c629280ed6 100644
--- a/crypto/md2/md2test.c
+++ b/crypto/md2/md2test.c
@@ -61,7 +61,20 @@
 #include <string.h>
 #include <openssl/md2.h>
 
-char *test[]={
+#ifdef OPENSSL_NO_MD2
+int main(int argc, char *argv[])
+{
+    printf("No MD2 support\n");
+    return(0);
+}
+#else
+#include <openssl/evp.h>
+
+#ifdef CHARSET_EBCDIC
+#include <openssl/ebcdic.h>
+#endif
+
+static char *test[]={
 	"",
 	"a",
 	"abc",
@@ -72,7 +85,7 @@ char *test[]={
 	NULL,
 	};
 
-char *ret[]={
+static char *ret[]={
 	"8350e5a3e24c153df2275c9f80692773",
 	"32ec01ec4a6dac72c0ab96fb34c0b5d1",
 	"da853b0d3f88d99b30283a69e6ded6bb",
@@ -82,24 +95,21 @@ char *ret[]={
 	"d5976f79d83d3a0dc9806c3c66f3efd8",
 	};
 
-#ifndef NOPROTO
 static char *pt(unsigned char *md);
-#else
-static char *pt();
-#endif
-
 int main(int argc, char *argv[])
 	{
 	int i,err=0;
 	char **P,**R;
 	char *p;
+	unsigned char md[MD2_DIGEST_LENGTH];
 
 	P=test;
 	R=ret;
 	i=1;
 	while (*P != NULL)
 		{
-		p=pt(MD2((unsigned char *)*P,(unsigned long)strlen(*P),NULL));
+		EVP_Digest((unsigned char *)*P,(unsigned long)strlen(*P),md,NULL,EVP_md2());
+		p=pt(md);
 		if (strcmp(p,*R) != 0)
 			{
 			printf("error calculating MD2 on '%s'\n",*P);
@@ -125,3 +135,4 @@ static char *pt(unsigned char *md)
 		sprintf(&(buf[i*2]),"%02x",md[i]);
 	return(buf);
 	}
+#endif