summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorjsing <>2015-09-10 16:35:15 +0000
committerjsing <>2015-09-10 16:35:15 +0000
commit88b0d840f69dd12f0a18deed843456edf672b5f5 (patch)
tree41feda22dbf8252ba4f16ddb1da7aed411540948 /src
parent37f61117b9f43c808ca9fa19c7bdb769bb8255c1 (diff)
downloadopenbsd-88b0d840f69dd12f0a18deed843456edf672b5f5.tar.gz
openbsd-88b0d840f69dd12f0a18deed843456edf672b5f5.tar.bz2
openbsd-88b0d840f69dd12f0a18deed843456edf672b5f5.zip
Put OPENSSL_cleanse under #ifndef LIBRESSL_INTERNAL.
Diffstat (limited to 'src')
-rw-r--r--src/lib/libcrypto/crypto.h5
-rw-r--r--src/lib/libssl/src/crypto/crypto.h5
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);
438void CRYPTO_free(void *ptr); 438void CRYPTO_free(void *ptr);
439void *CRYPTO_realloc(void *addr, int num, const char *file, int line); 439void *CRYPTO_realloc(void *addr, int num, const char *file, int line);
440#endif 440#endif
441
441void *CRYPTO_realloc_clean(void *addr, int old_num, int num, 442void *CRYPTO_realloc_clean(void *addr, int old_num, int num,
442 const char *file, int line); 443 const char *file, int line);
443void *CRYPTO_remalloc(void *addr, int num, const char *file, int line); 444void *CRYPTO_remalloc(void *addr, int num, const char *file, int line);
444 445
446#ifndef LIBRESSL_INTERNAL
445void OPENSSL_cleanse(void *ptr, size_t len); 447void OPENSSL_cleanse(void *ptr, size_t len);
448#endif
446 449
447void CRYPTO_set_mem_debug_options(long bits); 450void CRYPTO_set_mem_debug_options(long bits);
448long CRYPTO_get_mem_debug_options(void); 451long 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);
438void CRYPTO_free(void *ptr); 438void CRYPTO_free(void *ptr);
439void *CRYPTO_realloc(void *addr, int num, const char *file, int line); 439void *CRYPTO_realloc(void *addr, int num, const char *file, int line);
440#endif 440#endif
441
441void *CRYPTO_realloc_clean(void *addr, int old_num, int num, 442void *CRYPTO_realloc_clean(void *addr, int old_num, int num,
442 const char *file, int line); 443 const char *file, int line);
443void *CRYPTO_remalloc(void *addr, int num, const char *file, int line); 444void *CRYPTO_remalloc(void *addr, int num, const char *file, int line);
444 445
446#ifndef LIBRESSL_INTERNAL
445void OPENSSL_cleanse(void *ptr, size_t len); 447void OPENSSL_cleanse(void *ptr, size_t len);
448#endif
446 449
447void CRYPTO_set_mem_debug_options(long bits); 450void CRYPTO_set_mem_debug_options(long bits);
448long CRYPTO_get_mem_debug_options(void); 451long CRYPTO_get_mem_debug_options(void);