diff options
| author | Emilia Kasper <emilia@openssl.org> | 2014-12-15 16:37:13 +0100 |
|---|---|---|
| committer | Emilia Kasper <emilia@openssl.org> | 2014-12-17 14:31:20 +0100 |
| commit | 7e9d42ce9783a0070cabda81744ebe87a63c1c65 (patch) | |
| tree | 14c5dab330f44ce005215b92855da4401933586d | |
| parent | b3147fcbe6c4bb750c51edd28c18bd2187d5e939 (diff) | |
Build fixes
Various build fixes, mostly uncovered by clang's unused-const-variable
and unused-function errors.
Reviewed-by: Kurt Roeckx <kurt@openssl.org>
(cherry picked from commit 0e1c318ece3c82e96ae95a34a1badf58198d6b28)
| -rw-r--r-- | crypto/ec/ec_lib.c | 2 | ||||
| -rw-r--r-- | crypto/ec/ecp_nistp256.c | 1 | ||||
| -rw-r--r-- | crypto/ec/ectest.c | 4 | ||||
| -rw-r--r-- | crypto/engine/eng_dyn.c | 3 | ||||
| -rw-r--r-- | engines/e_padlock.c | 2 |
5 files changed, 5 insertions, 7 deletions
diff --git a/crypto/ec/ec_lib.c b/crypto/ec/ec_lib.c index e2c4741b5b..0992c393b0 100644 --- a/crypto/ec/ec_lib.c +++ b/crypto/ec/ec_lib.c @@ -68,7 +68,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 4bc0f5dce0..b884f73d31 100644 --- a/crypto/ec/ecp_nistp256.c +++ b/crypto/ec/ecp_nistp256.c @@ -113,7 +113,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 d1bf980599..8e4154d865 100644 --- a/crypto/ec/ectest.c +++ b/crypto/ec/ectest.c @@ -1366,7 +1366,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; @@ -1469,7 +1469,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 diff --git a/engines/e_padlock.c b/engines/e_padlock.c index 9f7a85a8da..5d252f62a9 100644 --- a/engines/e_padlock.c +++ b/engines/e_padlock.c @@ -384,6 +384,7 @@ padlock_available(void) } #ifndef OPENSSL_NO_AES +#ifndef AES_ASM /* Our own htonl()/ntohl() */ static inline void padlock_bswapl(AES_KEY *ks) @@ -397,6 +398,7 @@ padlock_bswapl(AES_KEY *ks) } } #endif +#endif /* Force key reload from memory to the CPU microcode. Loading EFLAGS from the stack clears EFLAGS[30] |