Attachment 155151 Details for Bug 199119 – patch to avoid the symbol clash

[patch] patch to avoid the symbol clash

d (text/plain), 2.84 KB, created by Thomas Quinot on 2015-04-03 08:30:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas Quinot

Created: 2015-04-03 08:30:19 UTC

Size: 2.84 KB

patch

obsolete

>Index: lib/libmd/Makefile
>===================================================================
>--- lib/libmd/Makefile	(revision 280990)
>+++ lib/libmd/Makefile	(working copy)
>@@ -1,7 +1,7 @@
> # $FreeBSD$
> 
> LIB=	md
>-SHLIB_MAJOR= 6
>+SHLIB_MAJOR= 7
> SHLIBDIR?= /lib
> SRCS=	md4c.c md5c.c md4hl.c md5hl.c \
> 	rmd160c.c rmd160hl.c \
>Index: lib/libmd/ripemd.h
>===================================================================
>--- lib/libmd/ripemd.h	(revision 280990)
>+++ lib/libmd/ripemd.h	(working copy)
>@@ -81,6 +81,15 @@
> } RIPEMD160_CTX;
> 
> __BEGIN_DECLS
>+
>+/* Ensure our symbols do not clash with libcrypto */
>+
>+#define RIPEMD160_Final		_libmd_RIPEMD160_Final
>+#define RIPEMD160_Init		_libmd_RIPEMD160_Init
>+#define RIPEMD160_Transform	_libmd_RIPEMD160_Transform
>+#define RIPEMD160_Update	_libmd_RIPEMD160_Update
>+#define RMD160_version		_libmd_RMD160_version
>+
> void	RIPEMD160_Init(RIPEMD160_CTX *c);
> void	RIPEMD160_Update(RIPEMD160_CTX *c, const void *data,
> 			 size_t len);
>Index: lib/libmd/sha.h
>===================================================================
>--- lib/libmd/sha.h	(revision 280990)
>+++ lib/libmd/sha.h	(working copy)
>@@ -79,6 +79,21 @@
> #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);
>Index: lib/libmd/sha256.h
>===================================================================
>--- lib/libmd/sha256.h	(revision 280990)
>+++ lib/libmd/sha256.h	(working copy)
>@@ -38,6 +38,13 @@
> } SHA256_CTX;
> 
> __BEGIN_DECLS
>+
>+/* Ensure our symbols do not clash with libcrypto */
>+
>+#define SHA256_Final	_libmd_SHA256_Final
>+#define SHA256_Init	_libmd_SHA256_Init
>+#define SHA256_Update	_libmd_SHA256_Update
>+
> void	SHA256_Init(SHA256_CTX *);
> void	SHA256_Update(SHA256_CTX *, const void *, size_t);
> void	SHA256_Final(unsigned char [32], SHA256_CTX *);
>Index: lib/libmd/sha512.h
>===================================================================
>--- lib/libmd/sha512.h	(revision 280990)
>+++ lib/libmd/sha512.h	(working copy)
>@@ -38,6 +38,13 @@
> } SHA512_CTX;
> 
> __BEGIN_DECLS
>+
>+/* Ensure our symbols do not clash with libcrypto */
>+
>+#define SHA512_Final	_libmd_SHA512_Final
>+#define SHA512_Init	_libmd_SHA512_Init
>+#define SHA512_Update	_libmd_SHA512_Update
>+
> void	SHA512_Init(SHA512_CTX *);
> void	SHA512_Update(SHA512_CTX *, const void *, size_t);
> void	SHA512_Final(unsigned char [64], SHA512_CTX *);

Actions: View | Diff

Attachments on bug 199119: 155151