jimzah/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src.git synced 2024-11-26 20:12:44 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

libmd: re-apply masking of _Transform names

Browse Source 
Visibility can get complicated when, e.g., ifuncs are involved.  In
particular, SHA256/SHA512 on aarch64 use ifuncs for their _Transform
implementations, which then exposes global symbols of the same name that
break things trying to statically link both libcrypto and libmd.

Revert this part of the _Transform removal to fix the pkg-static build
on aarch64.

Fixes:	81de655acd ("libmd: stop exporting Transform() symbols")
This commit is contained in:
Kyle Evans 2024-09-30 14:54:42 -05:00
parent 4fa4693dcd
commit c02bc0aa0b
5 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/libmd/ripemd.h
View File

@ -109,6 +109,9 @@ __BEGIN_DECLS
#ifndef RIPEMD160_Data
#define RIPEMD160_Data _libmd_RIPEMD160_Data
#endif
#ifndef RIPEMD160_Transform
#define RIPEMD160_Transform _libmd_RIPEMD160_Transform
#endif
#ifndef ripemd160_block
#define ripemd160_block _libmd_ripemd160_block

3
lib/libmd/sha.h
View File

@ -138,6 +138,9 @@ __BEGIN_DECLS
#ifndef SHA1_Data
#define SHA1_Data _libmd_SHA1_Data
#endif
#ifndef SHA1_Transform
#define SHA1_Transform _libmd_SHA1_Transform
#endif
#ifndef sha1_block
#define sha1_block _libmd_sha1_block

3
sys/crypto/sha2/sha256.h
View File

@ -72,6 +72,9 @@ __BEGIN_DECLS
#ifndef SHA256_Data
#define SHA256_Data _libmd_SHA256_Data
#endif
#ifndef SHA256_Transform
#define SHA256_Transform _libmd_SHA256_Transform
#endif
void SHA256_Init(SHA256_CTX *);
void SHA256_Update(SHA256_CTX *, const void *, size_t);

3
sys/crypto/sha2/sha512.h
View File

@ -71,6 +71,9 @@ __BEGIN_DECLS
#ifndef SHA512_Data
#define SHA512_Data _libmd_SHA512_Data
#endif
#ifndef SHA512_Transform
#define SHA512_Transform _libmd_SHA512_Transform
#endif
void SHA512_Init(SHA512_CTX *);
void SHA512_Update(SHA512_CTX *, const void *, size_t);

6
sys/crypto/sha2/sha512t.h
View File

@ -68,6 +68,9 @@ __BEGIN_DECLS
#ifndef SHA512_224_Data
#define SHA512_224_Data _libmd_SHA512_224_Data
#endif
#ifndef SHA512_224_Transform
#define SHA512_224_Transform _libmd_SHA512_224_Transform
#endif
#ifndef SHA512_256_Init
#define SHA512_256_Init _libmd_SHA512_256_Init
@ -96,6 +99,9 @@ __BEGIN_DECLS
#ifndef SHA512_256_Data
#define SHA512_256_Data _libmd_SHA512_256_Data
#endif
#ifndef SHA512_256_Transform
#define SHA512_256_Transform _libmd_SHA512_256_Transform
#endif
void SHA512_224_Init(SHA512_CTX *);
void SHA512_224_Update(SHA512_CTX *, const void *, size_t);