diff options
author | beck <> | 2018-03-19 03:35:38 +0000 |
---|---|---|
committer | beck <> | 2018-03-19 03:35:38 +0000 |
commit | 02fd65d9fc788d4e8e18c251840f300031577d70 (patch) | |
tree | c2587bdba8d5d81576ed1d6536ed36f021b869cf /src/lib/libcrypto/crypto.h | |
parent | ed245d2c282aafe5e3349f16ecc45562fa1c61cf (diff) | |
download | openbsd-02fd65d9fc788d4e8e18c251840f300031577d70.tar.gz openbsd-02fd65d9fc788d4e8e18c251840f300031577d70.tar.bz2 openbsd-02fd65d9fc788d4e8e18c251840f300031577d70.zip |
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 'src/lib/libcrypto/crypto.h')
-rw-r--r-- | src/lib/libcrypto/crypto.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/libcrypto/crypto.h b/src/lib/libcrypto/crypto.h index f13ce92584..67e06a1509 100644 --- a/src/lib/libcrypto/crypto.h +++ b/src/lib/libcrypto/crypto.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: crypto.h,v 1.44 2018/03/18 01:39:26 tb Exp $ */ | 1 | /* $OpenBSD: crypto.h,v 1.45 2018/03/19 03:35:38 beck 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 | * |
@@ -547,6 +547,7 @@ void ERR_load_CRYPTO_strings(void); | |||
547 | */ | 547 | */ |
548 | 548 | ||
549 | #define OPENSSL_INIT_NO_LOAD_CONFIG 0x00000001L | 549 | #define OPENSSL_INIT_NO_LOAD_CONFIG 0x00000001L |
550 | #define OPENSSL_INIT_LOAD_CONFIG 0x00000002L | ||
550 | 551 | ||
551 | /* LibreSSL specific */ | 552 | /* LibreSSL specific */ |
552 | #define _OPENSSL_INIT_FLAG_NOOP 0x80000000L | 553 | #define _OPENSSL_INIT_FLAG_NOOP 0x80000000L |
@@ -555,7 +556,6 @@ void ERR_load_CRYPTO_strings(void); | |||
555 | * These are provided for compatibiliy, but have no effect | 556 | * These are provided for compatibiliy, but have no effect |
556 | * on how LibreSSL is initialized. | 557 | * on how LibreSSL is initialized. |
557 | */ | 558 | */ |
558 | #define OPENSSL_INIT_LOAD_CONFIG _OPENSSL_INIT_FLAG_NOOP | ||
559 | #define OPENSSL_INIT_NO_LOAD_CRYPTO_STRINGS _OPENSSL_INIT_FLAG_NOOP | 559 | #define OPENSSL_INIT_NO_LOAD_CRYPTO_STRINGS _OPENSSL_INIT_FLAG_NOOP |
560 | #define OPENSSL_INIT_LOAD_CRYPTO_STRINGS _OPENSSL_INIT_FLAG_NOOP | 560 | #define OPENSSL_INIT_LOAD_CRYPTO_STRINGS _OPENSSL_INIT_FLAG_NOOP |
561 | #define OPENSSL_INIT_ADD_ALL_CIPHERS _OPENSSL_INIT_FLAG_NOOP | 561 | #define OPENSSL_INIT_ADD_ALL_CIPHERS _OPENSSL_INIT_FLAG_NOOP |