projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix BN_rshift, which caused lots of trouble.
[oweals/openssl.git]
/
crypto
/
md5
/
md5test.c
diff --git
a/crypto/md5/md5test.c
b/crypto/md5/md5test.c
index 74b84bc67f8358d17971047183ed108aea324b47..6bd86563020e1b871b286355b8a6c40866b76d99 100644
(file)
--- a/
crypto/md5/md5test.c
+++ b/
crypto/md5/md5test.c
@@
-59,9
+59,17
@@
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
-#include "md5.h"
-char *test[]={
+#ifdef NO_MD5
+int main(int argc, char *argv[])
+{
+ printf("No MD5 support\n");
+ return(0);
+}
+#else
+#include <openssl/md5.h>
+
+static char *test[]={
"",
"a",
"abc",
"",
"a",
"abc",
@@
-72,7
+80,7
@@
char *test[]={
NULL,
};
NULL,
};
-char *ret[]={
+
static
char *ret[]={
"d41d8cd98f00b204e9800998ecf8427e",
"0cc175b9c0f1b6a831c399e269772661",
"900150983cd24fb0d6963f7d28e17f72",
"d41d8cd98f00b204e9800998ecf8427e",
"0cc175b9c0f1b6a831c399e269772661",
"900150983cd24fb0d6963f7d28e17f72",
@@
-82,15
+90,8
@@
char *ret[]={
"57edf4a22be3c955ac49da2e2107b67a",
};
"57edf4a22be3c955ac49da2e2107b67a",
};
-#ifndef NOPROTO
static char *pt(unsigned char *md);
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;
{
int i,err=0;
unsigned char **P,**R;
@@
-118,8
+119,7
@@
char *argv[];
return(0);
}
return(0);
}
-static char *pt(md)
-unsigned char *md;
+static char *pt(unsigned char *md)
{
int i;
static char buf[80];
{
int i;
static char buf[80];
@@
-128,3
+128,4
@@
unsigned char *md;
sprintf(&(buf[i*2]),"%02x",md[i]);
return(buf);
}
sprintf(&(buf[i*2]),"%02x",md[i]);
return(buf);
}
+#endif