import openssl-0.9.7-beta1

3 files changed, 36 insertions, 30 deletions

diff --git a/src/lib/libcrypto/ripemd/asm/rips.cpp b/src/lib/libcrypto/ripemd/asm/rips.cpp
index 78a933c448..f7a13677a9 100644
--- a/src/lib/libcrypto/ripemd/asm/rips.cpp
+++ b/src/lib/libcrypto/ripemd/asm/rips.cpp
@@ -32,7 +32,9 @@ void GetTSC(unsigned long& tsc)
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "ripemd.h"
+#include <openssl/ripemd.h>
+
+#define ripemd160_block_x86 ripemd160_block_asm_host_order
 
 extern "C" {
 void ripemd160_block_x86(RIPEMD160_CTX *ctx, unsigned char *buffer,int num);
@@ -55,8 +57,10 @@ void main(int argc,char *argv[])
         if (num == 0) num=16;
         if (num > 250) num=16;
         numm=num+2;
+#if 0
         num*=64;
         numm*=64;
+#endif
 
         for (j=0; j<6; j++)
                 {
@@ -71,7 +75,7 @@ void main(int argc,char *argv[])
                         GetTSC(e2);
                         ripemd160_block_x86(&ctx,buffer,num);
                         }
-                printf("ripemd160 (%d bytes) %d %d (%.2f)\n",num,
+                printf("ripemd160 (%d bytes) %d %d (%.2f)\n",num*64,
                         e1-s1,e2-s2,(double)((e1-s1)-(e2-s2))/2);
                 }
         }
diff --git a/src/lib/libcrypto/ripemd/rmd160.c b/src/lib/libcrypto/ripemd/rmd160.c
index 3fa1b8096e..4f8b88a18a 100644
--- a/src/lib/libcrypto/ripemd/rmd160.c
+++ b/src/lib/libcrypto/ripemd/rmd160.c
@@ -58,23 +58,17 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "ripemd.h"
+#include <openssl/ripemd.h>
 
 #define BUFSIZE 1024*16
 
-#ifndef NOPROTO
 void do_fp(FILE *f);
 void pt(unsigned char *md);
+#ifndef _OSD_POSIX
 int read(int, void *, unsigned int);
-#else
-void do_fp();
-void pt();
-int read();
 #endif
 
-int main(argc, argv)
-int argc;
-char **argv;
+int main(int argc, char **argv)
         {
         int i,err=0;
         FILE *IN;
@@ -102,8 +96,7 @@ char **argv;
         exit(err);
         }
 
-void do_fp(f)
-FILE *f;
+void do_fp(FILE *f)
         {
         RIPEMD160_CTX c;
         unsigned char md[RIPEMD160_DIGEST_LENGTH];
@@ -123,8 +116,7 @@ FILE *f;
         pt(md);
         }
 
-void pt(md)
-unsigned char *md;
+void pt(unsigned char *md)
         {
         int i;
 
diff --git a/src/lib/libcrypto/ripemd/rmdtest.c b/src/lib/libcrypto/ripemd/rmdtest.c
index 6a0297f975..19e9741db2 100644
--- a/src/lib/libcrypto/ripemd/rmdtest.c
+++ b/src/lib/libcrypto/ripemd/rmdtest.c
@@ -59,9 +59,22 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#include "ripemd.h"
+#include <openssl/ripemd.h>
 
-char *test[]={
+#ifdef OPENSSL_NO_RIPEMD
+int main(int argc, char *argv[])
+{
+    printf("No ripemd support\n");
+    return(0);
+}
+#else
+#include <openssl/evp.h>
+
+#ifdef CHARSET_EBCDIC
+#include <openssl/ebcdic.h>
+#endif
+
+static char *test[]={
         "",
         "a",
         "abc",
@@ -73,7 +86,7 @@ char *test[]={
         NULL,
         };
 
-char *ret[]={
+static char *ret[]={
         "9c1185a5c5e9fc54612808977ee8f548b2258d31",
         "0bdc9d2d256b3ee9daae347be6f4dc835a467ffe",
         "8eb208f7e05d987a9b044a8e98c6b087f15a0bfc",
@@ -84,26 +97,24 @@ char *ret[]={
         "9b752e45573d4b39f4dbd3323cab82bf63326bfb",
         };
 
-#ifndef NOPROTO
 static char *pt(unsigned char *md);
-#else
-static char *pt();
-#endif
-
-int main(argc,argv)
-int argc;
-char *argv[];
+int main(int argc, char *argv[])
         {
         int i,err=0;
         unsigned char **P,**R;
         char *p;
+        unsigned char md[RIPEMD160_DIGEST_LENGTH];
 
         P=(unsigned char **)test;
         R=(unsigned char **)ret;
         i=1;
         while (*P != NULL)
                 {
-                p=pt(RIPEMD160(&(P[0][0]),(unsigned long)strlen((char *)*P),NULL));
+#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);
+                p=pt(md);
                 if (strcmp(p,(char *)*R) != 0)
                         {
                         printf("error calculating RIPEMD160 on '%s'\n",*P);
@@ -120,8 +131,7 @@ char *argv[];
         return(0);
         }
 
-static char *pt(md)
-unsigned char *md;
+static char *pt(unsigned char *md)
         {
         int i;
         static char buf[80];
@@ -130,4 +140,4 @@ unsigned char *md;
                 sprintf(&(buf[i*2]),"%02x",md[i]);
         return(buf);
         }
-
+#endif