1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[ruby/digest] Import patches for old macOS from MacPorts

Browse Source 
https://github.com/ruby/digest/commit/07a5db2f77
This commit is contained in:
Nobuyoshi Nakada 2024-09-26 05:24:20 +09:00 committed by git
parent 7340c1ac71
commit a3fd24e22e
3 changed files with 55 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ext/digest/md5/md5cc.h
View File

@ -25,3 +25,11 @@ static DEFINE_FINISH_FUNC_FROM_FINAL(MD5)
#undef MD5_Finish
#define MD5_Update rb_digest_MD5_update
#define MD5_Finish rb_digest_MD5_finish
/*
* Pre-10.6 defines are with args, which don't match the argless use in
* the function pointer inits. Thus, we redefine MD5_Init as well.
* This is a NOP on 10.6+.
*/
#undef MD5_Init
#define MD5_Init CC_MD5_Init

8
ext/digest/sha1/sha1cc.h
View File

@ -12,3 +12,11 @@ static DEFINE_FINISH_FUNC_FROM_FINAL(SHA1)
#undef SHA1_Finish
#define SHA1_Update rb_digest_SHA1_update
#define SHA1_Finish rb_digest_SHA1_finish
/*
* Pre-10.6 defines are with args, which don't match the argless use in
* the function pointer inits. Thus, we redefine SHA1_Init as well.
* This is a NOP on 10.6+.
*/
#undef SHA1_Init
#define SHA1_Init CC_SHA1_Init

39
ext/digest/sha2/sha2cc.h
View File

@ -1,6 +1,33 @@
#define COMMON_DIGEST_FOR_OPENSSL 1
#include <CommonCrypto/CommonDigest.h>
/*
* Prior to 10.5, OpenSSL-compatible definitions are missing for
* SHA2 macros, though the CC_ versions are present.
* Add the missing definitions we actually use here if needed.
* Note that the definitions are the argless 10.6+-style.
* The weird CTX mismatch is copied from the 10.6 header.
*/
#ifndef SHA256_DIGEST_LENGTH
#define SHA256_DIGEST_LENGTH CC_SHA256_DIGEST_LENGTH
#define SHA256_CTX CC_SHA256_CTX
#define SHA256_Update CC_SHA256_Update
#define SHA256_Final CC_SHA256_Final
#endif /* !defined SHA256_DIGEST_LENGTH */
#ifndef SHA384_DIGEST_LENGTH
#define SHA384_DIGEST_LENGTH CC_SHA384_DIGEST_LENGTH
#define SHA512_CTX CC_SHA512_CTX
#define SHA384_Update CC_SHA384_Update
#define SHA384_Final CC_SHA384_Final
#endif /* !defined SHA384_DIGEST_LENGTH */
#ifndef SHA512_DIGEST_LENGTH
#define SHA512_DIGEST_LENGTH CC_SHA512_DIGEST_LENGTH
#define SHA512_Update CC_SHA512_Update
#define SHA512_Final CC_SHA512_Final
#endif /* !defined SHA512_DIGEST_LENGTH */
#define SHA256_BLOCK_LENGTH CC_SHA256_BLOCK_BYTES
#define SHA384_BLOCK_LENGTH CC_SHA384_BLOCK_BYTES
#define SHA512_BLOCK_LENGTH CC_SHA512_BLOCK_BYTES
@ -29,3 +56,15 @@ static DEFINE_FINISH_FUNC_FROM_FINAL(SHA512)
#undef SHA512_Finish
#define SHA512_Update rb_digest_SHA512_update
#define SHA512_Finish rb_digest_SHA512_finish
/*
* Pre-10.6 defines are with args, which don't match the argless use in
* the function pointer inits. Thus, we redefine SHA*_Init as well.
* This is a NOP on 10.6+.
*/
#undef SHA256_Init
#define SHA256_Init CC_SHA256_Init
#undef SHA384_Init
#define SHA384_Init CC_SHA384_Init
#undef SHA512_Init
#define SHA512_Init CC_SHA512_Init