Attachment #155151 for bug #199119

View | Details | Raw Unified | Return to bug 199119
Collapse All | Expand All

Lines 1-7 Link Here

(-)lib/libmd/Makefile (-1 / +1 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	LIB= md	3	LIB= md
4	SHLIB_MAJOR= 6	4	SHLIB_MAJOR= 7
5	SHLIBDIR?= /lib	5	SHLIBDIR?= /lib
6	SRCS= md4c.c md5c.c md4hl.c md5hl.c \	6	SRCS= md4c.c md5c.c md4hl.c md5hl.c \
7	rmd160c.c rmd160hl.c \	7	rmd160c.c rmd160hl.c \

Lines 81-86 Link Here

(-)lib/libmd/ripemd.h (+9 lines)
81	} RIPEMD160_CTX;	81	} RIPEMD160_CTX;
82		82
83	__BEGIN_DECLS	83	__BEGIN_DECLS
		84
		85	/* Ensure our symbols do not clash with libcrypto */
		86
		87	#define RIPEMD160_Final _libmd_RIPEMD160_Final
		88	#define RIPEMD160_Init _libmd_RIPEMD160_Init
		89	#define RIPEMD160_Transform _libmd_RIPEMD160_Transform
		90	#define RIPEMD160_Update _libmd_RIPEMD160_Update
		91	#define RMD160_version _libmd_RMD160_version
		92
84	void RIPEMD160_Init(RIPEMD160_CTX *c);	93	void RIPEMD160_Init(RIPEMD160_CTX *c);
85	void RIPEMD160_Update(RIPEMD160_CTX c, const void data,	94	void RIPEMD160_Update(RIPEMD160_CTX c, const void data,
86	size_t len);	95	size_t len);




#define	SHA1_CTX	SHA_CTX

__BEGIN_DECLS

/* Ensure our symbols do not clash with libcrypto */

#define SHA_Final	_libmd_SHA_Final
#define SHA_Init	_libmd_SHA_Init
#define SHA_Transform	_libmd_SHA_Transform
#define SHA_Update	_libmd_SHA_Update
#define SHA_version	_libmd_SHA_version

#define SHA1_Final	_libmd_SHA1_Final
#define SHA1_Init	_libmd_SHA1_Init
#define SHA1_Transform	_libmd_SHA1_Transform
#define SHA1_Update	_libmd_SHA1_Update
#define SHA1_version	_libmd_SHA1_version

void	SHA_Init(SHA_CTX *c);
void	SHA_Update(SHA_CTX *c, const void *data, size_t len);
void	SHA_Final(unsigned char *md, SHA_CTX *c);

Lines 38-43 Link Here

(-)lib/libmd/sha256.h (+7 lines)
38	} SHA256_CTX;	38	} SHA256_CTX;
39		39
40	__BEGIN_DECLS	40	__BEGIN_DECLS
		41
		42	/* Ensure our symbols do not clash with libcrypto */
		43
		44	#define SHA256_Final _libmd_SHA256_Final
		45	#define SHA256_Init _libmd_SHA256_Init
		46	#define SHA256_Update _libmd_SHA256_Update
		47
41	void SHA256_Init(SHA256_CTX *);	48	void SHA256_Init(SHA256_CTX *);
42	void SHA256_Update(SHA256_CTX , const void , size_t);	49	void SHA256_Update(SHA256_CTX , const void , size_t);
43	void SHA256_Final(unsigned char [32], SHA256_CTX *);	50	void SHA256_Final(unsigned char [32], SHA256_CTX *);

Lines 38-43 Link Here

(-)lib/libmd/sha512.h (+7 lines)
38	} SHA512_CTX;	38	} SHA512_CTX;
39		39
40	__BEGIN_DECLS	40	__BEGIN_DECLS
		41
		42	/* Ensure our symbols do not clash with libcrypto */
		43
		44	#define SHA512_Final _libmd_SHA512_Final
		45	#define SHA512_Init _libmd_SHA512_Init
		46	#define SHA512_Update _libmd_SHA512_Update
		47
41	void SHA512_Init(SHA512_CTX *);	48	void SHA512_Init(SHA512_CTX *);
42	void SHA512_Update(SHA512_CTX , const void , size_t);	49	void SHA512_Update(SHA512_CTX , const void , size_t);
43	void SHA512_Final(unsigned char [64], SHA512_CTX *);	50	void SHA512_Final(unsigned char [64], SHA512_CTX *);

Return to bug 199119

Lines 79-84 Link Here

(-)lib/libmd/sha.h (+15 lines)
79	#define SHA1_CTX SHA_CTX	79	#define SHA1_CTX SHA_CTX
80		80
81	__BEGIN_DECLS	81	__BEGIN_DECLS
		82
		83	/* Ensure our symbols do not clash with libcrypto */
		84
		85	#define SHA_Final _libmd_SHA_Final
		86	#define SHA_Init _libmd_SHA_Init
		87	#define SHA_Transform _libmd_SHA_Transform
		88	#define SHA_Update _libmd_SHA_Update
		89	#define SHA_version _libmd_SHA_version
		90
		91	#define SHA1_Final _libmd_SHA1_Final
		92	#define SHA1_Init _libmd_SHA1_Init
		93	#define SHA1_Transform _libmd_SHA1_Transform
		94	#define SHA1_Update _libmd_SHA1_Update
		95	#define SHA1_version _libmd_SHA1_version
		96
82	void SHA_Init(SHA_CTX *c);	97	void SHA_Init(SHA_CTX *c);
83	void SHA_Update(SHA_CTX c, const void data, size_t len);	98	void SHA_Update(SHA_CTX c, const void data, size_t len);
84	void SHA_Final(unsigned char md, SHA_CTX c);	99	void SHA_Final(unsigned char md, SHA_CTX c);