summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortb <>2025-01-02 13:11:26 +0000
committertb <>2025-01-02 13:11:26 +0000
commit5055670b6e981fba52e1877c8cf7b9428a2f65e9 (patch)
treeaa0409585b1faef7e962e61dee8c724735356e13
parent31683601b72b2a5980f5f5d968711f4a1fba7a52 (diff)
downloadopenbsd-5055670b6e981fba52e1877c8cf7b9428a2f65e9.tar.gz
openbsd-5055670b6e981fba52e1877c8cf7b9428a2f65e9.tar.bz2
openbsd-5055670b6e981fba52e1877c8cf7b9428a2f65e9.zip
Remove some pointless header guards. The headers are in scope.
-rw-r--r--src/usr.bin/openssl/apps.h8
1 files changed, 1 insertions, 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 @@
1/* $OpenBSD: apps.h,v 1.41 2025/01/02 13:10:03 tb Exp $ */ 1/* $OpenBSD: apps.h,v 1.42 2025/01/02 13:11:26 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 *
@@ -376,13 +376,9 @@ extern int verify_return_error;
376int do_server(int port, int type, int *ret, 376int do_server(int port, int type, int *ret,
377 int (*cb)(int s, unsigned char *context), 377 int (*cb)(int s, unsigned char *context),
378 unsigned char *context, int naccept); 378 unsigned char *context, int naccept);
379#ifdef HEADER_X509_H
380int verify_callback(int ok, X509_STORE_CTX *ctx); 379int verify_callback(int ok, X509_STORE_CTX *ctx);
381#endif
382#ifdef HEADER_SSL_H
383int set_cert_stuff(SSL_CTX *ctx, char *cert_file, char *key_file); 380int set_cert_stuff(SSL_CTX *ctx, char *cert_file, char *key_file);
384int set_cert_key_stuff(SSL_CTX *ctx, X509 *cert, EVP_PKEY *key); 381int set_cert_key_stuff(SSL_CTX *ctx, X509 *cert, EVP_PKEY *key);
385#endif
386int ssl_print_tmp_key(BIO *out, SSL *s); 382int ssl_print_tmp_key(BIO *out, SSL *s);
387int init_client(int *sock, char *server, char *port, int type, int af); 383int init_client(int *sock, char *server, char *port, int type, int af);
388int extract_port(char *str, short *port_ptr); 384int 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);
391long bio_dump_callback(BIO *bio, int cmd, const char *argp, int argi, 387long bio_dump_callback(BIO *bio, int cmd, const char *argp, int argi,
392 long argl, long ret); 388 long argl, long ret);
393 389
394#ifdef HEADER_SSL_H
395void apps_ssl_info_callback(const SSL *s, int where, int ret); 390void apps_ssl_info_callback(const SSL *s, int where, int ret);
396void msg_cb(int write_p, int version, int content_type, const void *buf, 391void msg_cb(int write_p, int version, int content_type, const void *buf,
397 size_t len, SSL *ssl, void *arg); 392 size_t len, SSL *ssl, void *arg);
398void tlsext_cb(SSL *s, int client_server, int type, unsigned char *data, 393void tlsext_cb(SSL *s, int client_server, int type, unsigned char *data,
399 int len, void *arg); 394 int len, void *arg);
400#endif
401 395
402int generate_cookie_callback(SSL *ssl, unsigned char *cookie, 396int generate_cookie_callback(SSL *ssl, unsigned char *cookie,
403 unsigned int *cookie_len); 397 unsigned int *cookie_len);