projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
correct error code
[oweals/openssl.git]
/
crypto
/
md5
/
md5test.c
diff --git
a/crypto/md5/md5test.c
b/crypto/md5/md5test.c
index cf8cf51b6bfcc7211a04a9fefe87c0ad4eab75ef..2b37190e32b1c45738b017c892c579b03e081f2a 100644
(file)
--- a/
crypto/md5/md5test.c
+++ b/
crypto/md5/md5test.c
@@
-60,6
+60,8
@@
#include <string.h>
#include <stdlib.h>
#include <string.h>
#include <stdlib.h>
+#include "../e_os.h"
+
#ifdef OPENSSL_NO_MD5
int main(int argc, char *argv[])
{
#ifdef OPENSSL_NO_MD5
int main(int argc, char *argv[])
{
@@
-67,6
+69,7
@@
int main(int argc, char *argv[])
return(0);
}
#else
return(0);
}
#else
+#include <openssl/evp.h>
#include <openssl/md5.h>
static char *test[]={
#include <openssl/md5.h>
static char *test[]={
@@
-94,15
+97,17
@@
static char *pt(unsigned char *md);
int main(int argc, char *argv[])
{
int i,err=0;
int main(int argc, char *argv[])
{
int i,err=0;
-
unsigned
char **P,**R;
+ char **P,**R;
char *p;
char *p;
+ unsigned char md[MD5_DIGEST_LENGTH];
- P=
(unsigned char **)
test;
- R=
(unsigned char **)
ret;
+ P=test;
+ R=ret;
i=1;
while (*P != NULL)
{
i=1;
while (*P != NULL)
{
- p=pt(MD5(&(P[0][0]),(unsigned long)strlen((char *)*P),NULL));
+ EVP_Digest(&(P[0][0]),strlen((char *)*P),md,NULL,EVP_md5(), NULL);
+ p=pt(md);
if (strcmp(p,(char *)*R) != 0)
{
printf("error calculating MD5 on '%s'\n",*P);
if (strcmp(p,(char *)*R) != 0)
{
printf("error calculating MD5 on '%s'\n",*P);
@@
-115,7
+120,11
@@
int main(int argc, char *argv[])
R++;
P++;
}
R++;
P++;
}
- exit(err);
+
+#ifdef OPENSSL_SYS_NETWARE
+ if (err) printf("ERROR: %d\n", err);
+#endif
+ EXIT(err);
return(0);
}
return(0);
}