d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert r334090.

Browse Source 
It causes the 32bit compat build of libmd to fail with:

libmd/rmd160c.c:86:9: error: 'ripemd160_block' macro redefined
#define ripemd160_block ripemd160_block_x86
        ^
libmd/ripemd.h:122:9: note: previous definition is here
#define ripemd160_block         _libmd_ripemd160_block
This commit is contained in:
markj 2018-05-23 17:01:28 +00:00
parent 4a166d604d
commit 1ff7e0b99a
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/libmd/Makefile
View File

@ -15,7 +15,7 @@ SRCS= md4c.c md5c.c md4hl.c md5hl.c \
INCS= md4.h md5.h ripemd.h sha.h sha256.h sha384.h sha512.h sha512t.h \ INCS= md4.h md5.h ripemd.h sha.h sha256.h sha384.h sha512.h sha512t.h \
skein.h skein_port.h skein_freebsd.h skein_iv.h skein.h skein_port.h skein_freebsd.h skein_iv.h
WARNS?= 1 WARNS?= 0
MAN+= md4.3 md5.3 ripemd.3 sha.3 sha256.3 sha512.3 skein.3 MAN+= md4.3 md5.3 ripemd.3 sha.3 sha256.3 sha512.3 skein.3
MLINKS+=md4.3 MD4Init.3 md4.3 MD4Update.3 md4.3 MD4Final.3 MLINKS+=md4.3 MD4Init.3 md4.3 MD4Update.3 md4.3 MD4Final.3

3
lib/libmd/mdXhl.c
View File

@ -54,7 +54,8 @@ MDXFdChunk(int fd, char *buf, off_t ofs, off_t len)
{ {
unsigned char buffer[16*1024]; unsigned char buffer[16*1024];
MDX_CTX ctx; MDX_CTX ctx;
int readrv; struct stat stbuf;
int readrv, e;
off_t remain; off_t remain;
if (len < 0) { if (len < 0) {