From 15cb4ec0c0c6b2205e5d3ba0b59c09dd20b4bab5 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Tue, 24 May 2016 14:36:07 +0100
Subject: Build the crypto libs as C99

Some of the crypto libs rely on UINT64_C, which in glibc 2.17 and earlier was
not defined for C++ code (see
https://sourceware.org/bugzilla/show_bug.cgi?id=15366).
---
 src/libs.c   | 25 +++++++++++++++++++++++++
 src/libs.cpp | 27 ---------------------------
 2 files changed, 25 insertions(+), 27 deletions(-)
 create mode 100644 src/libs.c
 delete mode 100644 src/libs.cpp

(limited to 'src')

diff --git a/src/libs.c b/src/libs.c
new file mode 100644
index 0000000..4304354
--- /dev/null
+++ b/src/libs.c
@@ -0,0 +1,25 @@
+/* Copyright 2015-6 OpenMarket Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include "crypto-algorithms/sha256.c"
+#include "crypto-algorithms/aes.c"
+#include "curve25519-donna/curve25519-donna.c"
+#define select ed25519_select
+#include "ed25519/src/fe.c"
+#include "ed25519/src/sc.c"
+#include "ed25519/src/ge.c"
+#include "ed25519/src/sha512.c"
+#include "ed25519/src/verify.c"
+#include "ed25519/src/sign.c"
+#include "ed25519_additions.c"
diff --git a/src/libs.cpp b/src/libs.cpp
deleted file mode 100644
index 6757574..0000000
--- a/src/libs.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Copyright 2015 OpenMarket Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-extern "C" {
-#include "crypto-algorithms/sha256.c"
-#include "crypto-algorithms/aes.c"
-#include "curve25519-donna/curve25519-donna.c"
-#define select ed25519_select
-#include "ed25519/src/fe.c"
-#include "ed25519/src/sc.c"
-#include "ed25519/src/ge.c"
-#include "ed25519/src/sha512.c"
-#include "ed25519/src/verify.c"
-#include "ed25519/src/sign.c"
-#include "ed25519_additions.c"
-}
-- 
cgit v1.2.3