diff options
author | Luiz Otavio O Souza <luiz@netgate.com> | 2015-09-15 15:50:00 -0500 |
---|---|---|
committer | Luiz Otavio O Souza <luiz@netgate.com> | 2015-10-20 12:03:24 -0500 |
commit | fbbde3a0d1cef7642b2575e0b008ab41c519809c (patch) | |
tree | e19c9b385bef3548ddb16fd9b4d8f49238d1b99e /lib/libmd/sha1c.c | |
parent | e8001fd0fddc08dbe26cabe348f1adca96c271d8 (diff) | |
download | FreeBSD-src-fbbde3a0d1cef7642b2575e0b008ab41c519809c.zip FreeBSD-src-fbbde3a0d1cef7642b2575e0b008ab41c519809c.tar.gz |
MFC r282726:
Ensure libmd symbols do not clash with libcrypto
Add a prefix to all symbols in libmd to avoid incompatibilites
with same-named, but not binary compatible, symbols from libcrypto.
Also introduce Weak aliases to avoid the need to rebuild dependent
binaries and a major version bump.
PR: 199119
Differential Revision: D2216
Reviewed by: roberto, delphij
MFC after: 2 weeks
TAG: IPSEC-HEAD
Issue: #4841
Diffstat (limited to 'lib/libmd/sha1c.c')
-rw-r--r-- | lib/libmd/sha1c.c | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/lib/libmd/sha1c.c b/lib/libmd/sha1c.c index ba3278a..ea50622 100644 --- a/lib/libmd/sha1c.c +++ b/lib/libmd/sha1c.c @@ -488,3 +488,28 @@ SHA_CTX *c; /* memset((char *)&c,0,sizeof(c));*/ } + +#undef SHA_Init +__weak_reference(_libmd_SHA_Init, SHA_Init); +#undef SHA_Update +__weak_reference(_libmd_SHA_Update, SHA_Update); +#undef SHA_Final +__weak_reference(_libmd_SHA_Final, SHA_Final); +#undef SHA_Transform +__weak_reference(_libmd_SHA_Transform, SHA_Transform); +#undef SHA_version +__weak_reference(_libmd_SHA_version, SHA_version); +#undef sha_block +__weak_reference(_libmd_sha_block, sha_block); +#undef SHA1_Init +__weak_reference(_libmd_SHA1_Init, SHA1_Init); +#undef SHA1_Update +__weak_reference(_libmd_SHA1_Update, SHA1_Update); +#undef SHA1_Final +__weak_reference(_libmd_SHA1_Final, SHA1_Final); +#undef SHA1_Transform +__weak_reference(_libmd_SHA1_Transform, SHA1_Transform); +#undef SHA1_version +__weak_reference(_libmd_SHA1_version, SHA1_version); +#undef sha1_block +__weak_reference(_libmd_sha1_block, sha1_block); |