diff options
author | tb <> | 2023-07-28 09:53:55 +0000 |
---|---|---|
committer | tb <> | 2023-07-28 09:53:55 +0000 |
commit | d4949db8e78438e8bb53c9c1297b068ac0df7827 (patch) | |
tree | 307457e0cf8fc786fb4c80edc29a92d5677d406e /src/lib/libcrypto/ts | |
parent | 681b4eb7a5896143c26eac201c041f6f22357b18 (diff) | |
download | openbsd-d4949db8e78438e8bb53c9c1297b068ac0df7827.tar.gz openbsd-d4949db8e78438e8bb53c9c1297b068ac0df7827.tar.bz2 openbsd-d4949db8e78438e8bb53c9c1297b068ac0df7827.zip |
Set OPENSSL_NO_ENGINE, remove engine code
ENGINE was special. It's horrible code even by the low standards of this
library. Some ports may now try to use the stubs which will fail, but
the fallout from this should be minimal. Of course there are various
language bindings that expose the ENGINE API. OpenSSL 3 disabling ENGINE
by default will likely help fixing this at some point.
ok jsing
Diffstat (limited to 'src/lib/libcrypto/ts')
-rw-r--r-- | src/lib/libcrypto/ts/ts.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/lib/libcrypto/ts/ts.h b/src/lib/libcrypto/ts/ts.h index 6021a309f7..0d5de6223c 100644 --- a/src/lib/libcrypto/ts/ts.h +++ b/src/lib/libcrypto/ts/ts.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ts.h,v 1.21 2023/04/25 17:52:54 tb Exp $ */ | 1 | /* $OpenBSD: ts.h,v 1.22 2023/07/28 09:53:55 tb Exp $ */ |
2 | /* Written by Zoltan Glozik (zglozik@opentsa.org) for the OpenSSL | 2 | /* Written by Zoltan Glozik (zglozik@opentsa.org) for the OpenSSL |
3 | * project 2002, 2003, 2004. | 3 | * project 2002, 2003, 2004. |
4 | */ | 4 | */ |
@@ -542,9 +542,11 @@ EVP_PKEY *TS_CONF_load_key(const char *file, const char *pass); | |||
542 | const char *TS_CONF_get_tsa_section(CONF *conf, const char *section); | 542 | const char *TS_CONF_get_tsa_section(CONF *conf, const char *section); |
543 | int TS_CONF_set_serial(CONF *conf, const char *section, TS_serial_cb cb, | 543 | int TS_CONF_set_serial(CONF *conf, const char *section, TS_serial_cb cb, |
544 | TS_RESP_CTX *ctx); | 544 | TS_RESP_CTX *ctx); |
545 | #ifndef OPENSSL_NO_ENGINE | ||
545 | int TS_CONF_set_crypto_device(CONF *conf, const char *section, | 546 | int TS_CONF_set_crypto_device(CONF *conf, const char *section, |
546 | const char *device); | 547 | const char *device); |
547 | int TS_CONF_set_default_engine(const char *name); | 548 | int TS_CONF_set_default_engine(const char *name); |
549 | #endif | ||
548 | int TS_CONF_set_signer_cert(CONF *conf, const char *section, | 550 | int TS_CONF_set_signer_cert(CONF *conf, const char *section, |
549 | const char *cert, TS_RESP_CTX *ctx); | 551 | const char *cert, TS_RESP_CTX *ctx); |
550 | int TS_CONF_set_certs(CONF *conf, const char *section, const char *certs, | 552 | int TS_CONF_set_certs(CONF *conf, const char *section, const char *certs, |