From d6b346577efe94c30d6ba08ca7f8feae71688a3c Mon Sep 17 00:00:00 2001 From: jsing <> Date: Sun, 16 Nov 2014 14:12:47 +0000 Subject: Sort and group includes. --- src/lib/libssl/bio_ssl.c | 7 ++++--- src/lib/libssl/d1_both.c | 8 +++++--- src/lib/libssl/d1_clnt.c | 10 ++++++---- src/lib/libssl/d1_enc.c | 4 +++- src/lib/libssl/d1_lib.c | 3 ++- src/lib/libssl/d1_meth.c | 4 +++- src/lib/libssl/d1_pkt.c | 11 +++++++---- src/lib/libssl/d1_srtp.c | 4 +++- src/lib/libssl/d1_srvr.c | 12 +++++++----- src/lib/libssl/dtls1.h | 8 +++++--- src/lib/libssl/s23_clnt.c | 6 ++++-- src/lib/libssl/s23_lib.c | 4 +++- src/lib/libssl/s23_pkt.c | 8 +++++--- src/lib/libssl/s23_srvr.c | 6 ++++-- src/lib/libssl/s3_both.c | 8 +++++--- src/lib/libssl/s3_clnt.c | 11 +++++++---- src/lib/libssl/s3_pkt.c | 8 +++++--- src/lib/libssl/s3_srvr.c | 12 +++++++----- src/lib/libssl/src/ssl/bio_ssl.c | 7 ++++--- src/lib/libssl/src/ssl/d1_both.c | 8 +++++--- src/lib/libssl/src/ssl/d1_clnt.c | 10 ++++++---- src/lib/libssl/src/ssl/d1_enc.c | 4 +++- src/lib/libssl/src/ssl/d1_lib.c | 3 ++- src/lib/libssl/src/ssl/d1_meth.c | 4 +++- src/lib/libssl/src/ssl/d1_pkt.c | 11 +++++++---- src/lib/libssl/src/ssl/d1_srtp.c | 4 +++- src/lib/libssl/src/ssl/d1_srvr.c | 12 +++++++----- src/lib/libssl/src/ssl/dtls1.h | 8 +++++--- src/lib/libssl/src/ssl/s23_clnt.c | 6 ++++-- src/lib/libssl/src/ssl/s23_lib.c | 4 +++- src/lib/libssl/src/ssl/s23_meth.c | 4 +++- src/lib/libssl/src/ssl/s23_pkt.c | 8 +++++--- src/lib/libssl/src/ssl/s23_srvr.c | 6 ++++-- src/lib/libssl/src/ssl/s3_both.c | 8 +++++--- src/lib/libssl/src/ssl/s3_clnt.c | 11 +++++++---- src/lib/libssl/src/ssl/s3_enc.c | 4 +++- src/lib/libssl/src/ssl/s3_meth.c | 4 +++- src/lib/libssl/src/ssl/s3_pkt.c | 8 +++++--- src/lib/libssl/src/ssl/s3_srvr.c | 12 +++++++----- src/lib/libssl/src/ssl/ssl.h | 17 +++++++++-------- src/lib/libssl/src/ssl/ssl_algs.c | 6 ++++-- src/lib/libssl/src/ssl/ssl_cert.c | 13 +++++++------ src/lib/libssl/src/ssl/ssl_ciph.c | 5 ++++- src/lib/libssl/src/ssl/ssl_err.c | 3 ++- src/lib/libssl/src/ssl/ssl_err2.c | 3 ++- src/lib/libssl/src/ssl/ssl_lib.c | 11 +++++++---- src/lib/libssl/src/ssl/ssl_locl.h | 12 ++++++------ src/lib/libssl/src/ssl/ssl_rsa.c | 8 +++++--- src/lib/libssl/src/ssl/ssl_stat.c | 3 ++- src/lib/libssl/src/ssl/ssl_txt.c | 4 +++- src/lib/libssl/src/ssl/t1_clnt.c | 6 ++++-- src/lib/libssl/src/ssl/t1_enc.c | 4 +++- src/lib/libssl/src/ssl/t1_meth.c | 4 +++- src/lib/libssl/src/ssl/t1_reneg.c | 5 ++++- src/lib/libssl/src/ssl/t1_srvr.c | 6 ++++-- src/lib/libssl/ssl.h | 17 +++++++++-------- src/lib/libssl/ssl_algs.c | 6 ++++-- src/lib/libssl/ssl_cert.c | 13 +++++++------ src/lib/libssl/ssl_ciph.c | 5 ++++- src/lib/libssl/ssl_err.c | 3 ++- src/lib/libssl/ssl_err2.c | 3 ++- src/lib/libssl/ssl_lib.c | 11 +++++++---- src/lib/libssl/ssl_locl.h | 12 ++++++------ src/lib/libssl/ssl_rsa.c | 8 +++++--- src/lib/libssl/ssl_stat.c | 3 ++- src/lib/libssl/ssl_txt.c | 4 +++- src/lib/libssl/t1_clnt.c | 6 ++++-- src/lib/libssl/t1_enc.c | 4 +++- src/lib/libssl/t1_meth.c | 4 +++- src/lib/libssl/t1_reneg.c | 5 ++++- src/lib/libssl/t1_srvr.c | 6 ++++-- 71 files changed, 317 insertions(+), 183 deletions(-) diff --git a/src/lib/libssl/bio_ssl.c b/src/lib/libssl/bio_ssl.c index 4d28d1821d..cfaf78a4dd 100644 --- a/src/lib/libssl/bio_ssl.c +++ b/src/lib/libssl/bio_ssl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bio_ssl.c,v 1.20 2014/06/12 15:49:31 deraadt Exp $ */ +/* $OpenBSD: bio_ssl.c,v 1.21 2014/11/16 14:12:47 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -56,12 +56,13 @@ * [including the GNU Public Licence.] */ +#include #include #include #include -#include -#include + #include +#include #include #include diff --git a/src/lib/libssl/d1_both.c b/src/lib/libssl/d1_both.c index 10659a5136..2dc26e38cb 100644 --- a/src/lib/libssl/d1_both.c +++ b/src/lib/libssl/d1_both.c @@ -1,4 +1,4 @@ -/* $OpenBSD: d1_both.c,v 1.29 2014/10/18 16:13:16 jsing Exp $ */ +/* $OpenBSD: d1_both.c,v 1.30 2014/11/16 14:12:47 jsing Exp $ */ /* * DTLS implementation written by Nagendra Modadugu * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. @@ -114,12 +114,14 @@ */ #include -#include #include +#include + #include "ssl_locl.h" + #include -#include #include +#include #include #include "pqueue.h" diff --git a/src/lib/libssl/d1_clnt.c b/src/lib/libssl/d1_clnt.c index 4b71f01a6c..7f6e232128 100644 --- a/src/lib/libssl/d1_clnt.c +++ b/src/lib/libssl/d1_clnt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: d1_clnt.c,v 1.36 2014/10/18 16:13:16 jsing Exp $ */ +/* $OpenBSD: d1_clnt.c,v 1.37 2014/11/16 14:12:47 jsing Exp $ */ /* * DTLS implementation written by Nagendra Modadugu * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. @@ -114,13 +114,15 @@ */ #include + #include "ssl_locl.h" + +#include #include -#include +#include #include #include -#include -#include +#include static const SSL_METHOD *dtls1_get_client_method(int ver); static int dtls1_get_hello_verify(SSL *s); diff --git a/src/lib/libssl/d1_enc.c b/src/lib/libssl/d1_enc.c index 32fcd333f6..7414301b4c 100644 --- a/src/lib/libssl/d1_enc.c +++ b/src/lib/libssl/d1_enc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: d1_enc.c,v 1.7 2014/10/18 16:13:16 jsing Exp $ */ +/* $OpenBSD: d1_enc.c,v 1.8 2014/11/16 14:12:47 jsing Exp $ */ /* * DTLS implementation written by Nagendra Modadugu * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. @@ -114,7 +114,9 @@ */ #include + #include "ssl_locl.h" + #include #include #include diff --git a/src/lib/libssl/d1_lib.c b/src/lib/libssl/d1_lib.c index ff78d0cf3a..9170e8867a 100644 --- a/src/lib/libssl/d1_lib.c +++ b/src/lib/libssl/d1_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: d1_lib.c,v 1.24 2014/07/17 23:48:24 deraadt Exp $ */ +/* $OpenBSD: d1_lib.c,v 1.25 2014/11/16 14:12:47 jsing Exp $ */ /* * DTLS implementation written by Nagendra Modadugu * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. @@ -63,6 +63,7 @@ #include #include + #include #include "pqueue.h" diff --git a/src/lib/libssl/d1_meth.c b/src/lib/libssl/d1_meth.c index df4ec9fdf2..85909d17d5 100644 --- a/src/lib/libssl/d1_meth.c +++ b/src/lib/libssl/d1_meth.c @@ -1,4 +1,4 @@ -/* $OpenBSD: d1_meth.c,v 1.6 2014/08/10 14:42:56 jsing Exp $ */ +/* $OpenBSD: d1_meth.c,v 1.7 2014/11/16 14:12:47 jsing Exp $ */ /* * DTLS implementation written by Nagendra Modadugu * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. @@ -58,7 +58,9 @@ */ #include + #include + #include "ssl_locl.h" static const SSL_METHOD *dtls1_get_method(int ver); diff --git a/src/lib/libssl/d1_pkt.c b/src/lib/libssl/d1_pkt.c index 7aa5aac752..83b9bf1ce2 100644 --- a/src/lib/libssl/d1_pkt.c +++ b/src/lib/libssl/d1_pkt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: d1_pkt.c,v 1.36 2014/10/22 15:29:31 jsing Exp $ */ +/* $OpenBSD: d1_pkt.c,v 1.37 2014/11/16 14:12:47 jsing Exp $ */ /* * DTLS implementation written by Nagendra Modadugu * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. @@ -113,12 +113,15 @@ * [including the GNU Public Licence.] */ -#include -#include #include + +#include +#include + #include "ssl_locl.h" -#include + #include +#include #include "pqueue.h" diff --git a/src/lib/libssl/d1_srtp.c b/src/lib/libssl/d1_srtp.c index 3492b7d1d0..1443964776 100644 --- a/src/lib/libssl/d1_srtp.c +++ b/src/lib/libssl/d1_srtp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: d1_srtp.c,v 1.8 2014/07/14 08:21:47 miod Exp $ */ +/* $OpenBSD: d1_srtp.c,v 1.9 2014/11/16 14:12:47 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -116,7 +116,9 @@ */ #include + #include + #include "ssl_locl.h" #ifndef OPENSSL_NO_SRTP diff --git a/src/lib/libssl/d1_srvr.c b/src/lib/libssl/d1_srvr.c index d2f642f877..e1959fb7e1 100644 --- a/src/lib/libssl/d1_srvr.c +++ b/src/lib/libssl/d1_srvr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: d1_srvr.c,v 1.41 2014/10/31 14:51:01 jsing Exp $ */ +/* $OpenBSD: d1_srvr.c,v 1.42 2014/11/16 14:12:47 jsing Exp $ */ /* * DTLS implementation written by Nagendra Modadugu * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. @@ -114,14 +114,16 @@ */ #include + #include "ssl_locl.h" + +#include #include -#include +#include #include -#include #include -#include -#include +#include +#include static const SSL_METHOD *dtls1_get_server_method(int ver); static int dtls1_send_hello_verify_request(SSL *s); diff --git a/src/lib/libssl/dtls1.h b/src/lib/libssl/dtls1.h index e7229fb56b..d3d7e38464 100644 --- a/src/lib/libssl/dtls1.h +++ b/src/lib/libssl/dtls1.h @@ -1,4 +1,4 @@ -/* $OpenBSD: dtls1.h,v 1.14 2014/07/10 08:51:14 tedu Exp $ */ +/* $OpenBSD: dtls1.h,v 1.15 2014/11/16 14:12:47 jsing Exp $ */ /* * DTLS implementation written by Nagendra Modadugu * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. @@ -60,11 +60,13 @@ #ifndef HEADER_DTLS1_H #define HEADER_DTLS1_H -#include +#include + #include #include #include -#include + +#include #ifdef __cplusplus extern "C" { diff --git a/src/lib/libssl/s23_clnt.c b/src/lib/libssl/s23_clnt.c index 7967344e2a..07bf6d7861 100644 --- a/src/lib/libssl/s23_clnt.c +++ b/src/lib/libssl/s23_clnt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: s23_clnt.c,v 1.33 2014/10/18 16:13:16 jsing Exp $ */ +/* $OpenBSD: s23_clnt.c,v 1.34 2014/11/16 14:12:47 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -110,10 +110,12 @@ */ #include + #include "ssl_locl.h" + #include -#include #include +#include static const SSL_METHOD *ssl23_get_client_method(int ver); static int ssl23_client_hello(SSL *s); diff --git a/src/lib/libssl/s23_lib.c b/src/lib/libssl/s23_lib.c index 3a6d1d598b..cd594aa3c9 100644 --- a/src/lib/libssl/s23_lib.c +++ b/src/lib/libssl/s23_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: s23_lib.c,v 1.17 2014/08/10 14:42:56 jsing Exp $ */ +/* $OpenBSD: s23_lib.c,v 1.18 2014/11/16 14:12:47 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -57,7 +57,9 @@ */ #include + #include + #include "ssl_locl.h" long diff --git a/src/lib/libssl/s23_pkt.c b/src/lib/libssl/s23_pkt.c index d116db699b..2081f48f08 100644 --- a/src/lib/libssl/s23_pkt.c +++ b/src/lib/libssl/s23_pkt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: s23_pkt.c,v 1.8 2014/06/12 15:49:31 deraadt Exp $ */ +/* $OpenBSD: s23_pkt.c,v 1.9 2014/11/16 14:12:47 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -56,11 +56,13 @@ * [including the GNU Public Licence.] */ -#include #include +#include + #include "ssl_locl.h" -#include + #include +#include int ssl23_write_bytes(SSL *s) diff --git a/src/lib/libssl/s23_srvr.c b/src/lib/libssl/s23_srvr.c index a278fe923b..9530ecdbaa 100644 --- a/src/lib/libssl/s23_srvr.c +++ b/src/lib/libssl/s23_srvr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: s23_srvr.c,v 1.35 2014/10/18 16:13:16 jsing Exp $ */ +/* $OpenBSD: s23_srvr.c,v 1.36 2014/11/16 14:12:47 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -110,10 +110,12 @@ */ #include + #include "ssl_locl.h" + #include -#include #include +#include static const SSL_METHOD *ssl23_get_server_method(int ver); int ssl23_get_client_hello(SSL *s); diff --git a/src/lib/libssl/s3_both.c b/src/lib/libssl/s3_both.c index cd0a4b8013..752bac6c94 100644 --- a/src/lib/libssl/s3_both.c +++ b/src/lib/libssl/s3_both.c @@ -1,4 +1,4 @@ -/* $OpenBSD: s3_both.c,v 1.31 2014/10/18 16:13:16 jsing Exp $ */ +/* $OpenBSD: s3_both.c,v 1.32 2014/11/16 14:12:47 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -115,12 +115,14 @@ */ #include -#include #include +#include + #include "ssl_locl.h" + #include -#include #include +#include #include /* send s->init_buf in records of type 'type' (SSL3_RT_HANDSHAKE or SSL3_RT_CHANGE_CIPHER_SPEC) */ diff --git a/src/lib/libssl/s3_clnt.c b/src/lib/libssl/s3_clnt.c index 179e9400d4..4c086bae83 100644 --- a/src/lib/libssl/s3_clnt.c +++ b/src/lib/libssl/s3_clnt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: s3_clnt.c,v 1.92 2014/10/18 16:13:16 jsing Exp $ */ +/* $OpenBSD: s3_clnt.c,v 1.93 2014/11/16 14:12:47 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -149,13 +149,16 @@ */ #include + #include "ssl_locl.h" + +#include #include -#include +#include #include #include -#include -#include +#include + #ifndef OPENSSL_NO_ENGINE #include #endif diff --git a/src/lib/libssl/s3_pkt.c b/src/lib/libssl/s3_pkt.c index 62fc6fbce2..ac1b2d7cb4 100644 --- a/src/lib/libssl/s3_pkt.c +++ b/src/lib/libssl/s3_pkt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: s3_pkt.c,v 1.51 2014/10/18 16:13:16 jsing Exp $ */ +/* $OpenBSD: s3_pkt.c,v 1.52 2014/11/16 14:12:47 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -109,11 +109,13 @@ * */ -#include #include +#include + #include "ssl_locl.h" -#include + #include +#include static int do_ssl3_write(SSL *s, int type, const unsigned char *buf, unsigned int len, int create_empty_fragment); diff --git a/src/lib/libssl/s3_srvr.c b/src/lib/libssl/s3_srvr.c index 3a311fbfb6..a9f82b39d2 100644 --- a/src/lib/libssl/s3_srvr.c +++ b/src/lib/libssl/s3_srvr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: s3_srvr.c,v 1.89 2014/10/31 15:25:55 jsing Exp $ */ +/* $OpenBSD: s3_srvr.c,v 1.90 2014/11/16 14:12:47 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -152,15 +152,17 @@ #define NETSCAPE_HANG_BUG #include + #include "ssl_locl.h" + +#include #include -#include #include -#include -#include #include -#include +#include #include +#include +#include static const SSL_METHOD *ssl3_get_server_method(int ver); diff --git a/src/lib/libssl/src/ssl/bio_ssl.c b/src/lib/libssl/src/ssl/bio_ssl.c index 4d28d1821d..cfaf78a4dd 100644 --- a/src/lib/libssl/src/ssl/bio_ssl.c +++ b/src/lib/libssl/src/ssl/bio_ssl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bio_ssl.c,v 1.20 2014/06/12 15:49:31 deraadt Exp $ */ +/* $OpenBSD: bio_ssl.c,v 1.21 2014/11/16 14:12:47 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -56,12 +56,13 @@ * [including the GNU Public Licence.] */ +#include #include #include #include -#include -#include + #include +#include #include #include diff --git a/src/lib/libssl/src/ssl/d1_both.c b/src/lib/libssl/src/ssl/d1_both.c index 10659a5136..2dc26e38cb 100644 --- a/src/lib/libssl/src/ssl/d1_both.c +++ b/src/lib/libssl/src/ssl/d1_both.c @@ -1,4 +1,4 @@ -/* $OpenBSD: d1_both.c,v 1.29 2014/10/18 16:13:16 jsing Exp $ */ +/* $OpenBSD: d1_both.c,v 1.30 2014/11/16 14:12:47 jsing Exp $ */ /* * DTLS implementation written by Nagendra Modadugu * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. @@ -114,12 +114,14 @@ */ #include -#include #include +#include + #include "ssl_locl.h" + #include -#include #include +#include #include #include "pqueue.h" diff --git a/src/lib/libssl/src/ssl/d1_clnt.c b/src/lib/libssl/src/ssl/d1_clnt.c index 4b71f01a6c..7f6e232128 100644 --- a/src/lib/libssl/src/ssl/d1_clnt.c +++ b/src/lib/libssl/src/ssl/d1_clnt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: d1_clnt.c,v 1.36 2014/10/18 16:13:16 jsing Exp $ */ +/* $OpenBSD: d1_clnt.c,v 1.37 2014/11/16 14:12:47 jsing Exp $ */ /* * DTLS implementation written by Nagendra Modadugu * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. @@ -114,13 +114,15 @@ */ #include + #include "ssl_locl.h" + +#include #include -#include +#include #include #include -#include -#include +#include static const SSL_METHOD *dtls1_get_client_method(int ver); static int dtls1_get_hello_verify(SSL *s); diff --git a/src/lib/libssl/src/ssl/d1_enc.c b/src/lib/libssl/src/ssl/d1_enc.c index 32fcd333f6..7414301b4c 100644 --- a/src/lib/libssl/src/ssl/d1_enc.c +++ b/src/lib/libssl/src/ssl/d1_enc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: d1_enc.c,v 1.7 2014/10/18 16:13:16 jsing Exp $ */ +/* $OpenBSD: d1_enc.c,v 1.8 2014/11/16 14:12:47 jsing Exp $ */ /* * DTLS implementation written by Nagendra Modadugu * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. @@ -114,7 +114,9 @@ */ #include + #include "ssl_locl.h" + #include #include #include diff --git a/src/lib/libssl/src/ssl/d1_lib.c b/src/lib/libssl/src/ssl/d1_lib.c index ff78d0cf3a..9170e8867a 100644 --- a/src/lib/libssl/src/ssl/d1_lib.c +++ b/src/lib/libssl/src/ssl/d1_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: d1_lib.c,v 1.24 2014/07/17 23:48:24 deraadt Exp $ */ +/* $OpenBSD: d1_lib.c,v 1.25 2014/11/16 14:12:47 jsing Exp $ */ /* * DTLS implementation written by Nagendra Modadugu * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. @@ -63,6 +63,7 @@ #include #include + #include #include "pqueue.h" diff --git a/src/lib/libssl/src/ssl/d1_meth.c b/src/lib/libssl/src/ssl/d1_meth.c index df4ec9fdf2..85909d17d5 100644 --- a/src/lib/libssl/src/ssl/d1_meth.c +++ b/src/lib/libssl/src/ssl/d1_meth.c @@ -1,4 +1,4 @@ -/* $OpenBSD: d1_meth.c,v 1.6 2014/08/10 14:42:56 jsing Exp $ */ +/* $OpenBSD: d1_meth.c,v 1.7 2014/11/16 14:12:47 jsing Exp $ */ /* * DTLS implementation written by Nagendra Modadugu * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. @@ -58,7 +58,9 @@ */ #include + #include + #include "ssl_locl.h" static const SSL_METHOD *dtls1_get_method(int ver); diff --git a/src/lib/libssl/src/ssl/d1_pkt.c b/src/lib/libssl/src/ssl/d1_pkt.c index 7aa5aac752..83b9bf1ce2 100644 --- a/src/lib/libssl/src/ssl/d1_pkt.c +++ b/src/lib/libssl/src/ssl/d1_pkt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: d1_pkt.c,v 1.36 2014/10/22 15:29:31 jsing Exp $ */ +/* $OpenBSD: d1_pkt.c,v 1.37 2014/11/16 14:12:47 jsing Exp $ */ /* * DTLS implementation written by Nagendra Modadugu * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. @@ -113,12 +113,15 @@ * [including the GNU Public Licence.] */ -#include -#include #include + +#include +#include + #include "ssl_locl.h" -#include + #include +#include #include "pqueue.h" diff --git a/src/lib/libssl/src/ssl/d1_srtp.c b/src/lib/libssl/src/ssl/d1_srtp.c index 3492b7d1d0..1443964776 100644 --- a/src/lib/libssl/src/ssl/d1_srtp.c +++ b/src/lib/libssl/src/ssl/d1_srtp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: d1_srtp.c,v 1.8 2014/07/14 08:21:47 miod Exp $ */ +/* $OpenBSD: d1_srtp.c,v 1.9 2014/11/16 14:12:47 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -116,7 +116,9 @@ */ #include + #include + #include "ssl_locl.h" #ifndef OPENSSL_NO_SRTP diff --git a/src/lib/libssl/src/ssl/d1_srvr.c b/src/lib/libssl/src/ssl/d1_srvr.c index d2f642f877..e1959fb7e1 100644 --- a/src/lib/libssl/src/ssl/d1_srvr.c +++ b/src/lib/libssl/src/ssl/d1_srvr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: d1_srvr.c,v 1.41 2014/10/31 14:51:01 jsing Exp $ */ +/* $OpenBSD: d1_srvr.c,v 1.42 2014/11/16 14:12:47 jsing Exp $ */ /* * DTLS implementation written by Nagendra Modadugu * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. @@ -114,14 +114,16 @@ */ #include + #include "ssl_locl.h" + +#include #include -#include +#include #include -#include #include -#include -#include +#include +#include static const SSL_METHOD *dtls1_get_server_method(int ver); static int dtls1_send_hello_verify_request(SSL *s); diff --git a/src/lib/libssl/src/ssl/dtls1.h b/src/lib/libssl/src/ssl/dtls1.h index e7229fb56b..d3d7e38464 100644 --- a/src/lib/libssl/src/ssl/dtls1.h +++ b/src/lib/libssl/src/ssl/dtls1.h @@ -1,4 +1,4 @@ -/* $OpenBSD: dtls1.h,v 1.14 2014/07/10 08:51:14 tedu Exp $ */ +/* $OpenBSD: dtls1.h,v 1.15 2014/11/16 14:12:47 jsing Exp $ */ /* * DTLS implementation written by Nagendra Modadugu * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. @@ -60,11 +60,13 @@ #ifndef HEADER_DTLS1_H #define HEADER_DTLS1_H -#include +#include + #include #include #include -#include + +#include #ifdef __cplusplus extern "C" { diff --git a/src/lib/libssl/src/ssl/s23_clnt.c b/src/lib/libssl/src/ssl/s23_clnt.c index 7967344e2a..07bf6d7861 100644 --- a/src/lib/libssl/src/ssl/s23_clnt.c +++ b/src/lib/libssl/src/ssl/s23_clnt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: s23_clnt.c,v 1.33 2014/10/18 16:13:16 jsing Exp $ */ +/* $OpenBSD: s23_clnt.c,v 1.34 2014/11/16 14:12:47 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -110,10 +110,12 @@ */ #include + #include "ssl_locl.h" + #include -#include #include +#include static const SSL_METHOD *ssl23_get_client_method(int ver); static int ssl23_client_hello(SSL *s); diff --git a/src/lib/libssl/src/ssl/s23_lib.c b/src/lib/libssl/src/ssl/s23_lib.c index 3a6d1d598b..cd594aa3c9 100644 --- a/src/lib/libssl/src/ssl/s23_lib.c +++ b/src/lib/libssl/src/ssl/s23_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: s23_lib.c,v 1.17 2014/08/10 14:42:56 jsing Exp $ */ +/* $OpenBSD: s23_lib.c,v 1.18 2014/11/16 14:12:47 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -57,7 +57,9 @@ */ #include + #include + #include "ssl_locl.h" long diff --git a/src/lib/libssl/src/ssl/s23_meth.c b/src/lib/libssl/src/ssl/s23_meth.c index 768c526802..e5382ff38d 100644 --- a/src/lib/libssl/src/ssl/s23_meth.c +++ b/src/lib/libssl/src/ssl/s23_meth.c @@ -1,4 +1,4 @@ -/* $OpenBSD: s23_meth.c,v 1.15 2014/08/10 14:42:56 jsing Exp $ */ +/* $OpenBSD: s23_meth.c,v 1.16 2014/11/16 14:12:47 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -57,7 +57,9 @@ */ #include + #include + #include "ssl_locl.h" static const SSL_METHOD *ssl23_get_method(int ver); diff --git a/src/lib/libssl/src/ssl/s23_pkt.c b/src/lib/libssl/src/ssl/s23_pkt.c index d116db699b..2081f48f08 100644 --- a/src/lib/libssl/src/ssl/s23_pkt.c +++ b/src/lib/libssl/src/ssl/s23_pkt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: s23_pkt.c,v 1.8 2014/06/12 15:49:31 deraadt Exp $ */ +/* $OpenBSD: s23_pkt.c,v 1.9 2014/11/16 14:12:47 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -56,11 +56,13 @@ * [including the GNU Public Licence.] */ -#include #include +#include + #include "ssl_locl.h" -#include + #include +#include int ssl23_write_bytes(SSL *s) diff --git a/src/lib/libssl/src/ssl/s23_srvr.c b/src/lib/libssl/src/ssl/s23_srvr.c index a278fe923b..9530ecdbaa 100644 --- a/src/lib/libssl/src/ssl/s23_srvr.c +++ b/src/lib/libssl/src/ssl/s23_srvr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: s23_srvr.c,v 1.35 2014/10/18 16:13:16 jsing Exp $ */ +/* $OpenBSD: s23_srvr.c,v 1.36 2014/11/16 14:12:47 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -110,10 +110,12 @@ */ #include + #include "ssl_locl.h" + #include -#include #include +#include static const SSL_METHOD *ssl23_get_server_method(int ver); int ssl23_get_client_hello(SSL *s); diff --git a/src/lib/libssl/src/ssl/s3_both.c b/src/lib/libssl/src/ssl/s3_both.c index cd0a4b8013..752bac6c94 100644 --- a/src/lib/libssl/src/ssl/s3_both.c +++ b/src/lib/libssl/src/ssl/s3_both.c @@ -1,4 +1,4 @@ -/* $OpenBSD: s3_both.c,v 1.31 2014/10/18 16:13:16 jsing Exp $ */ +/* $OpenBSD: s3_both.c,v 1.32 2014/11/16 14:12:47 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -115,12 +115,14 @@ */ #include -#include #include +#include + #include "ssl_locl.h" + #include -#include #include +#include #include /* send s->init_buf in records of type 'type' (SSL3_RT_HANDSHAKE or SSL3_RT_CHANGE_CIPHER_SPEC) */ diff --git a/src/lib/libssl/src/ssl/s3_clnt.c b/src/lib/libssl/src/ssl/s3_clnt.c index 179e9400d4..4c086bae83 100644 --- a/src/lib/libssl/src/ssl/s3_clnt.c +++ b/src/lib/libssl/src/ssl/s3_clnt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: s3_clnt.c,v 1.92 2014/10/18 16:13:16 jsing Exp $ */ +/* $OpenBSD: s3_clnt.c,v 1.93 2014/11/16 14:12:47 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -149,13 +149,16 @@ */ #include + #include "ssl_locl.h" + +#include #include -#include +#include #include #include -#include -#include +#include + #ifndef OPENSSL_NO_ENGINE #include #endif diff --git a/src/lib/libssl/src/ssl/s3_enc.c b/src/lib/libssl/src/ssl/s3_enc.c index 93f5d6ac47..09d3dd77a5 100644 --- a/src/lib/libssl/src/ssl/s3_enc.c +++ b/src/lib/libssl/src/ssl/s3_enc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: s3_enc.c,v 1.55 2014/10/18 03:04:28 doug Exp $ */ +/* $OpenBSD: s3_enc.c,v 1.56 2014/11/16 14:12:47 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -136,7 +136,9 @@ */ #include + #include "ssl_locl.h" + #include #include diff --git a/src/lib/libssl/src/ssl/s3_meth.c b/src/lib/libssl/src/ssl/s3_meth.c index a5a63265f3..9817e757c1 100644 --- a/src/lib/libssl/src/ssl/s3_meth.c +++ b/src/lib/libssl/src/ssl/s3_meth.c @@ -1,4 +1,4 @@ -/* $OpenBSD: s3_meth.c,v 1.10 2014/08/10 14:42:56 jsing Exp $ */ +/* $OpenBSD: s3_meth.c,v 1.11 2014/11/16 14:12:47 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -57,7 +57,9 @@ */ #include + #include + #include "ssl_locl.h" static const SSL_METHOD *ssl3_get_method(int ver); diff --git a/src/lib/libssl/src/ssl/s3_pkt.c b/src/lib/libssl/src/ssl/s3_pkt.c index 62fc6fbce2..ac1b2d7cb4 100644 --- a/src/lib/libssl/src/ssl/s3_pkt.c +++ b/src/lib/libssl/src/ssl/s3_pkt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: s3_pkt.c,v 1.51 2014/10/18 16:13:16 jsing Exp $ */ +/* $OpenBSD: s3_pkt.c,v 1.52 2014/11/16 14:12:47 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -109,11 +109,13 @@ * */ -#include #include +#include + #include "ssl_locl.h" -#include + #include +#include static int do_ssl3_write(SSL *s, int type, const unsigned char *buf, unsigned int len, int create_empty_fragment); diff --git a/src/lib/libssl/src/ssl/s3_srvr.c b/src/lib/libssl/src/ssl/s3_srvr.c index 3a311fbfb6..a9f82b39d2 100644 --- a/src/lib/libssl/src/ssl/s3_srvr.c +++ b/src/lib/libssl/src/ssl/s3_srvr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: s3_srvr.c,v 1.89 2014/10/31 15:25:55 jsing Exp $ */ +/* $OpenBSD: s3_srvr.c,v 1.90 2014/11/16 14:12:47 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -152,15 +152,17 @@ #define NETSCAPE_HANG_BUG #include + #include "ssl_locl.h" + +#include #include -#include #include -#include -#include #include -#include +#include #include +#include +#include static const SSL_METHOD *ssl3_get_server_method(int ver); diff --git a/src/lib/libssl/src/ssl/ssl.h b/src/lib/libssl/src/ssl/ssl.h index c46d333958..00a4b5e39b 100644 --- a/src/lib/libssl/src/ssl/ssl.h +++ b/src/lib/libssl/src/ssl/ssl.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl.h,v 1.70 2014/10/31 15:34:06 jsing Exp $ */ +/* $OpenBSD: ssl.h,v 1.71 2014/11/16 14:12:47 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -144,22 +144,23 @@ #define HEADER_SSL_H #include +#include +#include +#include #ifndef OPENSSL_NO_BIO #include #endif + #ifndef OPENSSL_NO_DEPRECATED +#include +#include +#include + #ifndef OPENSSL_NO_X509 #include #endif -#include -#include -#include #endif -#include -#include - -#include #ifdef __cplusplus extern "C" { diff --git a/src/lib/libssl/src/ssl/ssl_algs.c b/src/lib/libssl/src/ssl/ssl_algs.c index ce051252f6..842d50a762 100644 --- a/src/lib/libssl/src/ssl/ssl_algs.c +++ b/src/lib/libssl/src/ssl/ssl_algs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl_algs.c,v 1.19 2014/07/10 08:51:15 tedu Exp $ */ +/* $OpenBSD: ssl_algs.c,v 1.20 2014/11/16 14:12:47 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -57,8 +57,10 @@ */ #include -#include + #include +#include + #include "ssl_locl.h" int diff --git a/src/lib/libssl/src/ssl/ssl_cert.c b/src/lib/libssl/src/ssl/ssl_cert.c index 8adb9aa032..7938c82c94 100644 --- a/src/lib/libssl/src/ssl/ssl_cert.c +++ b/src/lib/libssl/src/ssl/ssl_cert.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl_cert.c,v 1.44 2014/10/31 15:25:55 jsing Exp $ */ +/* $OpenBSD: ssl_cert.c,v 1.45 2014/11/16 14:12:47 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -116,17 +116,18 @@ #include +#include #include #include -#include -#include -#include #include +#include +#include +#include +#include #include #include -#include -#include + #include "ssl_locl.h" int diff --git a/src/lib/libssl/src/ssl/ssl_ciph.c b/src/lib/libssl/src/ssl/ssl_ciph.c index 6193cd1a66..443c2ec660 100644 --- a/src/lib/libssl/src/ssl/ssl_ciph.c +++ b/src/lib/libssl/src/ssl/ssl_ciph.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl_ciph.c,v 1.72 2014/11/08 15:21:02 jsing Exp $ */ +/* $OpenBSD: ssl_ciph.c,v 1.73 2014/11/16 14:12:47 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -141,10 +141,13 @@ */ #include + #include + #ifndef OPENSSL_NO_ENGINE #include #endif + #include "ssl_locl.h" #define SSL_ENC_DES_IDX 0 diff --git a/src/lib/libssl/src/ssl/ssl_err.c b/src/lib/libssl/src/ssl/ssl_err.c index 33cd5f2f96..eb0fb4f8f2 100644 --- a/src/lib/libssl/src/ssl/ssl_err.c +++ b/src/lib/libssl/src/ssl/ssl_err.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl_err.c,v 1.26 2014/09/27 11:01:06 jsing Exp $ */ +/* $OpenBSD: ssl_err.c,v 1.27 2014/11/16 14:12:47 jsing Exp $ */ /* ==================================================================== * Copyright (c) 1999-2011 The OpenSSL Project. All rights reserved. * @@ -59,6 +59,7 @@ */ #include + #include #include diff --git a/src/lib/libssl/src/ssl/ssl_err2.c b/src/lib/libssl/src/ssl/ssl_err2.c index 0e5b3b5015..19eb4a5afe 100644 --- a/src/lib/libssl/src/ssl/ssl_err2.c +++ b/src/lib/libssl/src/ssl/ssl_err2.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl_err2.c,v 1.5 2014/06/12 15:49:31 deraadt Exp $ */ +/* $OpenBSD: ssl_err2.c,v 1.6 2014/11/16 14:12:47 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -57,6 +57,7 @@ */ #include + #include #include diff --git a/src/lib/libssl/src/ssl/ssl_lib.c b/src/lib/libssl/src/ssl/ssl_lib.c index 078a710c33..bdd47ff87f 100644 --- a/src/lib/libssl/src/ssl/ssl_lib.c +++ b/src/lib/libssl/src/ssl/ssl_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl_lib.c,v 1.89 2014/10/31 15:25:55 jsing Exp $ */ +/* $OpenBSD: ssl_lib.c,v 1.90 2014/11/16 14:12:47 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -141,12 +141,15 @@ */ #include + #include "ssl_locl.h" -#include + +#include #include -#include +#include #include -#include +#include + #ifndef OPENSSL_NO_ENGINE #include #endif diff --git a/src/lib/libssl/src/ssl/ssl_locl.h b/src/lib/libssl/src/ssl/ssl_locl.h index 8888d6c5a5..ec8f96e645 100644 --- a/src/lib/libssl/src/ssl/ssl_locl.h +++ b/src/lib/libssl/src/ssl/ssl_locl.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl_locl.h,v 1.75 2014/11/08 15:21:02 jsing Exp $ */ +/* $OpenBSD: ssl_locl.h,v 1.76 2014/11/16 14:12:47 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -145,20 +145,20 @@ #include +#include #include -#include #include -#include +#include #include #include -#include #include -#include -#include +#include #include #include +#include #include +#include #define c2l(c,l) (l = ((unsigned long)(*((c)++))) , \ l|=(((unsigned long)(*((c)++)))<< 8), \ diff --git a/src/lib/libssl/src/ssl/ssl_rsa.c b/src/lib/libssl/src/ssl/ssl_rsa.c index e8b72f016e..7ccf5d564d 100644 --- a/src/lib/libssl/src/ssl/ssl_rsa.c +++ b/src/lib/libssl/src/ssl/ssl_rsa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl_rsa.c,v 1.17 2014/09/28 14:45:48 reyk Exp $ */ +/* $OpenBSD: ssl_rsa.c,v 1.18 2014/11/16 14:12:47 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -57,12 +57,14 @@ */ #include + #include "ssl_locl.h" + #include -#include #include -#include +#include #include +#include static int ssl_set_cert(CERT *c, X509 *x509); static int ssl_set_pkey(CERT *c, EVP_PKEY *pkey); diff --git a/src/lib/libssl/src/ssl/ssl_stat.c b/src/lib/libssl/src/ssl/ssl_stat.c index d7f41dbf95..6d67d19c25 100644 --- a/src/lib/libssl/src/ssl/ssl_stat.c +++ b/src/lib/libssl/src/ssl/ssl_stat.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl_stat.c,v 1.11 2014/07/13 00:08:44 jsing Exp $ */ +/* $OpenBSD: ssl_stat.c,v 1.12 2014/11/16 14:12:47 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -83,6 +83,7 @@ */ #include + #include "ssl_locl.h" const char * diff --git a/src/lib/libssl/src/ssl/ssl_txt.c b/src/lib/libssl/src/ssl/ssl_txt.c index 3540bab313..508db476d8 100644 --- a/src/lib/libssl/src/ssl/ssl_txt.c +++ b/src/lib/libssl/src/ssl/ssl_txt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl_txt.c,v 1.24 2014/07/12 19:45:53 jsing Exp $ */ +/* $OpenBSD: ssl_txt.c,v 1.25 2014/11/16 14:12:47 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -83,7 +83,9 @@ */ #include + #include + #include "ssl_locl.h" int diff --git a/src/lib/libssl/src/ssl/t1_clnt.c b/src/lib/libssl/src/ssl/t1_clnt.c index cb5f26a07c..b2adbaee73 100644 --- a/src/lib/libssl/src/ssl/t1_clnt.c +++ b/src/lib/libssl/src/ssl/t1_clnt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: t1_clnt.c,v 1.15 2014/10/18 16:13:16 jsing Exp $ */ +/* $OpenBSD: t1_clnt.c,v 1.16 2014/11/16 14:12:47 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -57,10 +57,12 @@ */ #include + #include "ssl_locl.h" + #include -#include #include +#include static const SSL_METHOD *tls1_get_client_method(int ver); diff --git a/src/lib/libssl/src/ssl/t1_enc.c b/src/lib/libssl/src/ssl/t1_enc.c index ea5df0bf63..fc313efc2c 100644 --- a/src/lib/libssl/src/ssl/t1_enc.c +++ b/src/lib/libssl/src/ssl/t1_enc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: t1_enc.c,v 1.71 2014/10/18 16:13:16 jsing Exp $ */ +/* $OpenBSD: t1_enc.c,v 1.72 2014/11/16 14:12:47 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -136,7 +136,9 @@ */ #include + #include "ssl_locl.h" + #include #include #include diff --git a/src/lib/libssl/src/ssl/t1_meth.c b/src/lib/libssl/src/ssl/t1_meth.c index de066322f4..e0cc50e117 100644 --- a/src/lib/libssl/src/ssl/t1_meth.c +++ b/src/lib/libssl/src/ssl/t1_meth.c @@ -1,4 +1,4 @@ -/* $OpenBSD: t1_meth.c,v 1.13 2014/08/10 14:42:56 jsing Exp $ */ +/* $OpenBSD: t1_meth.c,v 1.14 2014/11/16 14:12:47 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -57,7 +57,9 @@ */ #include + #include + #include "ssl_locl.h" static const SSL_METHOD *tls1_get_method(int ver); diff --git a/src/lib/libssl/src/ssl/t1_reneg.c b/src/lib/libssl/src/ssl/t1_reneg.c index fee9dd8e4a..c93105ef4d 100644 --- a/src/lib/libssl/src/ssl/t1_reneg.c +++ b/src/lib/libssl/src/ssl/t1_reneg.c @@ -1,4 +1,4 @@ -/* $OpenBSD: t1_reneg.c,v 1.8 2014/06/21 20:27:25 tedu Exp $ */ +/* $OpenBSD: t1_reneg.c,v 1.9 2014/11/16 14:12:47 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -108,8 +108,11 @@ * Hudson (tjh@cryptsoft.com). * */ + #include + #include + #include "ssl_locl.h" /* Add the client's renegotiation binding */ diff --git a/src/lib/libssl/src/ssl/t1_srvr.c b/src/lib/libssl/src/ssl/t1_srvr.c index ba579dd110..ab3fb7cdbf 100644 --- a/src/lib/libssl/src/ssl/t1_srvr.c +++ b/src/lib/libssl/src/ssl/t1_srvr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: t1_srvr.c,v 1.15 2014/10/18 16:13:16 jsing Exp $ */ +/* $OpenBSD: t1_srvr.c,v 1.16 2014/11/16 14:12:47 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -57,10 +57,12 @@ */ #include + #include "ssl_locl.h" + #include -#include #include +#include #include static const SSL_METHOD *tls1_get_server_method(int ver); diff --git a/src/lib/libssl/ssl.h b/src/lib/libssl/ssl.h index c46d333958..00a4b5e39b 100644 --- a/src/lib/libssl/ssl.h +++ b/src/lib/libssl/ssl.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl.h,v 1.70 2014/10/31 15:34:06 jsing Exp $ */ +/* $OpenBSD: ssl.h,v 1.71 2014/11/16 14:12:47 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -144,22 +144,23 @@ #define HEADER_SSL_H #include +#include +#include +#include #ifndef OPENSSL_NO_BIO #include #endif + #ifndef OPENSSL_NO_DEPRECATED +#include +#include +#include + #ifndef OPENSSL_NO_X509 #include #endif -#include -#include -#include #endif -#include -#include - -#include #ifdef __cplusplus extern "C" { diff --git a/src/lib/libssl/ssl_algs.c b/src/lib/libssl/ssl_algs.c index ce051252f6..842d50a762 100644 --- a/src/lib/libssl/ssl_algs.c +++ b/src/lib/libssl/ssl_algs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl_algs.c,v 1.19 2014/07/10 08:51:15 tedu Exp $ */ +/* $OpenBSD: ssl_algs.c,v 1.20 2014/11/16 14:12:47 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -57,8 +57,10 @@ */ #include -#include + #include +#include + #include "ssl_locl.h" int diff --git a/src/lib/libssl/ssl_cert.c b/src/lib/libssl/ssl_cert.c index 8adb9aa032..7938c82c94 100644 --- a/src/lib/libssl/ssl_cert.c +++ b/src/lib/libssl/ssl_cert.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl_cert.c,v 1.44 2014/10/31 15:25:55 jsing Exp $ */ +/* $OpenBSD: ssl_cert.c,v 1.45 2014/11/16 14:12:47 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -116,17 +116,18 @@ #include +#include #include #include -#include -#include -#include #include +#include +#include +#include +#include #include #include -#include -#include + #include "ssl_locl.h" int diff --git a/src/lib/libssl/ssl_ciph.c b/src/lib/libssl/ssl_ciph.c index 6193cd1a66..443c2ec660 100644 --- a/src/lib/libssl/ssl_ciph.c +++ b/src/lib/libssl/ssl_ciph.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl_ciph.c,v 1.72 2014/11/08 15:21:02 jsing Exp $ */ +/* $OpenBSD: ssl_ciph.c,v 1.73 2014/11/16 14:12:47 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -141,10 +141,13 @@ */ #include + #include + #ifndef OPENSSL_NO_ENGINE #include #endif + #include "ssl_locl.h" #define SSL_ENC_DES_IDX 0 diff --git a/src/lib/libssl/ssl_err.c b/src/lib/libssl/ssl_err.c index 33cd5f2f96..eb0fb4f8f2 100644 --- a/src/lib/libssl/ssl_err.c +++ b/src/lib/libssl/ssl_err.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl_err.c,v 1.26 2014/09/27 11:01:06 jsing Exp $ */ +/* $OpenBSD: ssl_err.c,v 1.27 2014/11/16 14:12:47 jsing Exp $ */ /* ==================================================================== * Copyright (c) 1999-2011 The OpenSSL Project. All rights reserved. * @@ -59,6 +59,7 @@ */ #include + #include #include diff --git a/src/lib/libssl/ssl_err2.c b/src/lib/libssl/ssl_err2.c index 0e5b3b5015..19eb4a5afe 100644 --- a/src/lib/libssl/ssl_err2.c +++ b/src/lib/libssl/ssl_err2.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl_err2.c,v 1.5 2014/06/12 15:49:31 deraadt Exp $ */ +/* $OpenBSD: ssl_err2.c,v 1.6 2014/11/16 14:12:47 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -57,6 +57,7 @@ */ #include + #include #include diff --git a/src/lib/libssl/ssl_lib.c b/src/lib/libssl/ssl_lib.c index 078a710c33..bdd47ff87f 100644 --- a/src/lib/libssl/ssl_lib.c +++ b/src/lib/libssl/ssl_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl_lib.c,v 1.89 2014/10/31 15:25:55 jsing Exp $ */ +/* $OpenBSD: ssl_lib.c,v 1.90 2014/11/16 14:12:47 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -141,12 +141,15 @@ */ #include + #include "ssl_locl.h" -#include + +#include #include -#include +#include #include -#include +#include + #ifndef OPENSSL_NO_ENGINE #include #endif diff --git a/src/lib/libssl/ssl_locl.h b/src/lib/libssl/ssl_locl.h index 8888d6c5a5..ec8f96e645 100644 --- a/src/lib/libssl/ssl_locl.h +++ b/src/lib/libssl/ssl_locl.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl_locl.h,v 1.75 2014/11/08 15:21:02 jsing Exp $ */ +/* $OpenBSD: ssl_locl.h,v 1.76 2014/11/16 14:12:47 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -145,20 +145,20 @@ #include +#include #include -#include #include -#include +#include #include #include -#include #include -#include -#include +#include #include #include +#include #include +#include #define c2l(c,l) (l = ((unsigned long)(*((c)++))) , \ l|=(((unsigned long)(*((c)++)))<< 8), \ diff --git a/src/lib/libssl/ssl_rsa.c b/src/lib/libssl/ssl_rsa.c index e8b72f016e..7ccf5d564d 100644 --- a/src/lib/libssl/ssl_rsa.c +++ b/src/lib/libssl/ssl_rsa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl_rsa.c,v 1.17 2014/09/28 14:45:48 reyk Exp $ */ +/* $OpenBSD: ssl_rsa.c,v 1.18 2014/11/16 14:12:47 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -57,12 +57,14 @@ */ #include + #include "ssl_locl.h" + #include -#include #include -#include +#include #include +#include static int ssl_set_cert(CERT *c, X509 *x509); static int ssl_set_pkey(CERT *c, EVP_PKEY *pkey); diff --git a/src/lib/libssl/ssl_stat.c b/src/lib/libssl/ssl_stat.c index d7f41dbf95..6d67d19c25 100644 --- a/src/lib/libssl/ssl_stat.c +++ b/src/lib/libssl/ssl_stat.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl_stat.c,v 1.11 2014/07/13 00:08:44 jsing Exp $ */ +/* $OpenBSD: ssl_stat.c,v 1.12 2014/11/16 14:12:47 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -83,6 +83,7 @@ */ #include + #include "ssl_locl.h" const char * diff --git a/src/lib/libssl/ssl_txt.c b/src/lib/libssl/ssl_txt.c index 3540bab313..508db476d8 100644 --- a/src/lib/libssl/ssl_txt.c +++ b/src/lib/libssl/ssl_txt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl_txt.c,v 1.24 2014/07/12 19:45:53 jsing Exp $ */ +/* $OpenBSD: ssl_txt.c,v 1.25 2014/11/16 14:12:47 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -83,7 +83,9 @@ */ #include + #include + #include "ssl_locl.h" int diff --git a/src/lib/libssl/t1_clnt.c b/src/lib/libssl/t1_clnt.c index cb5f26a07c..b2adbaee73 100644 --- a/src/lib/libssl/t1_clnt.c +++ b/src/lib/libssl/t1_clnt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: t1_clnt.c,v 1.15 2014/10/18 16:13:16 jsing Exp $ */ +/* $OpenBSD: t1_clnt.c,v 1.16 2014/11/16 14:12:47 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -57,10 +57,12 @@ */ #include + #include "ssl_locl.h" + #include -#include #include +#include static const SSL_METHOD *tls1_get_client_method(int ver); diff --git a/src/lib/libssl/t1_enc.c b/src/lib/libssl/t1_enc.c index ea5df0bf63..fc313efc2c 100644 --- a/src/lib/libssl/t1_enc.c +++ b/src/lib/libssl/t1_enc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: t1_enc.c,v 1.71 2014/10/18 16:13:16 jsing Exp $ */ +/* $OpenBSD: t1_enc.c,v 1.72 2014/11/16 14:12:47 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -136,7 +136,9 @@ */ #include + #include "ssl_locl.h" + #include #include #include diff --git a/src/lib/libssl/t1_meth.c b/src/lib/libssl/t1_meth.c index de066322f4..e0cc50e117 100644 --- a/src/lib/libssl/t1_meth.c +++ b/src/lib/libssl/t1_meth.c @@ -1,4 +1,4 @@ -/* $OpenBSD: t1_meth.c,v 1.13 2014/08/10 14:42:56 jsing Exp $ */ +/* $OpenBSD: t1_meth.c,v 1.14 2014/11/16 14:12:47 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -57,7 +57,9 @@ */ #include + #include + #include "ssl_locl.h" static const SSL_METHOD *tls1_get_method(int ver); diff --git a/src/lib/libssl/t1_reneg.c b/src/lib/libssl/t1_reneg.c index fee9dd8e4a..c93105ef4d 100644 --- a/src/lib/libssl/t1_reneg.c +++ b/src/lib/libssl/t1_reneg.c @@ -1,4 +1,4 @@ -/* $OpenBSD: t1_reneg.c,v 1.8 2014/06/21 20:27:25 tedu Exp $ */ +/* $OpenBSD: t1_reneg.c,v 1.9 2014/11/16 14:12:47 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -108,8 +108,11 @@ * Hudson (tjh@cryptsoft.com). * */ + #include + #include + #include "ssl_locl.h" /* Add the client's renegotiation binding */ diff --git a/src/lib/libssl/t1_srvr.c b/src/lib/libssl/t1_srvr.c index ba579dd110..ab3fb7cdbf 100644 --- a/src/lib/libssl/t1_srvr.c +++ b/src/lib/libssl/t1_srvr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: t1_srvr.c,v 1.15 2014/10/18 16:13:16 jsing Exp $ */ +/* $OpenBSD: t1_srvr.c,v 1.16 2014/11/16 14:12:47 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -57,10 +57,12 @@ */ #include + #include "ssl_locl.h" + #include -#include #include +#include #include static const SSL_METHOD *tls1_get_server_method(int ver); -- cgit v1.2.3-55-g6feb