From 094dac655eb1ece1452345d7d523df1c4b076b2d Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Sun, 1 Nov 2015 14:32:42 +0100 Subject: [PATCH] Don't export sodium_runtime_get_cpu_features() --- src/libsodium/include/sodium/runtime.h | 7 ++++--- src/libsodium/sodium/core.c | 2 +- src/libsodium/sodium/runtime.c | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/libsodium/include/sodium/runtime.h b/src/libsodium/include/sodium/runtime.h index 211723f5..f590a660 100644 --- a/src/libsodium/include/sodium/runtime.h +++ b/src/libsodium/include/sodium/runtime.h @@ -8,9 +8,6 @@ extern "C" { #endif -SODIUM_EXPORT -int sodium_runtime_get_cpu_features(void); - SODIUM_EXPORT int sodium_runtime_has_neon(void); @@ -32,6 +29,10 @@ int sodium_runtime_has_pclmul(void); SODIUM_EXPORT int sodium_runtime_has_aesni(void); +/* ------------------------------------------------------------------------- */ + +int _sodium_runtime_get_cpu_features(void); + #ifdef __cplusplus } #endif diff --git a/src/libsodium/sodium/core.c b/src/libsodium/sodium/core.c index 81bf1d7a..d29a0839 100644 --- a/src/libsodium/sodium/core.c +++ b/src/libsodium/sodium/core.c @@ -14,7 +14,7 @@ sodium_init(void) if (initialized != 0) { return 1; } - sodium_runtime_get_cpu_features(); + _sodium_runtime_get_cpu_features(); randombytes_stir(); _sodium_alloc_init(); _crypto_generichash_blake2b_pick_best_implementation(); diff --git a/src/libsodium/sodium/runtime.c b/src/libsodium/sodium/runtime.c index e3fd0a8a..5b7372b3 100644 --- a/src/libsodium/sodium/runtime.c +++ b/src/libsodium/sodium/runtime.c @@ -136,7 +136,7 @@ _sodium_runtime_intel_cpu_features(CPUFeatures * const cpu_features) } int -sodium_runtime_get_cpu_features(void) +_sodium_runtime_get_cpu_features(void) { int ret = -1;