diff options
| author | Bob Beck <beck@cvs.openbsd.org> | 2018-03-19 03:35:39 +0000 |
|---|---|---|
| committer | Bob Beck <beck@cvs.openbsd.org> | 2018-03-19 03:35:39 +0000 |
| commit | 187b9ff1e8538f12c819e09b94541353693baec5 (patch) | |
| tree | e4b53c5aee8f786bf9827a00fecc8eac4edece64 /lib/libcrypto/crypto.h | |
| parent | 286db2aee754ca2ec79603fa10f11e38b39de955 (diff) | |
Correct mistake of loading the default openssl.conf by default during autoinit.
This brings in the OPENSSL_INIT_LOAD_CONFIG flag with the same semantics as
OpenSSL. As a result, by default the openssl.conf file is not loaded during
autoinit, which makes autoinit safe for pledge(stdio).
ok jsing@
Diffstat (limited to 'lib/libcrypto/crypto.h')
| -rw-r--r-- | lib/libcrypto/crypto.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/libcrypto/crypto.h b/lib/libcrypto/crypto.h index f13ce925841..67e06a1509e 100644 --- a/lib/libcrypto/crypto.h +++ b/lib/libcrypto/crypto.h @@ -1,4 +1,4 @@ -/* $OpenBSD: crypto.h,v 1.44 2018/03/18 01:39:26 tb Exp $ */ +/* $OpenBSD: crypto.h,v 1.45 2018/03/19 03:35:38 beck Exp $ */ /* ==================================================================== * Copyright (c) 1998-2006 The OpenSSL Project. All rights reserved. * @@ -547,6 +547,7 @@ void ERR_load_CRYPTO_strings(void); */ #define OPENSSL_INIT_NO_LOAD_CONFIG 0x00000001L +#define OPENSSL_INIT_LOAD_CONFIG 0x00000002L /* LibreSSL specific */ #define _OPENSSL_INIT_FLAG_NOOP 0x80000000L @@ -555,7 +556,6 @@ void ERR_load_CRYPTO_strings(void); * These are provided for compatibiliy, but have no effect * on how LibreSSL is initialized. */ -#define OPENSSL_INIT_LOAD_CONFIG _OPENSSL_INIT_FLAG_NOOP #define OPENSSL_INIT_NO_LOAD_CRYPTO_STRINGS _OPENSSL_INIT_FLAG_NOOP #define OPENSSL_INIT_LOAD_CRYPTO_STRINGS _OPENSSL_INIT_FLAG_NOOP #define OPENSSL_INIT_ADD_ALL_CIPHERS _OPENSSL_INIT_FLAG_NOOP |