projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Redirect FIPS memory allocation to FIPS_malloc() routine, remove
[oweals/openssl.git]
/
crypto
/
sha
/
shatest.c
diff --git
a/crypto/sha/shatest.c
b/crypto/sha/shatest.c
index d007cf13ede94a5b5607ca7555ec609a14cf6737..27614646d1548463dc66e0d728d12c8782a3e548 100644
(file)
--- a/
crypto/sha/shatest.c
+++ b/
crypto/sha/shatest.c
@@
-62,10
+62,10
@@
#include "../e_os.h"
#include "../e_os.h"
-#if
def OPENSSL_NO_SHA
+#if
defined(OPENSSL_NO_SHA) || defined(OPENSSL_NO_SHA0)
int main(int argc, char *argv[])
{
int main(int argc, char *argv[])
{
- printf("No SHA support\n");
+ printf("No SHA
0
support\n");
return(0);
}
#else
return(0);
}
#else
@@
-106,7
+106,7
@@
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;
static unsigned char buf[1000];
char *p,*r;
EVP_MD_CTX c;
static unsigned char buf[1000];
char *p,*r;
EVP_MD_CTX c;
@@
-118,14
+118,14
@@
int main(int argc, char *argv[])
#endif
EVP_MD_CTX_init(&c);
#endif
EVP_MD_CTX_init(&c);
- P=
(unsigned char **)
test;
- R=
(unsigned char **)
ret;
+ P=test;
+ R=ret;
i=1;
while (*P != NULL)
{
i=1;
while (*P != NULL)
{
- EVP_Digest(*P,strlen(
(char *)
*P),md,NULL,EVP_sha(), NULL);
+ EVP_Digest(*P,strlen(*P),md,NULL,EVP_sha(), NULL);
p=pt(md);
p=pt(md);
- if (strcmp(p,
(char *)
*R) != 0)
+ if (strcmp(p,*R) != 0)
{
printf("error calculating SHA on '%s'\n",*P);
printf("got %s instead of %s\n",p,*R);
{
printf("error calculating SHA on '%s'\n",*P);
printf("got %s instead of %s\n",p,*R);