From ee8172d882e853e737ac7e8b00fb760f21e80bfe Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Wed, 25 May 2016 17:08:44 +0100 Subject: Compile some of the crypto libs directly sha256.c and aes.c contain conflicting declarations, so we need to compile them as separate units. This requires a bit more Makefile-shuffling; the build directory now includes 'src' or 'lib' as appropriate, and we just mkdir -p before each compilation. --- src/libs.c | 25 ------------------------- 1 file changed, 25 deletions(-) delete mode 100644 src/libs.c (limited to 'src/libs.c') diff --git a/src/libs.c b/src/libs.c deleted file mode 100644 index 4304354..0000000 --- a/src/libs.c +++ /dev/null @@ -1,25 +0,0 @@ -/* 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" -- cgit v1.2.3