diff options
| author | jsing <> | 2014-10-18 17:08:32 +0000 |
|---|---|---|
| committer | jsing <> | 2014-10-18 17:08:32 +0000 |
| commit | 5457701478fa7e3c30f0b19a1c3ece131b1bf6c6 (patch) | |
| tree | 9711e4d90b6c0ef03b0b71f50611dd200f59a158 /src | |
| parent | c7ab256a26b40c83b42c202488c01636a208c01c (diff) | |
| download | openbsd-5457701478fa7e3c30f0b19a1c3ece131b1bf6c6.tar.gz openbsd-5457701478fa7e3c30f0b19a1c3ece131b1bf6c6.tar.bz2 openbsd-5457701478fa7e3c30f0b19a1c3ece131b1bf6c6.zip | |
Sort/group includes.
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/libcrypto/err/err_all.c | 51 | ||||
| -rw-r--r-- | src/lib/libssl/src/crypto/err/err_all.c | 51 |
2 files changed, 52 insertions, 50 deletions
diff --git a/src/lib/libcrypto/err/err_all.c b/src/lib/libcrypto/err/err_all.c index 64598d6cf4..7362220824 100644 --- a/src/lib/libcrypto/err/err_all.c +++ b/src/lib/libcrypto/err/err_all.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: err_all.c,v 1.17 2014/07/11 08:00:25 jsing Exp $ */ | 1 | /* $OpenBSD: err_all.c,v 1.18 2014/10/18 17:08:32 jsing 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 | * |
| @@ -61,48 +61,49 @@ | |||
| 61 | #include <openssl/opensslconf.h> | 61 | #include <openssl/opensslconf.h> |
| 62 | 62 | ||
| 63 | #include <openssl/asn1.h> | 63 | #include <openssl/asn1.h> |
| 64 | #include <openssl/bio.h> | ||
| 64 | #include <openssl/bn.h> | 65 | #include <openssl/bn.h> |
| 65 | #ifndef OPENSSL_NO_EC | ||
| 66 | #include <openssl/ec.h> | ||
| 67 | #endif | ||
| 68 | #include <openssl/buffer.h> | 66 | #include <openssl/buffer.h> |
| 69 | #include <openssl/bio.h> | 67 | #include <openssl/conf.h> |
| 68 | #include <openssl/dso.h> | ||
| 69 | #include <openssl/err.h> | ||
| 70 | #include <openssl/evp.h> | ||
| 71 | #include <openssl/objects.h> | ||
| 72 | #include <openssl/ocsp.h> | ||
| 73 | #include <openssl/pem2.h> | ||
| 74 | #include <openssl/pkcs12.h> | ||
| 75 | #include <openssl/rand.h> | ||
| 76 | #include <openssl/ts.h> | ||
| 77 | #include <openssl/ui.h> | ||
| 78 | #include <openssl/x509.h> | ||
| 79 | #include <openssl/x509v3.h> | ||
| 80 | |||
| 81 | #ifndef OPENSSL_NO_CMS | ||
| 82 | #include <openssl/cms.h> | ||
| 83 | #endif | ||
| 70 | #ifndef OPENSSL_NO_COMP | 84 | #ifndef OPENSSL_NO_COMP |
| 71 | #include <openssl/comp.h> | 85 | #include <openssl/comp.h> |
| 72 | #endif | 86 | #endif |
| 73 | #ifndef OPENSSL_NO_RSA | ||
| 74 | #include <openssl/rsa.h> | ||
| 75 | #endif | ||
| 76 | #ifndef OPENSSL_NO_DH | 87 | #ifndef OPENSSL_NO_DH |
| 77 | #include <openssl/dh.h> | 88 | #include <openssl/dh.h> |
| 78 | #endif | 89 | #endif |
| 79 | #ifndef OPENSSL_NO_DSA | 90 | #ifndef OPENSSL_NO_DSA |
| 80 | #include <openssl/dsa.h> | 91 | #include <openssl/dsa.h> |
| 81 | #endif | 92 | #endif |
| 82 | #ifndef OPENSSL_NO_ECDSA | 93 | #ifndef OPENSSL_NO_EC |
| 83 | #include <openssl/ecdsa.h> | 94 | #include <openssl/ec.h> |
| 84 | #endif | 95 | #endif |
| 85 | #ifndef OPENSSL_NO_ECDH | 96 | #ifndef OPENSSL_NO_ECDH |
| 86 | #include <openssl/ecdh.h> | 97 | #include <openssl/ecdh.h> |
| 87 | #endif | 98 | #endif |
| 88 | #include <openssl/evp.h> | 99 | #ifndef OPENSSL_NO_ECDSA |
| 89 | #include <openssl/objects.h> | 100 | #include <openssl/ecdsa.h> |
| 90 | #include <openssl/pem2.h> | 101 | #endif |
| 91 | #include <openssl/x509.h> | ||
| 92 | #include <openssl/x509v3.h> | ||
| 93 | #include <openssl/conf.h> | ||
| 94 | #include <openssl/pkcs12.h> | ||
| 95 | #include <openssl/rand.h> | ||
| 96 | #include <openssl/dso.h> | ||
| 97 | #ifndef OPENSSL_NO_ENGINE | 102 | #ifndef OPENSSL_NO_ENGINE |
| 98 | #include <openssl/engine.h> | 103 | #include <openssl/engine.h> |
| 99 | #endif | 104 | #endif |
| 100 | #include <openssl/ui.h> | 105 | #ifndef OPENSSL_NO_RSA |
| 101 | #include <openssl/ocsp.h> | 106 | #include <openssl/rsa.h> |
| 102 | #include <openssl/err.h> | ||
| 103 | #include <openssl/ts.h> | ||
| 104 | #ifndef OPENSSL_NO_CMS | ||
| 105 | #include <openssl/cms.h> | ||
| 106 | #endif | 107 | #endif |
| 107 | 108 | ||
| 108 | void | 109 | void |
diff --git a/src/lib/libssl/src/crypto/err/err_all.c b/src/lib/libssl/src/crypto/err/err_all.c index 64598d6cf4..7362220824 100644 --- a/src/lib/libssl/src/crypto/err/err_all.c +++ b/src/lib/libssl/src/crypto/err/err_all.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: err_all.c,v 1.17 2014/07/11 08:00:25 jsing Exp $ */ | 1 | /* $OpenBSD: err_all.c,v 1.18 2014/10/18 17:08:32 jsing 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 | * |
| @@ -61,48 +61,49 @@ | |||
| 61 | #include <openssl/opensslconf.h> | 61 | #include <openssl/opensslconf.h> |
| 62 | 62 | ||
| 63 | #include <openssl/asn1.h> | 63 | #include <openssl/asn1.h> |
| 64 | #include <openssl/bio.h> | ||
| 64 | #include <openssl/bn.h> | 65 | #include <openssl/bn.h> |
| 65 | #ifndef OPENSSL_NO_EC | ||
| 66 | #include <openssl/ec.h> | ||
| 67 | #endif | ||
| 68 | #include <openssl/buffer.h> | 66 | #include <openssl/buffer.h> |
| 69 | #include <openssl/bio.h> | 67 | #include <openssl/conf.h> |
| 68 | #include <openssl/dso.h> | ||
| 69 | #include <openssl/err.h> | ||
| 70 | #include <openssl/evp.h> | ||
| 71 | #include <openssl/objects.h> | ||
| 72 | #include <openssl/ocsp.h> | ||
| 73 | #include <openssl/pem2.h> | ||
| 74 | #include <openssl/pkcs12.h> | ||
| 75 | #include <openssl/rand.h> | ||
| 76 | #include <openssl/ts.h> | ||
| 77 | #include <openssl/ui.h> | ||
| 78 | #include <openssl/x509.h> | ||
| 79 | #include <openssl/x509v3.h> | ||
| 80 | |||
| 81 | #ifndef OPENSSL_NO_CMS | ||
| 82 | #include <openssl/cms.h> | ||
| 83 | #endif | ||
| 70 | #ifndef OPENSSL_NO_COMP | 84 | #ifndef OPENSSL_NO_COMP |
| 71 | #include <openssl/comp.h> | 85 | #include <openssl/comp.h> |
| 72 | #endif | 86 | #endif |
| 73 | #ifndef OPENSSL_NO_RSA | ||
| 74 | #include <openssl/rsa.h> | ||
| 75 | #endif | ||
| 76 | #ifndef OPENSSL_NO_DH | 87 | #ifndef OPENSSL_NO_DH |
| 77 | #include <openssl/dh.h> | 88 | #include <openssl/dh.h> |
| 78 | #endif | 89 | #endif |
| 79 | #ifndef OPENSSL_NO_DSA | 90 | #ifndef OPENSSL_NO_DSA |
| 80 | #include <openssl/dsa.h> | 91 | #include <openssl/dsa.h> |
| 81 | #endif | 92 | #endif |
| 82 | #ifndef OPENSSL_NO_ECDSA | 93 | #ifndef OPENSSL_NO_EC |
| 83 | #include <openssl/ecdsa.h> | 94 | #include <openssl/ec.h> |
| 84 | #endif | 95 | #endif |
| 85 | #ifndef OPENSSL_NO_ECDH | 96 | #ifndef OPENSSL_NO_ECDH |
| 86 | #include <openssl/ecdh.h> | 97 | #include <openssl/ecdh.h> |
| 87 | #endif | 98 | #endif |
| 88 | #include <openssl/evp.h> | 99 | #ifndef OPENSSL_NO_ECDSA |
| 89 | #include <openssl/objects.h> | 100 | #include <openssl/ecdsa.h> |
| 90 | #include <openssl/pem2.h> | 101 | #endif |
| 91 | #include <openssl/x509.h> | ||
| 92 | #include <openssl/x509v3.h> | ||
| 93 | #include <openssl/conf.h> | ||
| 94 | #include <openssl/pkcs12.h> | ||
| 95 | #include <openssl/rand.h> | ||
| 96 | #include <openssl/dso.h> | ||
| 97 | #ifndef OPENSSL_NO_ENGINE | 102 | #ifndef OPENSSL_NO_ENGINE |
| 98 | #include <openssl/engine.h> | 103 | #include <openssl/engine.h> |
| 99 | #endif | 104 | #endif |
| 100 | #include <openssl/ui.h> | 105 | #ifndef OPENSSL_NO_RSA |
| 101 | #include <openssl/ocsp.h> | 106 | #include <openssl/rsa.h> |
| 102 | #include <openssl/err.h> | ||
| 103 | #include <openssl/ts.h> | ||
| 104 | #ifndef OPENSSL_NO_CMS | ||
| 105 | #include <openssl/cms.h> | ||
| 106 | #endif | 107 | #endif |
| 107 | 108 | ||
| 108 | void | 109 | void |