Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
at fix-function-merge 48 lines 1.8 kB view raw
1diff --git a/src/lib/prov/commoncrypto/commoncrypto_block.cpp b/src/lib/prov/commoncrypto/commoncrypto_block.cpp 2index a07fe118d..f059ee497 100644 3--- a/src/lib/prov/commoncrypto/commoncrypto_block.cpp 4+++ b/src/lib/prov/commoncrypto/commoncrypto_block.cpp 5@@ -11,6 +11,7 @@ 6 #include <botan/hex.h> 7 #include <botan/internal/commoncrypto_utils.h> 8 9+#include <CommonCrypto/CommonCryptoError.h> 10 #include <CommonCrypto/CommonCrypto.h> 11 12 namespace Botan { 13diff --git a/src/lib/prov/commoncrypto/commoncrypto_hash.cpp b/src/lib/prov/commoncrypto/commoncrypto_hash.cpp 14index 1fb79c419..faf9575c2 100644 15--- a/src/lib/prov/commoncrypto/commoncrypto_hash.cpp 16+++ b/src/lib/prov/commoncrypto/commoncrypto_hash.cpp 17@@ -11,6 +11,7 @@ 18 #include <botan/internal/stl_util.h> 19 #include <unordered_map> 20 21+#include <CommonCrypto/CommonCryptoError.h> 22 #include <CommonCrypto/CommonCrypto.h> 23 24 namespace Botan { 25diff --git a/src/lib/prov/commoncrypto/commoncrypto_utils.h b/src/lib/prov/commoncrypto/commoncrypto_utils.h 26index b1c7411fd..9becab2d1 100644 27--- a/src/lib/prov/commoncrypto/commoncrypto_utils.h 28+++ b/src/lib/prov/commoncrypto/commoncrypto_utils.h 29@@ -10,6 +10,7 @@ 30 31 #include <botan/sym_algo.h> 32 33+#include <CommonCrypto/CommonCryptoError.h> 34 #include <CommonCrypto/CommonCrypto.h> 35 36 namespace Botan { 37diff --git a/src/lib/rng/system_rng/system_rng.cpp b/src/lib/rng/system_rng/system_rng.cpp 38index b2f7b4c45..f4933b1e3 100644 39--- a/src/lib/rng/system_rng/system_rng.cpp 40+++ b/src/lib/rng/system_rng/system_rng.cpp 41@@ -20,6 +20,7 @@ 42 #include <bcrypt.h> 43 #include <windows.h> 44 #elif defined(BOTAN_TARGET_OS_HAS_CCRANDOM) 45+ #include <CommonCrypto/CommonCryptoError.h> 46 #include <CommonCrypto/CommonRandom.h> 47 #elif defined(BOTAN_TARGET_OS_HAS_ARC4RANDOM) 48 #include <stdlib.h>