Unbreak build following rev. 282726
(Makefile.inc1): add dependency of xinstall on libmd to avoid failure of parallel bootstrap. (lib/libmd/*.h): do not redefine symbols if already defined as macros (libcrypt uses the same sources internally, redefining symbols with a prefix of its own). Fixes build failures caused by previous change to libmd. Reported by: ian Pointy hat to: thomas
This commit is contained in:
Thomas Quinot
parent
def4ea7f78
commit
55b130956d
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=282736
@ -1361,6 +1361,9 @@ _kerberos5_bootstrap_tools= \
|
||||
.ORDER: ${_kerberos5_bootstrap_tools:C/^/${_bt}-/g}
|
||||
.endif
|
||||
|
||||
# Rebuild up-to-date libmd for xinstall
|
||||
${_bt}-usr.bin/xinstall: ${_bt}-lib/libmd
|
||||
|
||||
bootstrap-tools: .PHONY
|
||||
|
||||
# Please document (add comment) why something is in 'bootstrap-tools'.
|
||||
|
||||
@ -38,14 +38,30 @@ __BEGIN_DECLS
|
||||
|
||||
/* Ensure libmd symbols do not clash with libcrypto */
|
||||
|
||||
#ifndef MD4Init
|
||||
#define MD4Init _libmd_MD4Init
|
||||
#endif
|
||||
#ifndef MD4Update
|
||||
#define MD4Update _libmd_MD4Update
|
||||
#endif
|
||||
#ifndef MD4Pad
|
||||
#define MD4Pad _libmd_MD4Pad
|
||||
#endif
|
||||
#ifndef MD4Final
|
||||
#define MD4Final _libmd_MD4Final
|
||||
#endif
|
||||
#ifndef MD4End
|
||||
#define MD4End _libmd_MD4End
|
||||
#endif
|
||||
#ifndef MD4File
|
||||
#define MD4File _libmd_MD4File
|
||||
#endif
|
||||
#ifndef MD4FileChunk
|
||||
#define MD4FileChunk _libmd_MD4FileChunk
|
||||
#endif
|
||||
#ifndef MD4Data
|
||||
#define MD4Data _libmd_MD4Data
|
||||
#endif
|
||||
|
||||
void MD4Init(MD4_CTX *);
|
||||
void MD4Update(MD4_CTX *, const void *, unsigned int);
|
||||
|
||||
@ -7,15 +7,33 @@
|
||||
|
||||
/* Ensure libmd symbols do not clash with libcrypto */
|
||||
|
||||
#ifndef MD5Init
|
||||
#define MD5Init _libmd_MD5Init
|
||||
#endif
|
||||
#ifndef MD5Update
|
||||
#define MD5Update _libmd_MD5Update
|
||||
#endif
|
||||
#ifndef MD5Pad
|
||||
#define MD5Pad _libmd_MD5Pad
|
||||
#endif
|
||||
#ifndef MD5Final
|
||||
#define MD5Final _libmd_MD5Final
|
||||
#endif
|
||||
#ifndef MD5Transform
|
||||
#define MD5Transform _libmd_MD5Transform
|
||||
#endif
|
||||
#ifndef MD5End
|
||||
#define MD5End _libmd_MD5End
|
||||
#endif
|
||||
#ifndef MD5File
|
||||
#define MD5File _libmd_MD5File
|
||||
#endif
|
||||
#ifndef MD5FileChunk
|
||||
#define MD5FileChunk _libmd_MD5FileChunk
|
||||
#endif
|
||||
#ifndef MD5Data
|
||||
#define MD5Data _libmd_MD5Data
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
@ -84,17 +84,37 @@ __BEGIN_DECLS
|
||||
|
||||
/* Ensure libmd symbols do not clash with libcrypto */
|
||||
|
||||
#ifndef RIPEMD160_Init
|
||||
#define RIPEMD160_Init _libmd_RIPEMD160_Init
|
||||
#endif
|
||||
#ifndef RIPEMD160_Update
|
||||
#define RIPEMD160_Update _libmd_RIPEMD160_Update
|
||||
#endif
|
||||
#ifndef RIPEMD160_Final
|
||||
#define RIPEMD160_Final _libmd_RIPEMD160_Final
|
||||
#endif
|
||||
#ifndef RIPEMD160_End
|
||||
#define RIPEMD160_End _libmd_RIPEMD160_End
|
||||
#endif
|
||||
#ifndef RIPEMD160_File
|
||||
#define RIPEMD160_File _libmd_RIPEMD160_File
|
||||
#endif
|
||||
#ifndef RIPEMD160_FileChunk
|
||||
#define RIPEMD160_FileChunk _libmd_RIPEMD160_FileChunk
|
||||
#endif
|
||||
#ifndef RIPEMD160_Data
|
||||
#define RIPEMD160_Data _libmd_RIPEMD160_Data
|
||||
#endif
|
||||
|
||||
#ifndef RIPEMD160_Transform
|
||||
#define RIPEMD160_Transform _libmd_RIPEMD160_Transform
|
||||
#endif
|
||||
#ifndef RMD160_version
|
||||
#define RMD160_version _libmd_RMD160_version
|
||||
#endif
|
||||
#ifndef ripemd160_block
|
||||
#define ripemd160_block _libmd_ripemd160_block
|
||||
#endif
|
||||
|
||||
void RIPEMD160_Init(RIPEMD160_CTX *c);
|
||||
void RIPEMD160_Update(RIPEMD160_CTX *c, const void *data,
|
||||
|
||||
@ -82,29 +82,69 @@ __BEGIN_DECLS
|
||||
|
||||
/* Ensure libmd symbols do not clash with libcrypto */
|
||||
|
||||
#ifndef SHA_Init
|
||||
#define SHA_Init _libmd_SHA_Init
|
||||
#endif
|
||||
#ifndef SHA_Update
|
||||
#define SHA_Update _libmd_SHA_Update
|
||||
#endif
|
||||
#ifndef SHA_Final
|
||||
#define SHA_Final _libmd_SHA_Final
|
||||
#endif
|
||||
#ifndef SHA_End
|
||||
#define SHA_End _libmd_SHA_End
|
||||
#endif
|
||||
#ifndef SHA_File
|
||||
#define SHA_File _libmd_SHA_File
|
||||
#endif
|
||||
#ifndef SHA_FileChunk
|
||||
#define SHA_FileChunk _libmd_SHA_FileChunk
|
||||
#endif
|
||||
#ifndef SHA_Data
|
||||
#define SHA_Data _libmd_SHA_Data
|
||||
#endif
|
||||
|
||||
#ifndef SHA_Transform
|
||||
#define SHA_Transform _libmd_SHA_Transform
|
||||
#endif
|
||||
#ifndef SHA_version
|
||||
#define SHA_version _libmd_SHA_version
|
||||
#endif
|
||||
#ifndef sha_block
|
||||
#define sha_block _libmd_sha_block
|
||||
#endif
|
||||
|
||||
#ifndef SHA1_Init
|
||||
#define SHA1_Init _libmd_SHA1_Init
|
||||
#endif
|
||||
#ifndef SHA1_Update
|
||||
#define SHA1_Update _libmd_SHA1_Update
|
||||
#endif
|
||||
#ifndef SHA1_Final
|
||||
#define SHA1_Final _libmd_SHA1_Final
|
||||
#endif
|
||||
#ifndef SHA1_End
|
||||
#define SHA1_End _libmd_SHA1_End
|
||||
#endif
|
||||
#ifndef SHA1_File
|
||||
#define SHA1_File _libmd_SHA1_File
|
||||
#endif
|
||||
#ifndef SHA1_FileChunk
|
||||
#define SHA1_FileChunk _libmd_SHA1_FileChunk
|
||||
#endif
|
||||
#ifndef SHA1_Data
|
||||
#define SHA1_Data _libmd_SHA1_Data
|
||||
#endif
|
||||
|
||||
#ifndef SHA1_Transform
|
||||
#define SHA1_Transform _libmd_SHA1_Transform
|
||||
#endif
|
||||
#ifndef SHA1_version
|
||||
#define SHA1_version _libmd_SHA1_version
|
||||
#endif
|
||||
#ifndef sha1_block
|
||||
#define sha1_block _libmd_sha1_block
|
||||
#endif
|
||||
|
||||
void SHA_Init(SHA_CTX *c);
|
||||
void SHA_Update(SHA_CTX *c, const void *data, size_t len);
|
||||
|
||||
@ -41,16 +41,34 @@ __BEGIN_DECLS
|
||||
|
||||
/* Ensure libmd symbols do not clash with libcrypto */
|
||||
|
||||
#ifndef SHA256_Init
|
||||
#define SHA256_Init _libmd_SHA256_Init
|
||||
#endif
|
||||
#ifndef SHA256_Update
|
||||
#define SHA256_Update _libmd_SHA256_Update
|
||||
#endif
|
||||
#ifndef SHA256_Final
|
||||
#define SHA256_Final _libmd_SHA256_Final
|
||||
#endif
|
||||
#ifndef SHA256_End
|
||||
#define SHA256_End _libmd_SHA256_End
|
||||
#endif
|
||||
#ifndef SHA256_File
|
||||
#define SHA256_File _libmd_SHA256_File
|
||||
#endif
|
||||
#ifndef SHA256_FileChunk
|
||||
#define SHA256_FileChunk _libmd_SHA256_FileChunk
|
||||
#endif
|
||||
#ifndef SHA256_Data
|
||||
#define SHA256_Data _libmd_SHA256_Data
|
||||
#endif
|
||||
|
||||
#ifndef SHA256_Transform
|
||||
#define SHA256_Transform _libmd_SHA256_Transform
|
||||
#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);
|
||||
|
||||
@ -41,16 +41,34 @@ __BEGIN_DECLS
|
||||
|
||||
/* Ensure libmd symbols do not clash with libcrypto */
|
||||
|
||||
#ifndef SHA512_Init
|
||||
#define SHA512_Init _libmd_SHA512_Init
|
||||
#endif
|
||||
#ifndef SHA512_Update
|
||||
#define SHA512_Update _libmd_SHA512_Update
|
||||
#endif
|
||||
#ifndef SHA512_Final
|
||||
#define SHA512_Final _libmd_SHA512_Final
|
||||
#endif
|
||||
#ifndef SHA512_End
|
||||
#define SHA512_End _libmd_SHA512_End
|
||||
#endif
|
||||
#ifndef SHA512_File
|
||||
#define SHA512_File _libmd_SHA512_File
|
||||
#endif
|
||||
#ifndef SHA512_FileChunk
|
||||
#define SHA512_FileChunk _libmd_SHA512_FileChunk
|
||||
#endif
|
||||
#ifndef SHA512_Data
|
||||
#define SHA512_Data _libmd_SHA512_Data
|
||||
#endif
|
||||
|
||||
#ifndef SHA512_Transform
|
||||
#define SHA512_Transform _libmd_SHA512_Transform
|
||||
#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);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user