Commit 77cb2434 authored by Dr. Matthias St. Pierre's avatar Dr. Matthias St. Pierre
Browse files

Remove HEADER_X509_H include detector from apps 



The HEADER_X509_H check is redundant, because <openssl/x509.h>
is already included.

Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
Reviewed-by: default avatarBernd Edlinger <bernd.edlinger@hotmail.de>
(Merged from https://github.com/openssl/openssl/pull/9365)
parent 19b7b64c

apps/apps.c

+8 −1
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ 
#endif

#include <openssl/bn.h>

#include <openssl/ssl.h>

#include "s_apps.h"

#include "apps.h"



#ifdef _WIN32
@@ -48,6 +47,14 @@ static int WIN32_rename(const char *from, const char *to); 
# define rename(from,to) WIN32_rename((from),(to))

#endif



#if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_MSDOS)

# include <conio.h>

#endif



#if defined(OPENSSL_SYS_MSDOS) && !defined(_WIN32)

# define _kbhit kbhit

#endif



typedef struct {

    const char *name;

    unsigned long flag;

apps/apps.h

+0 −2
Original line number Diff line number Diff line
@@ -444,11 +444,9 @@ void destroy_ui_method(void); 
const UI_METHOD *get_ui_method(void);



int chopup_args(ARGS *arg, char *buf);

# ifdef HEADER_X509_H

int dump_cert_text(BIO *out, X509 *x);

void print_name(BIO *out, const char *title, X509_NAME *nm,

                unsigned long lflags);

# endif

void print_bignum_var(BIO *, const BIGNUM *, const char*,

                      int, unsigned char *);

void print_array(BIO *, const char *, int, const unsigned char *);

apps/openssl.c

+0 −1
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ 
# include <openssl/engine.h>

#endif

#include <openssl/err.h>

#include "s_apps.h"

/* Needed to get the other O_xxx flags. */

#ifdef OPENSSL_SYS_VMS

# include <unixio.h>

apps/s_apps.h

+3 −15
Original line number Diff line number Diff line
@@ -9,13 +9,7 @@ 


#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

#include <openssl/ssl.h>



#define PORT            "4433"

#define PROTOCOL        "tcp"
@@ -24,17 +18,15 @@ 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,
@@ -44,13 +36,11 @@ 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);
@@ -75,7 +65,6 @@ 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);
@@ -86,4 +75,3 @@ int ssl_load_stores(SSL_CTX *ctx, const char *vfyCApath, 
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