diff options
| author | Pauli <paul.dale@oracle.com> | 2018-02-05 22:16:26 +0100 |
|---|---|---|
| committer | Pauli <paul.dale@oracle.com> | 2018-02-07 01:08:15 +0100 |
| commit | 360fc9f412f1f60a4644228d9b6d386161aad406 (patch) | |
| tree | afe5edd0f7ed08361411af5b7dfed591f4bb88a3 /include | |
| parent | Make the OPENSSL_CPUID_OBJ define internal. (diff) | |
| download | openssl-360fc9f412f1f60a4644228d9b6d386161aad406.tar.xz openssl-360fc9f412f1f60a4644228d9b6d386161aad406.zip | |
Make OPENSSL_rdtsc universally available.
If such a timer/counter register is not available, the return value is always
zero. This matches the assembly implementations' behaviour.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
(Merged from https://github.com/openssl/openssl/pull/5231)
Diffstat (limited to 'include')
| -rw-r--r-- | include/internal/cryptlib.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/internal/cryptlib.h b/include/internal/cryptlib.h index 25ccdb1001..8a96de9847 100644 --- a/include/internal/cryptlib.h +++ b/include/internal/cryptlib.h @@ -1,5 +1,5 @@ /* - * Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -94,9 +94,7 @@ FILE *openssl_fopen(const char *filename, const char *mode); void *openssl_fopen(const char *filename, const char *mode); # endif -#ifdef OPENSSL_CPUID_OBJ -uint32_t OPENSSL_rdtsc(); -#endif +uint32_t OPENSSL_rdtsc(void); #ifdef __cplusplus } |