diff options
| author | Andy Polyakov <appro@openssl.org> | 2018-12-07 22:19:57 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2018-12-08 12:35:45 +0100 |
| commit | 3c1b8562360cff9b2abf954554208565c08176a1 (patch) | |
| tree | a1000e511ec0bc2fb7c4e18e6ef360aab60ae3e6 /crypto/err | |
| parent | 673273c43e853188d6abcffaf76d0f432f13e8c6 (diff) | |
err/err.c: improve err_clear_last_constant_time's portability.
Reviewed-by: Kurt Roeckx <kurt@roeckx.be>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7850)
(cherry picked from commit 91d0fd1c2753f0f7d6e0953eed3cfb6eb96d8ff4)
Diffstat (limited to 'crypto/err')
| -rw-r--r-- | crypto/err/err.c | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/crypto/err/err.c b/crypto/err/err.c index 66a60e907c..1ad18b1924 100644 --- a/crypto/err/err.c +++ b/crypto/err/err.c @@ -880,6 +880,25 @@ int ERR_clear_last_mark(void) return 1; } +#ifdef UINTPTR_T +# undef UINTPTR_T +#endif +/* + * uintptr_t is the answer, but unfortunately C89, current "least common + * denominator" doesn't define it. Most legacy platforms typedef it anyway, + * so that attempt to fill the gaps means that one would have to identify + * that track these gaps, which would be undesirable. Macro it is... + */ +#if defined(__VMS) && __INITIAL_POINTER_SIZE==64 +/* + * But we can't use size_t on VMS, because it adheres to sizeof(size_t)==4 + * even in 64-bit builds, which means that it won't work as mask. + */ +# define UINTPTR_T unsigned long long +#else +# define UINTPTR_T size_t +#endif + void err_clear_last_constant_time(int clear) { ERR_STATE *es; @@ -893,8 +912,8 @@ void err_clear_last_constant_time(int clear) es->err_flags[top] &= ~(0 - clear); es->err_buffer[top] &= ~(0UL - clear); - es->err_file[top] = (const char *)((uintptr_t)es->err_file[top] & - ~((uintptr_t)0 - clear)); + es->err_file[top] = (const char *)((UINTPTR_T)es->err_file[top] & + ~((UINTPTR_T)0 - clear)); es->err_line[top] |= 0 - clear; es->top = (top + ERR_NUM_ERRORS - clear) % ERR_NUM_ERRORS; |