summaryrefslogtreecommitdiffstats
path: root/lib/libssl/src/apps/apps.h
diff options
context:
space:
mode:
authorjsing <jsing@openbsd.org>2014-05-18 16:21:03 +0000
committerjsing <jsing@openbsd.org>2014-05-18 16:21:03 +0000
commit1658ff46cce652e39cc1887d7f62d2339c9dc584 (patch)
treefae4ce9357d6ab923ad8a1944e082d2c940e5ecd /lib/libssl/src/apps/apps.h
parentPlug memory leaks upon error in OCSP_url_svcloc_new(). (diff)
downloadwireguard-openbsd-1658ff46cce652e39cc1887d7f62d2339c9dc584.tar.xz
wireguard-openbsd-1658ff46cce652e39cc1887d7f62d2339c9dc584.zip
Group and sort includes.
Currently "apps.h" needs to be included before any of the openssl headers and there are several cases where the code depends on headers that are included by something included by apps.h... More untangling saved for later on.
Diffstat (limited to 'lib/libssl/src/apps/apps.h')
-rw-r--r--lib/libssl/src/apps/apps.h14
1 files changed, 8 insertions, 6 deletions
diff --git a/lib/libssl/src/apps/apps.h b/lib/libssl/src/apps/apps.h
index cbbf0eaefd5..31b2c8d18f2 100644
--- a/lib/libssl/src/apps/apps.h
+++ b/lib/libssl/src/apps/apps.h
@@ -112,26 +112,28 @@
#ifndef HEADER_APPS_H
#define HEADER_APPS_H
-#include <openssl/e_os2.h>
+#include <signal.h>
+
#include <openssl/bio.h>
-#include <openssl/x509.h>
-#include <openssl/lhash.h>
#include <openssl/conf.h>
+#include <openssl/e_os2.h>
+#include <openssl/lhash.h>
+#include <openssl/ossl_typ.h>
#include <openssl/txt_db.h>
+#include <openssl/x509.h>
+
#ifndef OPENSSL_NO_ENGINE
#include <openssl/engine.h>
#endif
+
#ifndef OPENSSL_NO_OCSP
#include <openssl/ocsp.h>
#endif
-#include <openssl/ossl_typ.h>
extern CONF *config;
extern char *default_config_file;
extern BIO *bio_err;
-#include <signal.h>
-
typedef struct args_st {
char **data;
int count;