summaryrefslogtreecommitdiffstats
path: root/lib/libmd/sha.h
diff options
context:
space:
mode:
authorLuiz Otavio O Souza <luiz@netgate.com>2015-09-15 15:50:00 -0500
committerLuiz Otavio O Souza <luiz@netgate.com>2015-10-20 12:03:24 -0500
commitfbbde3a0d1cef7642b2575e0b008ab41c519809c (patch)
treee19c9b385bef3548ddb16fd9b4d8f49238d1b99e /lib/libmd/sha.h
parente8001fd0fddc08dbe26cabe348f1adca96c271d8 (diff)
downloadFreeBSD-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/sha.h')
-rw-r--r--lib/libmd/sha.h28
1 files changed, 28 insertions, 0 deletions
diff --git a/lib/libmd/sha.h b/lib/libmd/sha.h
index 8a0b7c2..502f1ae 100644
--- a/lib/libmd/sha.h
+++ b/lib/libmd/sha.h
@@ -79,6 +79,33 @@ typedef struct SHAstate_st {
#define SHA1_CTX SHA_CTX
__BEGIN_DECLS
+
+/* Ensure libmd symbols do not clash with libcrypto */
+
+#define SHA_Init _libmd_SHA_Init
+#define SHA_Update _libmd_SHA_Update
+#define SHA_Final _libmd_SHA_Final
+#define SHA_End _libmd_SHA_End
+#define SHA_File _libmd_SHA_File
+#define SHA_FileChunk _libmd_SHA_FileChunk
+#define SHA_Data _libmd_SHA_Data
+
+#define SHA_Transform _libmd_SHA_Transform
+#define SHA_version _libmd_SHA_version
+#define sha_block _libmd_sha_block
+
+#define SHA1_Init _libmd_SHA1_Init
+#define SHA1_Update _libmd_SHA1_Update
+#define SHA1_Final _libmd_SHA1_Final
+#define SHA1_End _libmd_SHA1_End
+#define SHA1_File _libmd_SHA1_File
+#define SHA1_FileChunk _libmd_SHA1_FileChunk
+#define SHA1_Data _libmd_SHA1_Data
+
+#define SHA1_Transform _libmd_SHA1_Transform
+#define SHA1_version _libmd_SHA1_version
+#define sha1_block _libmd_sha1_block
+
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);
@@ -86,6 +113,7 @@ char *SHA_End(SHA_CTX *, char *);
char *SHA_File(const char *, char *);
char *SHA_FileChunk(const char *, char *, off_t, off_t);
char *SHA_Data(const void *, unsigned int, char *);
+
void SHA1_Init(SHA_CTX *c);
void SHA1_Update(SHA_CTX *c, const void *data, size_t len);
void SHA1_Final(unsigned char *md, SHA_CTX *c);
OpenPOWER on IntegriCloud