summaryrefslogtreecommitdiffstats
path: root/crypto/armcap.c
diff options
context:
space:
mode:
authorKurt Roeckx <kurt@roeckx.be>2017-11-19 17:40:56 +0100
committerKurt Roeckx <kurt@roeckx.be>2017-11-25 14:30:11 +0100
commitd807db26a403b4de69d7846656362e70f5083428 (patch)
tree936f89094f60f405956b2a19f1fccf5b4791cc91 /crypto/armcap.c
parent92793648945affdfe529fa711666d19528815789 (diff)
Create a prototype for OPENSSL_rdtsc
Switch to make it return an uint32_t instead of the various different types it returns now. Fixes: #3125 Reviewed-by: Andy Polyakov <appro@openssl.org> GH: #4757
Diffstat (limited to 'crypto/armcap.c')
-rw-r--r--crypto/armcap.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/crypto/armcap.c b/crypto/armcap.c
index b55a71ee78..a1f77fa2fc 100644
--- a/crypto/armcap.c
+++ b/crypto/armcap.c
@@ -13,6 +13,7 @@
#include <setjmp.h>
#include <signal.h>
#include <openssl/crypto.h>
+#include "internal/cryptlib.h"
#include "arm_arch.h"
@@ -23,7 +24,7 @@ void OPENSSL_cpuid_setup(void)
{
}
-unsigned long OPENSSL_rdtsc(void)
+uint32_t OPENSSL_rdtsc(void)
{
return 0;
}
@@ -45,9 +46,9 @@ void _armv8_aes_probe(void);
void _armv8_sha1_probe(void);
void _armv8_sha256_probe(void);
void _armv8_pmull_probe(void);
-unsigned long _armv7_tick(void);
+uint32_t _armv7_tick(void);
-unsigned long OPENSSL_rdtsc(void)
+uint32_t OPENSSL_rdtsc(void)
{
if (OPENSSL_armcap_P & ARMV7_TICK)
return _armv7_tick();