From 37108ee7f49986f2b8cf60d83deff971e55426b2 Mon Sep 17 00:00:00 2001 From: Jan Palus Date: Sun, 17 Nov 2024 18:58:42 +0100 Subject: [PATCH] md5-stream, sha*-stream, sm3-stream: Avoid duplicate symbols. * lib/md5-stream.c (GL_OPENSSL_INLINE): Remove definition, that caused the symbols defined in md5.o to be defined in md5-stream.o as well. * lib/sha1-stream.c (GL_OPENSSL_INLINE): Likewise. * lib/sha256-stream.c (GL_OPENSSL_INLINE): Likewise. * lib/sha512-stream.c (GL_OPENSSL_INLINE): Likewise. * lib/sm3-stream.c (GL_OPENSSL_INLINE): Likewise. Copyright-paperwork-exempt: Yes --- ChangeLog | 10 ++++++++++ lib/md5-stream.c | 3 --- lib/sha1-stream.c | 3 --- lib/sha256-stream.c | 3 --- lib/sha512-stream.c | 3 --- lib/sm3-stream.c | 3 --- 6 files changed, 10 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2ab1a90226..b3a1b99bef 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2024-11-17 Jan Palus (tiny change) + + md5-stream, sha*-stream, sm3-stream: Avoid duplicate symbols. + * lib/md5-stream.c (GL_OPENSSL_INLINE): Remove definition, that caused + the symbols defined in md5.o to be defined in md5-stream.o as well. + * lib/sha1-stream.c (GL_OPENSSL_INLINE): Likewise. + * lib/sha256-stream.c (GL_OPENSSL_INLINE): Likewise. + * lib/sha512-stream.c (GL_OPENSSL_INLINE): Likewise. + * lib/sm3-stream.c (GL_OPENSSL_INLINE): Likewise. + 2024-11-14 Bruno Haible pthread-rwlock: Fix configure test for AIX with xlc. diff --git a/lib/md5-stream.c b/lib/md5-stream.c index c82f18145e..feb1740291 100644 --- a/lib/md5-stream.c +++ b/lib/md5-stream.c @@ -22,9 +22,6 @@ #include /* Specification. */ -#if HAVE_OPENSSL_MD5 -# define GL_OPENSSL_INLINE _GL_EXTERN_INLINE -#endif #include "md5.h" #include diff --git a/lib/sha1-stream.c b/lib/sha1-stream.c index 7bf44e5ea3..d2f92e8f56 100644 --- a/lib/sha1-stream.c +++ b/lib/sha1-stream.c @@ -24,9 +24,6 @@ #include /* Specification. */ -#if HAVE_OPENSSL_SHA1 -# define GL_OPENSSL_INLINE _GL_EXTERN_INLINE -#endif #include "sha1.h" #include diff --git a/lib/sha256-stream.c b/lib/sha256-stream.c index 08d24b7bfc..bae0a9c5a0 100644 --- a/lib/sha256-stream.c +++ b/lib/sha256-stream.c @@ -23,9 +23,6 @@ #include /* Specification. */ -#if HAVE_OPENSSL_SHA256 -# define GL_OPENSSL_INLINE _GL_EXTERN_INLINE -#endif #include "sha256.h" #include diff --git a/lib/sha512-stream.c b/lib/sha512-stream.c index 74fdd5047d..6362e55a6a 100644 --- a/lib/sha512-stream.c +++ b/lib/sha512-stream.c @@ -23,9 +23,6 @@ #include /* Specification. */ -#if HAVE_OPENSSL_SHA512 -# define GL_OPENSSL_INLINE _GL_EXTERN_INLINE -#endif #include "sha512.h" #include diff --git a/lib/sm3-stream.c b/lib/sm3-stream.c index c534edb126..f158f00330 100644 --- a/lib/sm3-stream.c +++ b/lib/sm3-stream.c @@ -26,9 +26,6 @@ #include /* Specification. */ -#if HAVE_OPENSSL_SM3 -# define GL_OPENSSL_INLINE _GL_EXTERN_INLINE -#endif #include "sm3.h" #include -- 2.39.5