From 5055670b6e981fba52e1877c8cf7b9428a2f65e9 Mon Sep 17 00:00:00 2001
From: tb <>
Date: Thu, 2 Jan 2025 13:11:26 +0000
Subject: Remove some pointless header guards. The headers are in scope.

---
 src/usr.bin/openssl/apps.h | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/usr.bin/openssl/apps.h b/src/usr.bin/openssl/apps.h
index c8d6154b9f..cd218fd1b0 100644
--- a/src/usr.bin/openssl/apps.h
+++ b/src/usr.bin/openssl/apps.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: apps.h,v 1.41 2025/01/02 13:10:03 tb Exp $ */
+/* $OpenBSD: apps.h,v 1.42 2025/01/02 13:11:26 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -376,13 +376,9 @@ extern int verify_return_error;
 int do_server(int port, int type, int *ret,
     int (*cb)(int s, unsigned char *context),
     unsigned char *context, int naccept);
-#ifdef HEADER_X509_H
 int verify_callback(int ok, X509_STORE_CTX *ctx);
-#endif
-#ifdef HEADER_SSL_H
 int set_cert_stuff(SSL_CTX *ctx, char *cert_file, char *key_file);
 int set_cert_key_stuff(SSL_CTX *ctx, X509 *cert, EVP_PKEY *key);
-#endif
 int ssl_print_tmp_key(BIO *out, SSL *s);
 int init_client(int *sock, char *server, char *port, int type, int af);
 int extract_port(char *str, short *port_ptr);
@@ -391,13 +387,11 @@ int extract_host_port(char *str, char **host_ptr, unsigned char *ip, char **p);
 long bio_dump_callback(BIO *bio, int cmd, const char *argp, int argi,
     long argl, long ret);
 
-#ifdef HEADER_SSL_H
 void apps_ssl_info_callback(const SSL *s, int where, int ret);
 void msg_cb(int write_p, int version, int content_type, const void *buf,
     size_t len, SSL *ssl, void *arg);
 void tlsext_cb(SSL *s, int client_server, int type, unsigned char *data,
     int len, void *arg);
-#endif
 
 int generate_cookie_callback(SSL *ssl, unsigned char *cookie,
     unsigned int *cookie_len);
-- 
cgit v1.2.3-55-g6feb