aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib
diff options
context:
space:
mode:
authorPatrick Wildt <[email protected]>2017-06-28 22:15:16 +0200
committerPatrick Wildt <[email protected]>2017-07-05 11:05:49 +0200
commitb93dd6e2f4eb715640d61be44451c35e9feba23b (patch)
tree6b6ea1412006d82b79f1a1bd1bebee0af2c3b9a9 /src/lib
parent92b0ff1faaba7c3fd886e79550bf5fe0fc567e25 (diff)
BearSSL: move includes into extern "C"
Without the specific extern "C" declaration for the includes the C functions might get C++'d so the linking stage fails.
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/prov/bearssl/bearssl_ec.cpp6
-rw-r--r--src/lib/prov/bearssl/bearssl_hash.cpp5
2 files changed, 8 insertions, 3 deletions
diff --git a/src/lib/prov/bearssl/bearssl_ec.cpp b/src/lib/prov/bearssl/bearssl_ec.cpp
index 507345f24..c62d78437 100644
--- a/src/lib/prov/bearssl/bearssl_ec.cpp
+++ b/src/lib/prov/bearssl/bearssl_ec.cpp
@@ -20,8 +20,10 @@
#include <botan/ecdsa.h>
#endif
-#include <bearssl_hash.h>
-#include <bearssl_ec.h>
+extern "C" {
+ #include <bearssl_hash.h>
+ #include <bearssl_ec.h>
+}
namespace Botan {
diff --git a/src/lib/prov/bearssl/bearssl_hash.cpp b/src/lib/prov/bearssl/bearssl_hash.cpp
index 74b6a9ae7..af63e05c3 100644
--- a/src/lib/prov/bearssl/bearssl_hash.cpp
+++ b/src/lib/prov/bearssl/bearssl_hash.cpp
@@ -7,9 +7,12 @@
#include <botan/hash.h>
#include <botan/internal/bearssl.h>
-#include <bearssl_hash.h>
#include <unordered_map>
+extern "C" {
+ #include <bearssl_hash.h>
+}
+
namespace Botan {
namespace {