The branch OpenSSL_1_0_2-stable has been updated via 7a7afc559ebc0ad88390cc62bfc34c221d595831 (commit) via 3750879c117fddf583ef5d46069bac2b4d6523b8 (commit) from 8479e9e97354add3c562670db66b5f8151dc3b2e (commit)
- Log ----------------------------------------------------------------- commit 7a7afc559ebc0ad88390cc62bfc34c221d595831 Author: Bernd Edlinger <bernd.edlin...@hotmail.de> Date: Thu Apr 19 22:17:24 2018 +0200 Fix a warning about missing prototype on arm (cherry picked from commit 5fc89c1af837026b5812526ef6f519bf7ca42f16) Reviewed-by: Paul Dale <paul.d...@oracle.com> Reviewed-by: Nicola Tuveri <nic....@gmail.com> (Merged from https://github.com/openssl/openssl/pull/8243) commit 3750879c117fddf583ef5d46069bac2b4d6523b8 Author: Bernd Edlinger <bernd.edlin...@hotmail.de> Date: Thu Apr 19 20:56:46 2018 +0200 Fix building linux-armv4 with --strict-warnings (cherry picked from commit 0e0f8116e247912f5c48f8b3786e543f37fc1f87) Reviewed-by: Paul Dale <paul.d...@oracle.com> Reviewed-by: Nicola Tuveri <nic....@gmail.com> (Merged from https://github.com/openssl/openssl/pull/8243) ----------------------------------------------------------------------- Summary of changes: crypto/arm_arch.h | 2 +- crypto/armcap.c | 1 + crypto/cryptlib.h | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/crypto/arm_arch.h b/crypto/arm_arch.h index 9d6e588..de592de 100644 --- a/crypto/arm_arch.h +++ b/crypto/arm_arch.h @@ -64,7 +64,7 @@ # endif # endif -# if !__ASSEMBLER__ +# ifndef __ASSEMBLER__ extern unsigned int OPENSSL_armcap_P; # endif diff --git a/crypto/armcap.c b/crypto/armcap.c index 356fa15..6283e37 100644 --- a/crypto/armcap.c +++ b/crypto/armcap.c @@ -5,6 +5,7 @@ #include <signal.h> #include <crypto.h> +#include "cryptlib.h" #include "arm_arch.h" unsigned int OPENSSL_armcap_P = 0; diff --git a/crypto/cryptlib.h b/crypto/cryptlib.h index cdbddf1..2f9eced 100644 --- a/crypto/cryptlib.h +++ b/crypto/cryptlib.h @@ -106,6 +106,8 @@ extern int OPENSSL_NONPIC_relocated; char *ossl_safe_getenv(const char *); +unsigned long OPENSSL_rdtsc(void); + #ifdef __cplusplus } #endif