diff options
| author | jsing <> | 2015-09-10 16:35:15 +0000 |
|---|---|---|
| committer | jsing <> | 2015-09-10 16:35:15 +0000 |
| commit | 661a4801887174ecff5669311ffbddbe1d358327 (patch) | |
| tree | 41feda22dbf8252ba4f16ddb1da7aed411540948 | |
| parent | 25b994dfab3c9b00e25e427e65759e17f54683a0 (diff) | |
| download | openbsd-661a4801887174ecff5669311ffbddbe1d358327.tar.gz openbsd-661a4801887174ecff5669311ffbddbe1d358327.tar.bz2 openbsd-661a4801887174ecff5669311ffbddbe1d358327.zip | |
Put OPENSSL_cleanse under #ifndef LIBRESSL_INTERNAL.
Diffstat (limited to '')
| -rw-r--r-- | src/lib/libcrypto/crypto.h | 5 | ||||
| -rw-r--r-- | src/lib/libssl/src/crypto/crypto.h | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/lib/libcrypto/crypto.h b/src/lib/libcrypto/crypto.h index 767c83491b..612b390f27 100644 --- a/src/lib/libcrypto/crypto.h +++ b/src/lib/libcrypto/crypto.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: crypto.h,v 1.36 2015/09/10 16:07:58 jsing Exp $ */ | 1 | /* $OpenBSD: crypto.h,v 1.37 2015/09/10 16:35:15 jsing Exp $ */ |
| 2 | /* ==================================================================== | 2 | /* ==================================================================== |
| 3 | * Copyright (c) 1998-2006 The OpenSSL Project. All rights reserved. | 3 | * Copyright (c) 1998-2006 The OpenSSL Project. All rights reserved. |
| 4 | * | 4 | * |
| @@ -438,11 +438,14 @@ char *CRYPTO_strdup(const char *str, const char *file, int line); | |||
| 438 | void CRYPTO_free(void *ptr); | 438 | void CRYPTO_free(void *ptr); |
| 439 | void *CRYPTO_realloc(void *addr, int num, const char *file, int line); | 439 | void *CRYPTO_realloc(void *addr, int num, const char *file, int line); |
| 440 | #endif | 440 | #endif |
| 441 | |||
| 441 | void *CRYPTO_realloc_clean(void *addr, int old_num, int num, | 442 | void *CRYPTO_realloc_clean(void *addr, int old_num, int num, |
| 442 | const char *file, int line); | 443 | const char *file, int line); |
| 443 | void *CRYPTO_remalloc(void *addr, int num, const char *file, int line); | 444 | void *CRYPTO_remalloc(void *addr, int num, const char *file, int line); |
| 444 | 445 | ||
| 446 | #ifndef LIBRESSL_INTERNAL | ||
| 445 | void OPENSSL_cleanse(void *ptr, size_t len); | 447 | void OPENSSL_cleanse(void *ptr, size_t len); |
| 448 | #endif | ||
| 446 | 449 | ||
| 447 | void CRYPTO_set_mem_debug_options(long bits); | 450 | void CRYPTO_set_mem_debug_options(long bits); |
| 448 | long CRYPTO_get_mem_debug_options(void); | 451 | long CRYPTO_get_mem_debug_options(void); |
diff --git a/src/lib/libssl/src/crypto/crypto.h b/src/lib/libssl/src/crypto/crypto.h index 767c83491b..612b390f27 100644 --- a/src/lib/libssl/src/crypto/crypto.h +++ b/src/lib/libssl/src/crypto/crypto.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: crypto.h,v 1.36 2015/09/10 16:07:58 jsing Exp $ */ | 1 | /* $OpenBSD: crypto.h,v 1.37 2015/09/10 16:35:15 jsing Exp $ */ |
| 2 | /* ==================================================================== | 2 | /* ==================================================================== |
| 3 | * Copyright (c) 1998-2006 The OpenSSL Project. All rights reserved. | 3 | * Copyright (c) 1998-2006 The OpenSSL Project. All rights reserved. |
| 4 | * | 4 | * |
| @@ -438,11 +438,14 @@ char *CRYPTO_strdup(const char *str, const char *file, int line); | |||
| 438 | void CRYPTO_free(void *ptr); | 438 | void CRYPTO_free(void *ptr); |
| 439 | void *CRYPTO_realloc(void *addr, int num, const char *file, int line); | 439 | void *CRYPTO_realloc(void *addr, int num, const char *file, int line); |
| 440 | #endif | 440 | #endif |
| 441 | |||
| 441 | void *CRYPTO_realloc_clean(void *addr, int old_num, int num, | 442 | void *CRYPTO_realloc_clean(void *addr, int old_num, int num, |
| 442 | const char *file, int line); | 443 | const char *file, int line); |
| 443 | void *CRYPTO_remalloc(void *addr, int num, const char *file, int line); | 444 | void *CRYPTO_remalloc(void *addr, int num, const char *file, int line); |
| 444 | 445 | ||
| 446 | #ifndef LIBRESSL_INTERNAL | ||
| 445 | void OPENSSL_cleanse(void *ptr, size_t len); | 447 | void OPENSSL_cleanse(void *ptr, size_t len); |
| 448 | #endif | ||
| 446 | 449 | ||
| 447 | void CRYPTO_set_mem_debug_options(long bits); | 450 | void CRYPTO_set_mem_debug_options(long bits); |
| 448 | long CRYPTO_get_mem_debug_options(void); | 451 | long CRYPTO_get_mem_debug_options(void); |
