The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=5190e6341ce5121cb17df109f9dc56ab8674aa5c
commit 5190e6341ce5121cb17df109f9dc56ab8674aa5c Author: Kyle Evans <[email protected]> AuthorDate: 2024-09-30 03:32:42 +0000 Commit: Kyle Evans <[email protected]> CommitDate: 2024-09-30 03:35:23 +0000 libmd: stop exporting _version symbols These are reportedly likely to be specific to SSLeay's implementation and likely not needed here. At the very least they shouldn't be used by consumers, so let's kick them out now while we're already prepared for a libmd soversion bump. Requested by: delphij, fuz --- lib/libmd/Symbol.map | 5 ----- lib/libmd/ripemd.h | 3 --- lib/libmd/rmd160c.c | 4 +--- lib/libmd/sha.h | 6 ------ lib/libmd/sha1c.c | 6 +----- sys/crypto/sha2/sha224.h | 4 ---- sys/crypto/sha2/sha256.h | 4 ---- sys/crypto/sha2/sha384.h | 4 ---- sys/crypto/sha2/sha512.h | 4 ---- sys/crypto/sha2/sha512t.h | 8 -------- 10 files changed, 2 insertions(+), 46 deletions(-) diff --git a/lib/libmd/Symbol.map b/lib/libmd/Symbol.map index 86523a5933a1..f0a1192af352 100644 --- a/lib/libmd/Symbol.map +++ b/lib/libmd/Symbol.map @@ -27,7 +27,6 @@ FBSD_1.7 { RIPEMD160_Final; RIPEMD160_Init; RIPEMD160_Update; - RMD160_version; SHA1_Data; SHA1_End; SHA1_Fd; @@ -37,7 +36,6 @@ FBSD_1.7 { SHA1_Final; SHA1_Init; SHA1_Update; - SHA1_version; SHA224_Data; SHA224_End; SHA224_Fd; @@ -156,7 +154,6 @@ FBSDprivate_1.0 { _libmd_RIPEMD160_Final; _libmd_RIPEMD160_Init; _libmd_RIPEMD160_Update; - _libmd_RMD160_version; _libmd_SHA1_Data; _libmd_SHA1_End; _libmd_SHA1_Fd; @@ -166,7 +163,6 @@ FBSDprivate_1.0 { _libmd_SHA1_Final; _libmd_SHA1_Init; _libmd_SHA1_Update; - _libmd_SHA1_version; _libmd_SHA224_Data; _libmd_SHA224_End; _libmd_SHA224_Fd; @@ -230,7 +226,6 @@ FBSDprivate_1.0 { _libmd_SHA_Final; _libmd_SHA_Init; _libmd_SHA_Update; - _libmd_SHA_version; _libmd_SKEIN1024_Data; _libmd_SKEIN1024_End; _libmd_SKEIN1024_Fd; diff --git a/lib/libmd/ripemd.h b/lib/libmd/ripemd.h index 7f82a54a5176..07293dad0e5f 100644 --- a/lib/libmd/ripemd.h +++ b/lib/libmd/ripemd.h @@ -110,9 +110,6 @@ __BEGIN_DECLS #define RIPEMD160_Data _libmd_RIPEMD160_Data #endif -#ifndef RMD160_version -#define RMD160_version _libmd_RMD160_version -#endif #ifndef ripemd160_block #define ripemd160_block _libmd_ripemd160_block #endif diff --git a/lib/libmd/rmd160c.c b/lib/libmd/rmd160c.c index 5642a9a29a1c..92d6524b25b4 100644 --- a/lib/libmd/rmd160c.c +++ b/lib/libmd/rmd160c.c @@ -76,7 +76,7 @@ #undef RMD160_ASM #endif -char *RMD160_version="RIPEMD160 part of SSLeay 0.9.0b 11-Oct-1998"; +static char *RMD160_version="RIPEMD160 part of SSLeay 0.9.0b 11-Oct-1998"; #ifdef RMD160_ASM void ripemd160_block_x86(RIPEMD160_CTX *c, const u_int32_t *p,int num); @@ -540,6 +540,4 @@ __weak_reference(_libmd_RIPEMD160_Init, RIPEMD160_Init); __weak_reference(_libmd_RIPEMD160_Update, RIPEMD160_Update); #undef RIPEMD160_Final __weak_reference(_libmd_RIPEMD160_Final, RIPEMD160_Final); -#undef RMD160_version -__weak_reference(_libmd_RMD160_version, RMD160_version); #endif diff --git a/lib/libmd/sha.h b/lib/libmd/sha.h index 49f65d91bfda..cd4a899bee49 100644 --- a/lib/libmd/sha.h +++ b/lib/libmd/sha.h @@ -107,9 +107,6 @@ __BEGIN_DECLS #define SHA_Data _libmd_SHA_Data #endif -#ifndef SHA_version -#define SHA_version _libmd_SHA_version -#endif #ifndef sha_block #define sha_block _libmd_sha_block #endif @@ -142,9 +139,6 @@ __BEGIN_DECLS #define SHA1_Data _libmd_SHA1_Data #endif -#ifndef SHA1_version -#define SHA1_version _libmd_SHA1_version -#endif #ifndef sha1_block #define sha1_block _libmd_sha1_block #endif diff --git a/lib/libmd/sha1c.c b/lib/libmd/sha1c.c index 6e80407e4ec0..83e402e132e7 100644 --- a/lib/libmd/sha1c.c +++ b/lib/libmd/sha1c.c @@ -79,7 +79,7 @@ #undef SHA1_ASM #endif -char *SHA1_version="SHA1 part of SSLeay 0.9.0b 11-Oct-1998"; +static char *SHA1_version="SHA1 part of SSLeay 0.9.0b 11-Oct-1998"; /* Implemented from SHA-1 document - The Secure Hash Algorithm */ @@ -483,14 +483,10 @@ __weak_reference(_libmd_SHA_Init, SHA_Init); __weak_reference(_libmd_SHA_Update, SHA_Update); #undef SHA_Final __weak_reference(_libmd_SHA_Final, SHA_Final); -#undef SHA_version -__weak_reference(_libmd_SHA_version, SHA_version); #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_version -__weak_reference(_libmd_SHA1_version, SHA1_version); #endif diff --git a/sys/crypto/sha2/sha224.h b/sys/crypto/sha2/sha224.h index 8286a31fdec2..b54f418ae594 100644 --- a/sys/crypto/sha2/sha224.h +++ b/sys/crypto/sha2/sha224.h @@ -73,10 +73,6 @@ __BEGIN_DECLS #define SHA224_Data _libmd_SHA224_Data #endif -#ifndef SHA224_version -#define SHA224_version _libmd_SHA224_version -#endif - void SHA224_Init(SHA224_CTX *); void SHA224_Update(SHA224_CTX *, const void *, size_t); void SHA224_Final(unsigned char [__min_size(SHA224_DIGEST_LENGTH)], diff --git a/sys/crypto/sha2/sha256.h b/sys/crypto/sha2/sha256.h index 7bee1002c25c..77237c466bd9 100644 --- a/sys/crypto/sha2/sha256.h +++ b/sys/crypto/sha2/sha256.h @@ -73,10 +73,6 @@ __BEGIN_DECLS #define SHA256_Data _libmd_SHA256_Data #endif -#ifndef SHA256_version -#define SHA256_version _libmd_SHA256_version -#endif - void SHA256_Init(SHA256_CTX *); void SHA256_Update(SHA256_CTX *, const void *, size_t); void SHA256_Final(unsigned char [__min_size(SHA256_DIGEST_LENGTH)], diff --git a/sys/crypto/sha2/sha384.h b/sys/crypto/sha2/sha384.h index 17d99f6901b7..83ffb8b1ebf1 100644 --- a/sys/crypto/sha2/sha384.h +++ b/sys/crypto/sha2/sha384.h @@ -72,10 +72,6 @@ __BEGIN_DECLS #define SHA384_Data _libmd_SHA384_Data #endif -#ifndef SHA384_version -#define SHA384_version _libmd_SHA384_version -#endif - void SHA384_Init(SHA384_CTX *); void SHA384_Update(SHA384_CTX *, const void *, size_t); void SHA384_Final(unsigned char [__min_size(SHA384_DIGEST_LENGTH)], diff --git a/sys/crypto/sha2/sha512.h b/sys/crypto/sha2/sha512.h index 4a3e2cadf022..b78fde7dc22f 100644 --- a/sys/crypto/sha2/sha512.h +++ b/sys/crypto/sha2/sha512.h @@ -72,10 +72,6 @@ __BEGIN_DECLS #define SHA512_Data _libmd_SHA512_Data #endif -#ifndef SHA512_version -#define SHA512_version _libmd_SHA512_version -#endif - void SHA512_Init(SHA512_CTX *); void SHA512_Update(SHA512_CTX *, const void *, size_t); void SHA512_Final(unsigned char [__min_size(SHA512_DIGEST_LENGTH)], diff --git a/sys/crypto/sha2/sha512t.h b/sys/crypto/sha2/sha512t.h index 2274fa2704b9..dc8025e4a74f 100644 --- a/sys/crypto/sha2/sha512t.h +++ b/sys/crypto/sha2/sha512t.h @@ -69,10 +69,6 @@ __BEGIN_DECLS #define SHA512_224_Data _libmd_SHA512_224_Data #endif -#ifndef SHA512_224_version -#define SHA512_224_version _libmd_SHA512_224_version -#endif - #ifndef SHA512_256_Init #define SHA512_256_Init _libmd_SHA512_256_Init #endif @@ -101,10 +97,6 @@ __BEGIN_DECLS #define SHA512_256_Data _libmd_SHA512_256_Data #endif -#ifndef SHA512_256_version -#define SHA512_256_version _libmd_SHA512_256_version -#endif - void SHA512_224_Init(SHA512_CTX *); void SHA512_224_Update(SHA512_CTX *, const void *, size_t); void SHA512_224_Final(unsigned char [__min_size(SHA512_224_DIGEST_LENGTH)],
