From b597aab84e4258ffee2430113f0cac8900e0a499 Mon Sep 17 00:00:00 2001 From: Emilia Kasper Date: Mon, 15 Dec 2014 16:37:13 +0100 Subject: [PATCH] Build fixes Various build fixes, mostly uncovered by clang's unused-const-variable and unused-function errors. Reviewed-by: Kurt Roeckx (cherry picked from commit 0e1c318ece3c82e96ae95a34a1badf58198d6b28) --- crypto/ec/ec_lib.c | 2 +- crypto/ec/ecp_nistp256.c | 1 - crypto/ec/ectest.c | 4 ++-- crypto/engine/eng_dyn.c | 3 --- 4 files changed, 3 insertions(+), 7 deletions(-) diff --git a/crypto/ec/ec_lib.c b/crypto/ec/ec_lib.c index 8fb8b089ef..a553740dee 100644 --- a/crypto/ec/ec_lib.c +++ b/crypto/ec/ec_lib.c @@ -70,7 +70,7 @@ #include "ec_lcl.h" -static const char EC_version[] = "EC" OPENSSL_VERSION_PTEXT; +const char EC_version[] = "EC" OPENSSL_VERSION_PTEXT; /* functions for EC_GROUP objects */ diff --git a/crypto/ec/ecp_nistp256.c b/crypto/ec/ecp_nistp256.c index aa125d35fc..2f9bb57fdc 100644 --- a/crypto/ec/ecp_nistp256.c +++ b/crypto/ec/ecp_nistp256.c @@ -108,7 +108,6 @@ typedef u64 smallfelem[NLIMBS]; /* This is the value of the prime as four 64-bit words, little-endian. */ static const u64 kPrime[4] = { 0xfffffffffffffffful, 0xffffffff, 0, 0xffffffff00000001ul }; -static const limb bottom32bits = 0xffffffff; static const u64 bottom63bits = 0x7ffffffffffffffful; /* bin32_to_felem takes a little-endian byte array and converts it into felem diff --git a/crypto/ec/ectest.c b/crypto/ec/ectest.c index 22f7ea0fbe..6da927905a 100644 --- a/crypto/ec/ectest.c +++ b/crypto/ec/ectest.c @@ -1367,7 +1367,7 @@ static const struct nistp_test_params nistp_tests_params[] = }, }; -void nistp_single_test(const struct nistp_test_params *test) +static void nistp_single_test(const struct nistp_test_params *test) { BN_CTX *ctx; BIGNUM *p, *a, *b, *x, *y, *n, *m, *order; @@ -1470,7 +1470,7 @@ void nistp_single_test(const struct nistp_test_params *test) BN_CTX_free(ctx); } -void nistp_tests() +static void nistp_tests() { unsigned i; diff --git a/crypto/engine/eng_dyn.c b/crypto/engine/eng_dyn.c index 807da7a5eb..01db4556aa 100644 --- a/crypto/engine/eng_dyn.c +++ b/crypto/engine/eng_dyn.c @@ -114,9 +114,6 @@ static const ENGINE_CMD_DEFN dynamic_cmd_defns[] = { ENGINE_CMD_FLAG_NO_INPUT}, {0, NULL, NULL, 0} }; -static const ENGINE_CMD_DEFN dynamic_cmd_defns_empty[] = { - {0, NULL, NULL, 0} - }; /* Loading code stores state inside the ENGINE structure via the "ex_data" * element. We load all our state into a single structure and use that as a -- 2.25.1