diff options
author | tb <> | 2023-11-19 15:51:49 +0000 |
---|---|---|
committer | tb <> | 2023-11-19 15:51:49 +0000 |
commit | 33d15fbeced7ed9bc03a4d5215a821dde3434bae (patch) | |
tree | 4d4566481f9384da75d08186ae99eaccd2b1b02d /src/lib/libssl/ssl_ciph.c | |
parent | 063dc9cb05e933675041b472f4e18a7ab02413f1 (diff) | |
download | openbsd-33d15fbeced7ed9bc03a4d5215a821dde3434bae.tar.gz openbsd-33d15fbeced7ed9bc03a4d5215a821dde3434bae.tar.bz2 openbsd-33d15fbeced7ed9bc03a4d5215a821dde3434bae.zip |
Unifdef OPENSSL_NO_ENGINE in libssl
As usual, a few manual fixes to avoid duplicate lines.
ok jsing
Diffstat (limited to '')
-rw-r--r-- | src/lib/libssl/ssl_ciph.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/lib/libssl/ssl_ciph.c b/src/lib/libssl/ssl_ciph.c index b735cd7b30..38ebea1629 100644 --- a/src/lib/libssl/ssl_ciph.c +++ b/src/lib/libssl/ssl_ciph.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl_ciph.c,v 1.136 2023/07/08 16:40:13 beck Exp $ */ | 1 | /* $OpenBSD: ssl_ciph.c,v 1.137 2023/11/19 15:51:49 tb Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -145,10 +145,6 @@ | |||
145 | #include <openssl/objects.h> | 145 | #include <openssl/objects.h> |
146 | #include <openssl/opensslconf.h> | 146 | #include <openssl/opensslconf.h> |
147 | 147 | ||
148 | #ifndef OPENSSL_NO_ENGINE | ||
149 | #include <openssl/engine.h> | ||
150 | #endif | ||
151 | |||
152 | #include "ssl_local.h" | 148 | #include "ssl_local.h" |
153 | 149 | ||
154 | #define CIPHER_ADD 1 | 150 | #define CIPHER_ADD 1 |