5674466e00
This got triggered by test/testutil.h including ../apps/opt.h. Some compilers do all inclusions from the directory of the C file being compiled, so when a C file includes a header file with a relative file spec, and that header file also includes another header file with a relative file spec, the compiler no longer follows. As a specific example, test/testutil/basic_output.c included ../testutil.h. Fine so far, but then, test/testutil.h includes ../apps/opt.h, and the compiler ends up trying to include (seen from the source top) test/apps/opt.h rather than apps/opt.h, and fails. The solution could have been to simply add apps/ as an inclusion directory. However, that directory also has header files that have nothing to do with libapps, so we take this a bit further, create apps/include and move libapps specific headers there, and then add apps/include as inclusion directory in the build.info files where needed. Reviewed-by: Paul Yang <yang.yang@baishancloud.com> (Merged from https://github.com/openssl/openssl/pull/8210)
89 lines
3.6 KiB
C
89 lines
3.6 KiB
C
/*
|
|
* Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.
|
|
*
|
|
* Licensed under the Apache License 2.0 (the "License"). You may not use
|
|
* this file except in compliance with the License. You can obtain a copy
|
|
* in the file LICENSE in the source distribution or at
|
|
* https://www.openssl.org/source/license.html
|
|
*/
|
|
|
|
#include <openssl/opensslconf.h>
|
|
|
|
#if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_MSDOS)
|
|
# include <conio.h>
|
|
#endif
|
|
|
|
#if defined(OPENSSL_SYS_MSDOS) && !defined(_WIN32)
|
|
# define _kbhit kbhit
|
|
#endif
|
|
|
|
#define PORT "4433"
|
|
#define PROTOCOL "tcp"
|
|
|
|
typedef int (*do_server_cb)(int s, int stype, int prot, unsigned char *context);
|
|
int do_server(int *accept_sock, const char *host, const char *port,
|
|
int family, int type, int protocol, do_server_cb cb,
|
|
unsigned char *context, int naccept, BIO *bio_s_out);
|
|
#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,
|
|
STACK_OF(X509) *chain, int build_chain);
|
|
int ssl_print_sigalgs(BIO *out, SSL *s);
|
|
int ssl_print_point_formats(BIO *out, SSL *s);
|
|
int ssl_print_groups(BIO *out, SSL *s, int noshared);
|
|
#endif
|
|
int ssl_print_tmp_key(BIO *out, SSL *s);
|
|
int init_client(int *sock, const char *host, const char *port,
|
|
const char *bindhost, const char *bindport,
|
|
int family, int type, int protocol);
|
|
int should_retry(int i);
|
|
|
|
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, const unsigned char *data,
|
|
int len, void *arg);
|
|
#endif
|
|
|
|
int generate_cookie_callback(SSL *ssl, unsigned char *cookie,
|
|
unsigned int *cookie_len);
|
|
int verify_cookie_callback(SSL *ssl, const unsigned char *cookie,
|
|
unsigned int cookie_len);
|
|
|
|
#ifdef __VMS /* 31 char symbol name limit */
|
|
# define generate_stateless_cookie_callback generate_stateless_cookie_cb
|
|
# define verify_stateless_cookie_callback verify_stateless_cookie_cb
|
|
#endif
|
|
|
|
int generate_stateless_cookie_callback(SSL *ssl, unsigned char *cookie,
|
|
size_t *cookie_len);
|
|
int verify_stateless_cookie_callback(SSL *ssl, const unsigned char *cookie,
|
|
size_t cookie_len);
|
|
|
|
typedef struct ssl_excert_st SSL_EXCERT;
|
|
|
|
void ssl_ctx_set_excert(SSL_CTX *ctx, SSL_EXCERT *exc);
|
|
void ssl_excert_free(SSL_EXCERT *exc);
|
|
int args_excert(int option, SSL_EXCERT **pexc);
|
|
int load_excert(SSL_EXCERT **pexc);
|
|
void print_verify_detail(SSL *s, BIO *bio);
|
|
void print_ssl_summary(SSL *s);
|
|
#ifdef HEADER_SSL_H
|
|
int config_ctx(SSL_CONF_CTX *cctx, STACK_OF(OPENSSL_STRING) *str, SSL_CTX *ctx);
|
|
int ssl_ctx_add_crls(SSL_CTX *ctx, STACK_OF(X509_CRL) *crls,
|
|
int crl_download);
|
|
int ssl_load_stores(SSL_CTX *ctx, const char *vfyCApath,
|
|
const char *vfyCAfile, const char *chCApath,
|
|
const char *chCAfile, STACK_OF(X509_CRL) *crls,
|
|
int crl_download);
|
|
void ssl_ctx_security_debug(SSL_CTX *ctx, int verbose);
|
|
int set_keylog_file(SSL_CTX *ctx, const char *keylog_file);
|
|
void print_ca_names(BIO *bio, SSL *s);
|
|
#endif
|