OpenSSL 0.9.7 stable 2002 05 08 merge

1 files changed, 10 insertions, 6 deletions

diff --git a/src/lib/libcrypto/sha/shatest.c b/src/lib/libcrypto/sha/shatest.c
index a5786bbf76..331294a74f 100644
--- a/src/lib/libcrypto/sha/shatest.c
+++ b/src/lib/libcrypto/sha/shatest.c
@@ -60,13 +60,14 @@
 #include <string.h>
 #include <stdlib.h>
 
-#ifdef NO_SHA
+#ifdef OPENSSL_NO_SHA
 int main(int argc, char *argv[])
 {
     printf("No SHA support\n");
     return(0);
 }
 #else
+#include <openssl/evp.h>
 #include <openssl/sha.h>
 
 #ifdef CHARSET_EBCDIC
@@ -106,7 +107,7 @@ int main(int argc, char *argv[])
         unsigned char **P,**R;
         static unsigned char buf[1000];
         char *p,*r;
-        SHA_CTX c;
+        EVP_MD_CTX c;
         unsigned char md[SHA_DIGEST_LENGTH];
 
 #ifdef CHARSET_EBCDIC
@@ -114,12 +115,14 @@ int main(int argc, char *argv[])
         ebcdic2ascii(test[1], test[1], strlen(test[1]));
 #endif
 
+        EVP_MD_CTX_init(&c);
         P=(unsigned char **)test;
         R=(unsigned char **)ret;
         i=1;
         while (*P != NULL)
                 {
-                p=pt(SHA(*P,(unsigned long)strlen((char *)*P),NULL));
+                EVP_Digest(*P,(unsigned long)strlen((char *)*P),md,NULL,EVP_sha(), NULL);
+                p=pt(md);
                 if (strcmp(p,(char *)*R) != 0)
                         {
                         printf("error calculating SHA on '%s'\n",*P);
@@ -137,10 +140,10 @@ int main(int argc, char *argv[])
 #ifdef CHARSET_EBCDIC
         ebcdic2ascii(buf, buf, 1000);
 #endif /*CHARSET_EBCDIC*/
-        SHA_Init(&c);
+        EVP_DigestInit_ex(&c,EVP_sha(), NULL);
         for (i=0; i<1000; i++)
-                SHA_Update(&c,buf,1000);
-        SHA_Final(md,&c);
+                EVP_DigestUpdate(&c,buf,1000);
+        EVP_DigestFinal_ex(&c,md,NULL);
         p=pt(md);
 
         r=bigret;
@@ -152,6 +155,7 @@ int main(int argc, char *argv[])
                 }
         else
                 printf("test 3 ok\n");
+        EVP_MD_CTX_cleanup(&c);
         exit(err);
         return(0);
         }