diff options
| author |   jsing <jsing@openbsd.org> | 2014-10-18 17:08:32 +0000 |
|---|---|---|
| committer | jsing <jsing@openbsd.org> | 2014-10-18 17:08:32 +0000 |
| commit | de3f78cc8e451d16c29134e4816b8b2ac771bca3 (patch) | |
| tree | 31f1debe510c808ae081b9afad186e94fc8e17cf /lib/libssl/src | |
| parent | Remove the remaining #ifdef HAVE_ and the #define _GNU_SOURCE. (diff) | |
| download | wireguard-openbsd-de3f78cc8e451d16c29134e4816b8b2ac771bca3.tar.xz wireguard-openbsd-de3f78cc8e451d16c29134e4816b8b2ac771bca3.zip | |
Sort/group includes.
Diffstat (limited to 'lib/libssl/src')
| -rw-r--r-- | lib/libssl/src/crypto/err/err_all.c | 51 |
1 files changed, 26 insertions, 25 deletions
diff --git a/lib/libssl/src/crypto/err/err_all.c b/lib/libssl/src/crypto/err/err_all.c index 64598d6cf4b..73622208242 100644 --- a/lib/libssl/src/crypto/err/err_all.c +++ b/lib/libssl/src/crypto/err/err_all.c @@ -1,4 +1,4 @@ -/* $OpenBSD: err_all.c,v 1.17 2014/07/11 08:00:25 jsing Exp $ */ +/* $OpenBSD: err_all.c,v 1.18 2014/10/18 17:08:32 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -61,48 +61,49 @@ #include <openssl/opensslconf.h> #include <openssl/asn1.h> +#include <openssl/bio.h> #include <openssl/bn.h> -#ifndef OPENSSL_NO_EC -#include <openssl/ec.h> -#endif #include <openssl/buffer.h> -#include <openssl/bio.h> +#include <openssl/conf.h> +#include <openssl/dso.h> +#include <openssl/err.h> +#include <openssl/evp.h> +#include <openssl/objects.h> +#include <openssl/ocsp.h> +#include <openssl/pem2.h> +#include <openssl/pkcs12.h> +#include <openssl/rand.h> +#include <openssl/ts.h> +#include <openssl/ui.h> +#include <openssl/x509.h> +#include <openssl/x509v3.h> + +#ifndef OPENSSL_NO_CMS +#include <openssl/cms.h> +#endif #ifndef OPENSSL_NO_COMP #include <openssl/comp.h> #endif -#ifndef OPENSSL_NO_RSA -#include <openssl/rsa.h> -#endif #ifndef OPENSSL_NO_DH #include <openssl/dh.h> #endif #ifndef OPENSSL_NO_DSA #include <openssl/dsa.h> #endif -#ifndef OPENSSL_NO_ECDSA -#include <openssl/ecdsa.h> +#ifndef OPENSSL_NO_EC +#include <openssl/ec.h> #endif #ifndef OPENSSL_NO_ECDH #include <openssl/ecdh.h> #endif -#include <openssl/evp.h> -#include <openssl/objects.h> -#include <openssl/pem2.h> -#include <openssl/x509.h> -#include <openssl/x509v3.h> -#include <openssl/conf.h> -#include <openssl/pkcs12.h> -#include <openssl/rand.h> -#include <openssl/dso.h> +#ifndef OPENSSL_NO_ECDSA +#include <openssl/ecdsa.h> +#endif #ifndef OPENSSL_NO_ENGINE #include <openssl/engine.h> #endif -#include <openssl/ui.h> -#include <openssl/ocsp.h> -#include <openssl/err.h> -#include <openssl/ts.h> -#ifndef OPENSSL_NO_CMS -#include <openssl/cms.h> +#ifndef OPENSSL_NO_RSA +#include <openssl/rsa.h> #endif void |