diff options
Diffstat (limited to 'lib/libssl')
34 files changed, 154 insertions, 90 deletions
diff --git a/lib/libssl/bio_ssl.c b/lib/libssl/bio_ssl.c index 4d28d1821d2..cfaf78a4ddd 100644 --- a/lib/libssl/bio_ssl.c +++ b/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 <errno.h> #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <errno.h> -#include <openssl/crypto.h> + #include <openssl/bio.h> +#include <openssl/crypto.h> #include <openssl/err.h> #include <openssl/ssl.h> diff --git a/lib/libssl/d1_both.c b/lib/libssl/d1_both.c index 10659a51366..2dc26e38cbf 100644 --- a/lib/libssl/d1_both.c +++ b/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 <limits.h> -#include <string.h> #include <stdio.h> +#include <string.h> + #include "ssl_locl.h" + #include <openssl/buffer.h> -#include <openssl/objects.h> #include <openssl/evp.h> +#include <openssl/objects.h> #include <openssl/x509.h> #include "pqueue.h" diff --git a/lib/libssl/d1_clnt.c b/lib/libssl/d1_clnt.c index 4b71f01a6ca..7f6e232128a 100644 --- a/lib/libssl/d1_clnt.c +++ b/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 <stdio.h> + #include "ssl_locl.h" + +#include <openssl/bn.h> #include <openssl/buffer.h> -#include <openssl/objects.h> +#include <openssl/dh.h> #include <openssl/evp.h> #include <openssl/md5.h> -#include <openssl/bn.h> -#include <openssl/dh.h> +#include <openssl/objects.h> static const SSL_METHOD *dtls1_get_client_method(int ver); static int dtls1_get_hello_verify(SSL *s); diff --git a/lib/libssl/d1_enc.c b/lib/libssl/d1_enc.c index 32fcd333f61..7414301b4c7 100644 --- a/lib/libssl/d1_enc.c +++ b/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 <stdio.h> + #include "ssl_locl.h" + #include <openssl/evp.h> #include <openssl/hmac.h> #include <openssl/md5.h> diff --git a/lib/libssl/d1_lib.c b/lib/libssl/d1_lib.c index ff78d0cf3ae..9170e8867a9 100644 --- a/lib/libssl/d1_lib.c +++ b/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 <netinet/in.h> #include <stdio.h> + #include <openssl/objects.h> #include "pqueue.h" diff --git a/lib/libssl/d1_meth.c b/lib/libssl/d1_meth.c index df4ec9fdf28..85909d17d50 100644 --- a/lib/libssl/d1_meth.c +++ b/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 <stdio.h> + #include <openssl/objects.h> + #include "ssl_locl.h" static const SSL_METHOD *dtls1_get_method(int ver); diff --git a/lib/libssl/d1_pkt.c b/lib/libssl/d1_pkt.c index 7aa5aac7523..83b9bf1ce29 100644 --- a/lib/libssl/d1_pkt.c +++ b/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 <stdio.h> -#include <errno.h> #include <machine/endian.h> + +#include <errno.h> +#include <stdio.h> + #include "ssl_locl.h" -#include <openssl/evp.h> + #include <openssl/buffer.h> +#include <openssl/evp.h> #include "pqueue.h" diff --git a/lib/libssl/d1_srtp.c b/lib/libssl/d1_srtp.c index 3492b7d1d02..14439647763 100644 --- a/lib/libssl/d1_srtp.c +++ b/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 <stdio.h> + #include <openssl/objects.h> + #include "ssl_locl.h" #ifndef OPENSSL_NO_SRTP diff --git a/lib/libssl/d1_srvr.c b/lib/libssl/d1_srvr.c index d2f642f8773..e1959fb7e1d 100644 --- a/lib/libssl/d1_srvr.c +++ b/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 <stdio.h> + #include "ssl_locl.h" + +#include <openssl/bn.h> #include <openssl/buffer.h> -#include <openssl/objects.h> +#include <openssl/dh.h> #include <openssl/evp.h> -#include <openssl/x509.h> #include <openssl/md5.h> -#include <openssl/bn.h> -#include <openssl/dh.h> +#include <openssl/objects.h> +#include <openssl/x509.h> static const SSL_METHOD *dtls1_get_server_method(int ver); static int dtls1_send_hello_verify_request(SSL *s); diff --git a/lib/libssl/dtls1.h b/lib/libssl/dtls1.h index e7229fb56be..d3d7e38464c 100644 --- a/lib/libssl/dtls1.h +++ b/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 <openssl/buffer.h> +#include <sys/time.h> + #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <sys/time.h> + +#include <openssl/buffer.h> #ifdef __cplusplus extern "C" { diff --git a/lib/libssl/s23_clnt.c b/lib/libssl/s23_clnt.c index 7967344e2ae..07bf6d78617 100644 --- a/lib/libssl/s23_clnt.c +++ b/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 <stdio.h> + #include "ssl_locl.h" + #include <openssl/buffer.h> -#include <openssl/objects.h> #include <openssl/evp.h> +#include <openssl/objects.h> static const SSL_METHOD *ssl23_get_client_method(int ver); static int ssl23_client_hello(SSL *s); diff --git a/lib/libssl/s23_lib.c b/lib/libssl/s23_lib.c index 3a6d1d598bc..cd594aa3c96 100644 --- a/lib/libssl/s23_lib.c +++ b/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 <stdio.h> + #include <openssl/objects.h> + #include "ssl_locl.h" long diff --git a/lib/libssl/s23_pkt.c b/lib/libssl/s23_pkt.c index d116db699bd..2081f48f08d 100644 --- a/lib/libssl/s23_pkt.c +++ b/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 <stdio.h> #include <errno.h> +#include <stdio.h> + #include "ssl_locl.h" -#include <openssl/evp.h> + #include <openssl/buffer.h> +#include <openssl/evp.h> int ssl23_write_bytes(SSL *s) diff --git a/lib/libssl/s23_srvr.c b/lib/libssl/s23_srvr.c index a278fe923be..9530ecdbaa5 100644 --- a/lib/libssl/s23_srvr.c +++ b/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 <stdio.h> + #include "ssl_locl.h" + #include <openssl/buffer.h> -#include <openssl/objects.h> #include <openssl/evp.h> +#include <openssl/objects.h> static const SSL_METHOD *ssl23_get_server_method(int ver); int ssl23_get_client_hello(SSL *s); diff --git a/lib/libssl/s3_both.c b/lib/libssl/s3_both.c index cd0a4b8013a..752bac6c946 100644 --- a/lib/libssl/s3_both.c +++ b/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 <limits.h> -#include <string.h> #include <stdio.h> +#include <string.h> + #include "ssl_locl.h" + #include <openssl/buffer.h> -#include <openssl/objects.h> #include <openssl/evp.h> +#include <openssl/objects.h> #include <openssl/x509.h> /* send s->init_buf in records of type 'type' (SSL3_RT_HANDSHAKE or SSL3_RT_CHANGE_CIPHER_SPEC) */ diff --git a/lib/libssl/s3_clnt.c b/lib/libssl/s3_clnt.c index 179e9400d4f..4c086bae836 100644 --- a/lib/libssl/s3_clnt.c +++ b/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 <stdio.h> + #include "ssl_locl.h" + +#include <openssl/bn.h> #include <openssl/buffer.h> -#include <openssl/objects.h> +#include <openssl/dh.h> #include <openssl/evp.h> #include <openssl/md5.h> -#include <openssl/dh.h> -#include <openssl/bn.h> +#include <openssl/objects.h> + #ifndef OPENSSL_NO_ENGINE #include <openssl/engine.h> #endif diff --git a/lib/libssl/s3_pkt.c b/lib/libssl/s3_pkt.c index 62fc6fbce24..ac1b2d7cb4a 100644 --- a/lib/libssl/s3_pkt.c +++ b/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 <stdio.h> #include <errno.h> +#include <stdio.h> + #include "ssl_locl.h" -#include <openssl/evp.h> + #include <openssl/buffer.h> +#include <openssl/evp.h> static int do_ssl3_write(SSL *s, int type, const unsigned char *buf, unsigned int len, int create_empty_fragment); diff --git a/lib/libssl/s3_srvr.c b/lib/libssl/s3_srvr.c index 3a311fbfb6b..a9f82b39d20 100644 --- a/lib/libssl/s3_srvr.c +++ b/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 <stdio.h> + #include "ssl_locl.h" + +#include <openssl/bn.h> #include <openssl/buffer.h> -#include <openssl/objects.h> #include <openssl/evp.h> -#include <openssl/hmac.h> -#include <openssl/x509.h> #include <openssl/dh.h> -#include <openssl/bn.h> +#include <openssl/hmac.h> #include <openssl/md5.h> +#include <openssl/objects.h> +#include <openssl/x509.h> static const SSL_METHOD *ssl3_get_server_method(int ver); diff --git a/lib/libssl/ssl.h b/lib/libssl/ssl.h index c46d3339589..00a4b5e39be 100644 --- a/lib/libssl/ssl.h +++ b/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 <openssl/opensslconf.h> +#include <openssl/hmac.h> +#include <openssl/pem.h> +#include <openssl/safestack.h> #ifndef OPENSSL_NO_BIO #include <openssl/bio.h> #endif + #ifndef OPENSSL_NO_DEPRECATED +#include <openssl/buffer.h> +#include <openssl/crypto.h> +#include <openssl/lhash.h> + #ifndef OPENSSL_NO_X509 #include <openssl/x509.h> #endif -#include <openssl/crypto.h> -#include <openssl/lhash.h> -#include <openssl/buffer.h> #endif -#include <openssl/pem.h> -#include <openssl/hmac.h> - -#include <openssl/safestack.h> #ifdef __cplusplus extern "C" { diff --git a/lib/libssl/ssl_algs.c b/lib/libssl/ssl_algs.c index ce051252f6c..842d50a7623 100644 --- a/lib/libssl/ssl_algs.c +++ b/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 <stdio.h> -#include <openssl/objects.h> + #include <openssl/lhash.h> +#include <openssl/objects.h> + #include "ssl_locl.h" int diff --git a/lib/libssl/ssl_cert.c b/lib/libssl/ssl_cert.c index 8adb9aa0326..7938c82c946 100644 --- a/lib/libssl/ssl_cert.c +++ b/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 <sys/types.h> +#include <dirent.h> #include <stdio.h> #include <unistd.h> -#include <dirent.h> -#include <openssl/opensslconf.h> -#include <openssl/objects.h> #include <openssl/bio.h> +#include <openssl/bn.h> +#include <openssl/dh.h> +#include <openssl/objects.h> +#include <openssl/opensslconf.h> #include <openssl/pem.h> #include <openssl/x509v3.h> -#include <openssl/dh.h> -#include <openssl/bn.h> + #include "ssl_locl.h" int diff --git a/lib/libssl/ssl_ciph.c b/lib/libssl/ssl_ciph.c index 6193cd1a666..443c2ec6602 100644 --- a/lib/libssl/ssl_ciph.c +++ b/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 <stdio.h> + #include <openssl/objects.h> + #ifndef OPENSSL_NO_ENGINE #include <openssl/engine.h> #endif + #include "ssl_locl.h" #define SSL_ENC_DES_IDX 0 diff --git a/lib/libssl/ssl_err.c b/lib/libssl/ssl_err.c index 33cd5f2f96f..eb0fb4f8f2e 100644 --- a/lib/libssl/ssl_err.c +++ b/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 <stdio.h> + #include <openssl/err.h> #include <openssl/ssl.h> diff --git a/lib/libssl/ssl_err2.c b/lib/libssl/ssl_err2.c index 0e5b3b5015d..19eb4a5afe1 100644 --- a/lib/libssl/ssl_err2.c +++ b/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 <stdio.h> + #include <openssl/err.h> #include <openssl/ssl.h> diff --git a/lib/libssl/ssl_lib.c b/lib/libssl/ssl_lib.c index 078a710c330..bdd47ff87f6 100644 --- a/lib/libssl/ssl_lib.c +++ b/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 <stdio.h> + #include "ssl_locl.h" -#include <openssl/objects.h> + +#include <openssl/dh.h> #include <openssl/lhash.h> -#include <openssl/x509v3.h> +#include <openssl/objects.h> #include <openssl/ocsp.h> -#include <openssl/dh.h> +#include <openssl/x509v3.h> + #ifndef OPENSSL_NO_ENGINE #include <openssl/engine.h> #endif diff --git a/lib/libssl/ssl_locl.h b/lib/libssl/ssl_locl.h index 8888d6c5a59..ec8f96e6455 100644 --- a/lib/libssl/ssl_locl.h +++ b/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 <sys/types.h> +#include <errno.h> #include <stdlib.h> -#include <time.h> #include <string.h> -#include <errno.h> +#include <time.h> #include <unistd.h> #include <openssl/opensslconf.h> -#include <openssl/buffer.h> #include <openssl/bio.h> -#include <openssl/stack.h> -#include <openssl/rsa.h> +#include <openssl/buffer.h> #include <openssl/dsa.h> #include <openssl/err.h> +#include <openssl/rsa.h> #include <openssl/ssl.h> +#include <openssl/stack.h> #define c2l(c,l) (l = ((unsigned long)(*((c)++))) , \ l|=(((unsigned long)(*((c)++)))<< 8), \ diff --git a/lib/libssl/ssl_rsa.c b/lib/libssl/ssl_rsa.c index e8b72f016e5..7ccf5d564dc 100644 --- a/lib/libssl/ssl_rsa.c +++ b/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 <stdio.h> + #include "ssl_locl.h" + #include <openssl/bio.h> -#include <openssl/objects.h> #include <openssl/evp.h> -#include <openssl/x509.h> +#include <openssl/objects.h> #include <openssl/pem.h> +#include <openssl/x509.h> static int ssl_set_cert(CERT *c, X509 *x509); static int ssl_set_pkey(CERT *c, EVP_PKEY *pkey); diff --git a/lib/libssl/ssl_stat.c b/lib/libssl/ssl_stat.c index d7f41dbf95e..6d67d19c253 100644 --- a/lib/libssl/ssl_stat.c +++ b/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 <stdio.h> + #include "ssl_locl.h" const char * diff --git a/lib/libssl/ssl_txt.c b/lib/libssl/ssl_txt.c index 3540bab3137..508db476d80 100644 --- a/lib/libssl/ssl_txt.c +++ b/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 <stdio.h> + #include <openssl/buffer.h> + #include "ssl_locl.h" int diff --git a/lib/libssl/t1_clnt.c b/lib/libssl/t1_clnt.c index cb5f26a07c8..b2adbaee73f 100644 --- a/lib/libssl/t1_clnt.c +++ b/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 <stdio.h> + #include "ssl_locl.h" + #include <openssl/buffer.h> -#include <openssl/objects.h> #include <openssl/evp.h> +#include <openssl/objects.h> static const SSL_METHOD *tls1_get_client_method(int ver); diff --git a/lib/libssl/t1_enc.c b/lib/libssl/t1_enc.c index ea5df0bf632..fc313efc2c7 100644 --- a/lib/libssl/t1_enc.c +++ b/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 <stdio.h> + #include "ssl_locl.h" + #include <openssl/evp.h> #include <openssl/hmac.h> #include <openssl/md5.h> diff --git a/lib/libssl/t1_meth.c b/lib/libssl/t1_meth.c index de066322f46..e0cc50e1172 100644 --- a/lib/libssl/t1_meth.c +++ b/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 <stdio.h> + #include <openssl/objects.h> + #include "ssl_locl.h" static const SSL_METHOD *tls1_get_method(int ver); diff --git a/lib/libssl/t1_reneg.c b/lib/libssl/t1_reneg.c index fee9dd8e4a1..c93105ef4dd 100644 --- a/lib/libssl/t1_reneg.c +++ b/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 <stdio.h> + #include <openssl/objects.h> + #include "ssl_locl.h" /* Add the client's renegotiation binding */ diff --git a/lib/libssl/t1_srvr.c b/lib/libssl/t1_srvr.c index ba579dd110a..ab3fb7cdbf5 100644 --- a/lib/libssl/t1_srvr.c +++ b/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 <stdio.h> + #include "ssl_locl.h" + #include <openssl/buffer.h> -#include <openssl/objects.h> #include <openssl/evp.h> +#include <openssl/objects.h> #include <openssl/x509.h> static const SSL_METHOD *tls1_get_server_method(int ver); |