projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix warnings
[openssl.git]
/
crypto
/
md32_common.h
diff --git
a/crypto/md32_common.h
b/crypto/md32_common.h
index 9a6a27512f60f2e1d1950a3ed48bac0374d5a494..353d2b96add8be240fc99a65ee01f3be64debbb8 100644
(file)
--- a/
crypto/md32_common.h
+++ b/
crypto/md32_common.h
@@
-179,7
+179,7
@@
*/
#undef ROTATE
#ifndef PEDANTIC
*/
#undef ROTATE
#ifndef PEDANTIC
-# if
defined(_MSC_VER)
+# if
0 /* defined(_MSC_VER) */
# define ROTATE(a,n) _lrotl(a,n)
# elif defined(__MWERKS__)
# if defined(__POWERPC__)
# define ROTATE(a,n) _lrotl(a,n)
# elif defined(__MWERKS__)
# if defined(__POWERPC__)
@@
-190,7
+190,7
@@
# else
# define ROTATE(a,n) __rol(a,n)
# endif
# else
# define ROTATE(a,n) __rol(a,n)
# endif
-# elif defined(__GNUC__) && __GNUC__>=2 && !defined(
NO
_ASM)
+# elif defined(__GNUC__) && __GNUC__>=2 && !defined(
OPENSSL_NO_ASM) && !defined(OPENSSL_NO_INLINE
_ASM)
/*
* Some GNU C inline assembler templates. Note that these are
* rotates by *constant* number of bits! But that's exactly
/*
* Some GNU C inline assembler templates. Note that these are
* rotates by *constant* number of bits! But that's exactly
@@
-198,7
+198,7
@@
*
* <appro@fy.chalmers.se>
*/
*
* <appro@fy.chalmers.se>
*/
-# if defined(__i386)
+# if defined(__i386)
|| defined(__i386__)
# define ROTATE(a,n) ({ register unsigned int ret; \
asm ( \
"roll %1,%0" \
# define ROTATE(a,n) ({ register unsigned int ret; \
asm ( \
"roll %1,%0" \
@@
-222,9
+222,9
@@
* Engage compiler specific "fetch in reverse byte order"
* intrinsic function if available.
*/
* Engage compiler specific "fetch in reverse byte order"
* intrinsic function if available.
*/
-# if defined(__GNUC__) && __GNUC__>=2 && !defined(
NO
_ASM)
+# if defined(__GNUC__) && __GNUC__>=2 && !defined(
OPENSSL_NO_ASM) && !defined(OPENSSL_NO_INLINE
_ASM)
/* some GNU C inline assembler templates by <appro@fy.chalmers.se> */
/* some GNU C inline assembler templates by <appro@fy.chalmers.se> */
-# if
defined(__i386
) && !defined(I386_ONLY)
+# if
(defined(__i386) || defined(__i386__)
) && !defined(I386_ONLY)
# define BE_FETCH32(a) ({ register unsigned int l=(a);\
asm ( \
"bswapl %0" \
# define BE_FETCH32(a) ({ register unsigned int l=(a);\
asm ( \
"bswapl %0" \
@@
-240,7
+240,7
@@
l; \
})
l; \
})
-# elif defined(__sparc) && defined(ULTRASPARC)
+# elif defined(__sparc) && defined(
OPENSSL_SYS_
ULTRASPARC)
# define LE_FETCH32(a) ({ register unsigned int l; \
asm ( \
"lda [%1]#ASI_PRIMARY_LITTLE,%0"\
# define LE_FETCH32(a) ({ register unsigned int l; \
asm ( \
"lda [%1]#ASI_PRIMARY_LITTLE,%0"\
@@
-410,13
+410,14
@@
* Time for some action:-)
*/
* Time for some action:-)
*/
-
void HASH_UPDATE (HASH_CTX *c, const unsigned char *data
, unsigned long len)
+
int HASH_UPDATE (HASH_CTX *c, const void *data_
, unsigned long len)
{
{
+ const unsigned char *data=data_;
register HASH_LONG * p;
register unsigned long l;
int sw,sc,ew,ec;
register HASH_LONG * p;
register unsigned long l;
int sw,sc,ew,ec;
- if (len==0) return;
+ if (len==0) return
1
;
l=(c->Nl+(len<<3))&0xffffffffL;
/* 95-05-24 eay Fixed a bug with the overflow handling, thanks to
l=(c->Nl+(len<<3))&0xffffffffL;
/* 95-05-24 eay Fixed a bug with the overflow handling, thanks to
@@
-465,7
+466,7
@@
void HASH_UPDATE (HASH_CTX *c, const unsigned char *data, unsigned long len)
HOST_c2l_p(data,l,ec); p[sw]=l;
}
}
HOST_c2l_p(data,l,ec); p[sw]=l;
}
}
- return;
+ return
1
;
}
}
}
}
@@
-519,6
+520,7
@@
void HASH_UPDATE (HASH_CTX *c, const unsigned char *data, unsigned long len)
HOST_c2l_p(data,l,ec);
*p=l;
}
HOST_c2l_p(data,l,ec);
*p=l;
}
+ return 1;
}
}
@@
-542,7
+544,7
@@
void HASH_TRANSFORM (HASH_CTX *c, const unsigned char *data)
}
}
-
void
HASH_FINAL (unsigned char *md, HASH_CTX *c)
+
int
HASH_FINAL (unsigned char *md, HASH_CTX *c)
{
register HASH_LONG *p;
register unsigned long l;
{
register HASH_LONG *p;
register unsigned long l;
@@
-603,4
+605,5
@@
void HASH_FINAL (unsigned char *md, HASH_CTX *c)
* but I'm not worried :-)
memset((void *)c,0,sizeof(HASH_CTX));
*/
* but I'm not worried :-)
memset((void *)c,0,sizeof(HASH_CTX));
*/
+ return 1;
}
}