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

Avoid collisions with function names in openssl headers.

Browse Source 
Just using MD5, SHA1, RMD160 and SHA256 for defines collides with
functions of the same name in OpenSSL. This can cause compilation
issues in downstream consumers if they use OpenSSL for the hash
functions instead of libmd.

Reviewed by:	sjg
Obtained from:	Juniper Networks, Inc.
Differential Revision:	https://reviews.freebsd.org/D26321
This commit is contained in:
Stephen J. Kiernan 2020-09-04 04:31:56 +00:00
parent 46888dedc9
commit 291124e3c0
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
usr.sbin/fmtree/Makefile
View File

@ -10,7 +10,7 @@ MAN= fmtree.8
SRCS= compare.c crc.c create.c excludes.c misc.c mtree.c spec.c verify.c
SRCS+= specspec.c
CFLAGS+= -DMD5 -DSHA1 -DRMD160 -DSHA256
CFLAGS+= -DWITH_MD5 -DWITH_SHA1 -DWITH_RMD160 -DWITH_SHA256
LIBADD= md
CLEANFILES+= fmtree.8

16
usr.sbin/fmtree/compare.c
View File

@ -43,16 +43,16 @@ __FBSDID("$FreeBSD$");
#include <errno.h>
#include <fcntl.h>
#include <fts.h>
#ifdef MD5
#ifdef WITH_MD5
#include <md5.h>
#endif
#ifdef RMD160
#ifdef WITH_RMD160
#include <ripemd.h>
#endif
#ifdef SHA1
#ifdef WITH_SHA1
#include <sha.h>
#endif
#ifdef SHA256
#ifdef WITH_SHA256
#include <sha256.h>
#endif
#include <stdint.h>
@ -244,7 +244,7 @@ typeerr: LABEL;
(void)printf("\n");
tab = "\t";
}
#ifdef MD5
#ifdef WITH_MD5
if (s->flags & F_MD5) {
char *new_digest, buf[33];
@ -262,7 +262,7 @@ typeerr: LABEL;
}
}
#endif /* MD5 */
#ifdef SHA1
#ifdef WITH_SHA1
if (s->flags & F_SHA1) {
char *new_digest, buf[41];
@ -280,7 +280,7 @@ typeerr: LABEL;
}
}
#endif /* SHA1 */
#ifdef RMD160
#ifdef WITH_RMD160
if (s->flags & F_RMD160) {
char *new_digest, buf[41];
@ -298,7 +298,7 @@ typeerr: LABEL;
}
}
#endif /* RMD160 */
#ifdef SHA256
#ifdef WITH_SHA256
if (s->flags & F_SHA256) {
char *new_digest, buf[65];