summaryrefslogtreecommitdiffstats
path: root/lib/libssl/src
diff options
context:
space:
mode:
Diffstat (limited to 'lib/libssl/src')
-rw-r--r--lib/libssl/src/crypto/asn1/d2i_pr.c3
-rw-r--r--lib/libssl/src/crypto/conf/conf_sap.c3
-rw-r--r--lib/libssl/src/crypto/dh/dh_lib.c3
-rw-r--r--lib/libssl/src/crypto/dsa/dsa_lib.c3
-rw-r--r--lib/libssl/src/crypto/engine/eng_cnf.c4
-rw-r--r--lib/libssl/src/crypto/engine/eng_ctrl.c4
-rw-r--r--lib/libssl/src/crypto/engine/eng_dyn.c4
-rw-r--r--lib/libssl/src/crypto/engine/eng_fat.c3
-rw-r--r--lib/libssl/src/crypto/engine/eng_init.c4
-rw-r--r--lib/libssl/src/crypto/engine/eng_lib.c3
-rw-r--r--lib/libssl/src/crypto/engine/eng_list.c4
-rw-r--r--lib/libssl/src/crypto/engine/eng_openssl.c3
-rw-r--r--lib/libssl/src/crypto/engine/eng_pkey.c4
-rw-r--r--lib/libssl/src/crypto/engine/eng_table.c3
-rw-r--r--lib/libssl/src/crypto/engine/tb_asnmth.c4
-rw-r--r--lib/libssl/src/crypto/engine/tb_cipher.c4
-rw-r--r--lib/libssl/src/crypto/engine/tb_digest.c4
-rw-r--r--lib/libssl/src/crypto/engine/tb_pkmeth.c4
-rw-r--r--lib/libssl/src/crypto/evp/digest.c3
-rw-r--r--lib/libssl/src/crypto/evp/pmeth_lib.c3
-rw-r--r--lib/libssl/src/crypto/gost/gostr341001.c3
-rw-r--r--lib/libssl/src/crypto/gost/gostr341001_ameth.c3
-rw-r--r--lib/libssl/src/crypto/gost/gostr341001_key.c3
-rw-r--r--lib/libssl/src/crypto/gost/gostr341001_pmeth.c3
-rw-r--r--lib/libssl/src/crypto/pem/pem_lib.c3
-rw-r--r--lib/libssl/src/crypto/pem/pem_pkey.c3
-rw-r--r--lib/libssl/src/crypto/rsa/rsa_crpt.c3
-rw-r--r--lib/libssl/src/crypto/rsa/rsa_lib.c3
-rw-r--r--lib/libssl/src/crypto/ts/ts_conf.c3
-rw-r--r--lib/libssl/src/ssl/ssl_lib.c3
30 files changed, 70 insertions, 30 deletions
diff --git a/lib/libssl/src/crypto/asn1/d2i_pr.c b/lib/libssl/src/crypto/asn1/d2i_pr.c
index 2deec613ed9..14f08e1380a 100644
--- a/lib/libssl/src/crypto/asn1/d2i_pr.c
+++ b/lib/libssl/src/crypto/asn1/d2i_pr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: d2i_pr.c,v 1.12 2014/07/11 08:44:47 jsing Exp $ */
+/* $OpenBSD: d2i_pr.c,v 1.13 2015/02/11 03:19:37 doug Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@@ -62,6 +62,7 @@
#include <openssl/asn1.h>
#include <openssl/bn.h>
+#include <openssl/err.h>
#include <openssl/evp.h>
#include <openssl/objects.h>
#include <openssl/x509.h>
diff --git a/lib/libssl/src/crypto/conf/conf_sap.c b/lib/libssl/src/crypto/conf/conf_sap.c
index 52d05dbe139..a29acea7c1e 100644
--- a/lib/libssl/src/crypto/conf/conf_sap.c
+++ b/lib/libssl/src/crypto/conf/conf_sap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf_sap.c,v 1.10 2014/07/11 08:44:48 jsing Exp $ */
+/* $OpenBSD: conf_sap.c,v 1.11 2015/02/11 03:19:37 doug Exp $ */
/* Written by Stephen Henson (steve@openssl.org) for the OpenSSL
* project 2001.
*/
@@ -63,6 +63,7 @@
#include <openssl/asn1.h>
#include <openssl/conf.h>
#include <openssl/crypto.h>
+#include <openssl/err.h>
#include <openssl/x509.h>
#ifndef OPENSSL_NO_ENGINE
diff --git a/lib/libssl/src/crypto/dh/dh_lib.c b/lib/libssl/src/crypto/dh/dh_lib.c
index c438f387c01..defe1c74b4f 100644
--- a/lib/libssl/src/crypto/dh/dh_lib.c
+++ b/lib/libssl/src/crypto/dh/dh_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dh_lib.c,v 1.20 2014/07/12 16:03:37 miod Exp $ */
+/* $OpenBSD: dh_lib.c,v 1.21 2015/02/11 03:19:37 doug Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@@ -62,6 +62,7 @@
#include <openssl/bn.h>
#include <openssl/dh.h>
+#include <openssl/err.h>
#ifndef OPENSSL_NO_ENGINE
#include <openssl/engine.h>
diff --git a/lib/libssl/src/crypto/dsa/dsa_lib.c b/lib/libssl/src/crypto/dsa/dsa_lib.c
index 1cfd6ce6b83..8016f2f7cbd 100644
--- a/lib/libssl/src/crypto/dsa/dsa_lib.c
+++ b/lib/libssl/src/crypto/dsa/dsa_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dsa_lib.c,v 1.21 2014/07/12 16:03:37 miod Exp $ */
+/* $OpenBSD: dsa_lib.c,v 1.22 2015/02/11 03:19:37 doug Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@@ -65,6 +65,7 @@
#include <openssl/asn1.h>
#include <openssl/bn.h>
#include <openssl/dsa.h>
+#include <openssl/err.h>
#ifndef OPENSSL_NO_DH
#include <openssl/dh.h>
diff --git a/lib/libssl/src/crypto/engine/eng_cnf.c b/lib/libssl/src/crypto/engine/eng_cnf.c
index d9cc5986db0..acdebda6a67 100644
--- a/lib/libssl/src/crypto/engine/eng_cnf.c
+++ b/lib/libssl/src/crypto/engine/eng_cnf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: eng_cnf.c,v 1.12 2014/07/10 13:58:22 jsing Exp $ */
+/* $OpenBSD: eng_cnf.c,v 1.13 2015/02/11 03:19:37 doug Exp $ */
/* Written by Stephen Henson (steve@openssl.org) for the OpenSSL
* project 2001.
*/
@@ -58,6 +58,8 @@
#include <string.h>
+#include <openssl/err.h>
+
#include "eng_int.h"
#include <openssl/conf.h>
diff --git a/lib/libssl/src/crypto/engine/eng_ctrl.c b/lib/libssl/src/crypto/engine/eng_ctrl.c
index ea31bfc582f..bf832dc626c 100644
--- a/lib/libssl/src/crypto/engine/eng_ctrl.c
+++ b/lib/libssl/src/crypto/engine/eng_ctrl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: eng_ctrl.c,v 1.9 2014/07/10 13:58:22 jsing Exp $ */
+/* $OpenBSD: eng_ctrl.c,v 1.10 2015/02/11 03:19:37 doug Exp $ */
/* ====================================================================
* Copyright (c) 1999-2001 The OpenSSL Project. All rights reserved.
*
@@ -55,6 +55,8 @@
#include <string.h>
+#include <openssl/err.h>
+
#include "eng_int.h"
/* When querying a ENGINE-specific control command's 'description', this string
diff --git a/lib/libssl/src/crypto/engine/eng_dyn.c b/lib/libssl/src/crypto/engine/eng_dyn.c
index dfb35a84034..c78d9f6856e 100644
--- a/lib/libssl/src/crypto/engine/eng_dyn.c
+++ b/lib/libssl/src/crypto/engine/eng_dyn.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: eng_dyn.c,v 1.12 2014/07/13 16:03:09 beck Exp $ */
+/* $OpenBSD: eng_dyn.c,v 1.13 2015/02/11 03:19:37 doug Exp $ */
/* Written by Geoff Thorpe (geoff@geoffthorpe.net) for the OpenSSL
* project 2001.
*/
@@ -58,6 +58,8 @@
#include <string.h>
+#include <openssl/err.h>
+
#include "eng_int.h"
#include <openssl/dso.h>
diff --git a/lib/libssl/src/crypto/engine/eng_fat.c b/lib/libssl/src/crypto/engine/eng_fat.c
index 9805729922e..b54757d8ad5 100644
--- a/lib/libssl/src/crypto/engine/eng_fat.c
+++ b/lib/libssl/src/crypto/engine/eng_fat.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: eng_fat.c,v 1.14 2014/07/10 22:45:57 jsing Exp $ */
+/* $OpenBSD: eng_fat.c,v 1.15 2015/02/11 03:19:37 doug Exp $ */
/* ====================================================================
* Copyright (c) 1999-2001 The OpenSSL Project. All rights reserved.
*
@@ -62,6 +62,7 @@
#include <openssl/opensslconf.h>
+#include <openssl/err.h>
#include "eng_int.h"
#include <openssl/conf.h>
diff --git a/lib/libssl/src/crypto/engine/eng_init.c b/lib/libssl/src/crypto/engine/eng_init.c
index caebf5d8228..b50e22594c1 100644
--- a/lib/libssl/src/crypto/engine/eng_init.c
+++ b/lib/libssl/src/crypto/engine/eng_init.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: eng_init.c,v 1.6 2014/06/12 15:49:29 deraadt Exp $ */
+/* $OpenBSD: eng_init.c,v 1.7 2015/02/11 03:19:37 doug Exp $ */
/* ====================================================================
* Copyright (c) 1999-2001 The OpenSSL Project. All rights reserved.
*
@@ -53,6 +53,8 @@
*
*/
+#include <openssl/err.h>
+
#include "eng_int.h"
/* Initialise a engine type for use (or up its functional reference count
diff --git a/lib/libssl/src/crypto/engine/eng_lib.c b/lib/libssl/src/crypto/engine/eng_lib.c
index b3b9213d87d..f5f54fc6576 100644
--- a/lib/libssl/src/crypto/engine/eng_lib.c
+++ b/lib/libssl/src/crypto/engine/eng_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: eng_lib.c,v 1.10 2014/10/22 13:02:04 jsing Exp $ */
+/* $OpenBSD: eng_lib.c,v 1.11 2015/02/11 03:19:37 doug Exp $ */
/* Written by Geoff Thorpe (geoff@geoffthorpe.net) for the OpenSSL
* project 2000.
*/
@@ -58,6 +58,7 @@
#include <string.h>
+#include <openssl/err.h>
#include <openssl/rand.h>
#include "eng_int.h"
diff --git a/lib/libssl/src/crypto/engine/eng_list.c b/lib/libssl/src/crypto/engine/eng_list.c
index 78e978116ad..740db908525 100644
--- a/lib/libssl/src/crypto/engine/eng_list.c
+++ b/lib/libssl/src/crypto/engine/eng_list.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: eng_list.c,v 1.16 2015/02/07 13:19:15 doug Exp $ */
+/* $OpenBSD: eng_list.c,v 1.17 2015/02/11 03:19:37 doug Exp $ */
/* Written by Geoff Thorpe (geoff@geoffthorpe.net) for the OpenSSL
* project 2000.
*/
@@ -66,6 +66,8 @@
#include <openssl/opensslconf.h>
+#include <openssl/err.h>
+
#include "cryptlib.h"
#include "eng_int.h"
diff --git a/lib/libssl/src/crypto/engine/eng_openssl.c b/lib/libssl/src/crypto/engine/eng_openssl.c
index f1a58df857f..ed123d71070 100644
--- a/lib/libssl/src/crypto/engine/eng_openssl.c
+++ b/lib/libssl/src/crypto/engine/eng_openssl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: eng_openssl.c,v 1.9 2014/07/11 08:44:48 jsing Exp $ */
+/* $OpenBSD: eng_openssl.c,v 1.10 2015/02/11 03:19:37 doug Exp $ */
/* Written by Geoff Thorpe (geoff@geoffthorpe.net) for the OpenSSL
* project 2000.
*/
@@ -69,6 +69,7 @@
#include <openssl/crypto.h>
#include <openssl/dso.h>
#include <openssl/engine.h>
+#include <openssl/err.h>
#include <openssl/evp.h>
#include <openssl/pem.h>
#include <openssl/rand.h>
diff --git a/lib/libssl/src/crypto/engine/eng_pkey.c b/lib/libssl/src/crypto/engine/eng_pkey.c
index dc832450a68..74b1ce03b74 100644
--- a/lib/libssl/src/crypto/engine/eng_pkey.c
+++ b/lib/libssl/src/crypto/engine/eng_pkey.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: eng_pkey.c,v 1.5 2014/06/22 12:05:09 jsing Exp $ */
+/* $OpenBSD: eng_pkey.c,v 1.6 2015/02/11 03:19:37 doug Exp $ */
/* ====================================================================
* Copyright (c) 1999-2001 The OpenSSL Project. All rights reserved.
*
@@ -53,6 +53,8 @@
*
*/
+#include <openssl/err.h>
+
#include "eng_int.h"
/* Basic get/set stuff */
diff --git a/lib/libssl/src/crypto/engine/eng_table.c b/lib/libssl/src/crypto/engine/eng_table.c
index 9d52075a767..342c76fa1b0 100644
--- a/lib/libssl/src/crypto/engine/eng_table.c
+++ b/lib/libssl/src/crypto/engine/eng_table.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: eng_table.c,v 1.7 2014/07/11 08:44:48 jsing Exp $ */
+/* $OpenBSD: eng_table.c,v 1.8 2015/02/11 03:19:37 doug Exp $ */
/* ====================================================================
* Copyright (c) 2001 The OpenSSL Project. All rights reserved.
*
@@ -53,6 +53,7 @@
*
*/
+#include <openssl/err.h>
#include <openssl/evp.h>
#include <openssl/lhash.h>
diff --git a/lib/libssl/src/crypto/engine/tb_asnmth.c b/lib/libssl/src/crypto/engine/tb_asnmth.c
index d43eea5447e..3ba55419339 100644
--- a/lib/libssl/src/crypto/engine/tb_asnmth.c
+++ b/lib/libssl/src/crypto/engine/tb_asnmth.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tb_asnmth.c,v 1.4 2014/07/10 13:58:22 jsing Exp $ */
+/* $OpenBSD: tb_asnmth.c,v 1.5 2015/02/11 03:19:37 doug Exp $ */
/* ====================================================================
* Copyright (c) 2006 The OpenSSL Project. All rights reserved.
*
@@ -55,6 +55,8 @@
#include <string.h>
+#include <openssl/err.h>
+
#include "eng_int.h"
#include "asn1_locl.h"
#include <openssl/evp.h>
diff --git a/lib/libssl/src/crypto/engine/tb_cipher.c b/lib/libssl/src/crypto/engine/tb_cipher.c
index d869acf4057..a888d7a9584 100644
--- a/lib/libssl/src/crypto/engine/tb_cipher.c
+++ b/lib/libssl/src/crypto/engine/tb_cipher.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tb_cipher.c,v 1.6 2014/06/12 15:49:29 deraadt Exp $ */
+/* $OpenBSD: tb_cipher.c,v 1.7 2015/02/11 03:19:37 doug Exp $ */
/* ====================================================================
* Copyright (c) 2000 The OpenSSL Project. All rights reserved.
*
@@ -53,6 +53,8 @@
*
*/
+#include <openssl/err.h>
+
#include "eng_int.h"
/* If this symbol is defined then ENGINE_get_cipher_engine(), the function that
diff --git a/lib/libssl/src/crypto/engine/tb_digest.c b/lib/libssl/src/crypto/engine/tb_digest.c
index 5bdb37a9158..f7720d39e70 100644
--- a/lib/libssl/src/crypto/engine/tb_digest.c
+++ b/lib/libssl/src/crypto/engine/tb_digest.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tb_digest.c,v 1.6 2014/06/12 15:49:29 deraadt Exp $ */
+/* $OpenBSD: tb_digest.c,v 1.7 2015/02/11 03:19:37 doug Exp $ */
/* ====================================================================
* Copyright (c) 2000 The OpenSSL Project. All rights reserved.
*
@@ -53,6 +53,8 @@
*
*/
+#include <openssl/err.h>
+
#include "eng_int.h"
/* If this symbol is defined then ENGINE_get_digest_engine(), the function that
diff --git a/lib/libssl/src/crypto/engine/tb_pkmeth.c b/lib/libssl/src/crypto/engine/tb_pkmeth.c
index 954bd9a8383..38404342628 100644
--- a/lib/libssl/src/crypto/engine/tb_pkmeth.c
+++ b/lib/libssl/src/crypto/engine/tb_pkmeth.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tb_pkmeth.c,v 1.4 2014/06/12 15:49:29 deraadt Exp $ */
+/* $OpenBSD: tb_pkmeth.c,v 1.5 2015/02/11 03:19:37 doug Exp $ */
/* ====================================================================
* Copyright (c) 2006 The OpenSSL Project. All rights reserved.
*
@@ -53,6 +53,8 @@
*
*/
+#include <openssl/err.h>
+
#include "eng_int.h"
#include <openssl/evp.h>
diff --git a/lib/libssl/src/crypto/evp/digest.c b/lib/libssl/src/crypto/evp/digest.c
index c9fb60d49b5..6d8ed9b4995 100644
--- a/lib/libssl/src/crypto/evp/digest.c
+++ b/lib/libssl/src/crypto/evp/digest.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: digest.c,v 1.25 2015/02/10 09:52:35 miod Exp $ */
+/* $OpenBSD: digest.c,v 1.26 2015/02/11 03:19:37 doug Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@@ -114,6 +114,7 @@
#include <openssl/opensslconf.h>
+#include <openssl/err.h>
#include <openssl/evp.h>
#include <openssl/objects.h>
diff --git a/lib/libssl/src/crypto/evp/pmeth_lib.c b/lib/libssl/src/crypto/evp/pmeth_lib.c
index 24cdfdd1d0c..c93fa99cc67 100644
--- a/lib/libssl/src/crypto/evp/pmeth_lib.c
+++ b/lib/libssl/src/crypto/evp/pmeth_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pmeth_lib.c,v 1.10 2014/11/09 19:17:13 miod Exp $ */
+/* $OpenBSD: pmeth_lib.c,v 1.11 2015/02/11 03:19:37 doug Exp $ */
/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
* project 2006.
*/
@@ -62,6 +62,7 @@
#include <openssl/opensslconf.h>
+#include <openssl/err.h>
#include <openssl/evp.h>
#include <openssl/objects.h>
diff --git a/lib/libssl/src/crypto/gost/gostr341001.c b/lib/libssl/src/crypto/gost/gostr341001.c
index 171cf1b80a0..bc553e10833 100644
--- a/lib/libssl/src/crypto/gost/gostr341001.c
+++ b/lib/libssl/src/crypto/gost/gostr341001.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: gostr341001.c,v 1.2 2014/11/13 20:29:55 miod Exp $ */
+/* $OpenBSD: gostr341001.c,v 1.3 2015/02/11 03:19:37 doug Exp $ */
/*
* Copyright (c) 2014 Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
* Copyright (c) 2005-2006 Cryptocom LTD
@@ -54,6 +54,7 @@
#include <openssl/opensslconf.h>
#ifndef OPENSSL_NO_GOST
+#include <openssl/bn.h>
#include <openssl/err.h>
#include <openssl/gost.h>
#include "gost_locl.h"
diff --git a/lib/libssl/src/crypto/gost/gostr341001_ameth.c b/lib/libssl/src/crypto/gost/gostr341001_ameth.c
index b5f49dbea72..fea6ef26dd1 100644
--- a/lib/libssl/src/crypto/gost/gostr341001_ameth.c
+++ b/lib/libssl/src/crypto/gost/gostr341001_ameth.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: gostr341001_ameth.c,v 1.5 2014/11/18 21:18:56 miod Exp $ */
+/* $OpenBSD: gostr341001_ameth.c,v 1.6 2015/02/11 03:19:37 doug Exp $ */
/*
* Copyright (c) 2014 Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
* Copyright (c) 2005-2006 Cryptocom LTD
@@ -54,6 +54,7 @@
#include <openssl/opensslconf.h>
#ifndef OPENSSL_NO_GOST
+#include <openssl/bn.h>
#include <openssl/evp.h>
#include <openssl/ec.h>
#include <openssl/err.h>
diff --git a/lib/libssl/src/crypto/gost/gostr341001_key.c b/lib/libssl/src/crypto/gost/gostr341001_key.c
index 2405722ddd9..f00d361d3f7 100644
--- a/lib/libssl/src/crypto/gost/gostr341001_key.c
+++ b/lib/libssl/src/crypto/gost/gostr341001_key.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: gostr341001_key.c,v 1.3 2014/11/13 20:29:55 miod Exp $ */
+/* $OpenBSD: gostr341001_key.c,v 1.4 2015/02/11 03:19:37 doug Exp $ */
/*
* Copyright (c) 2014 Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
* Copyright (c) 2005-2006 Cryptocom LTD
@@ -52,6 +52,7 @@
#include <openssl/opensslconf.h>
#ifndef OPENSSL_NO_GOST
+#include <openssl/bn.h>
#include <openssl/err.h>
#include <openssl/gost.h>
#include <openssl/objects.h>
diff --git a/lib/libssl/src/crypto/gost/gostr341001_pmeth.c b/lib/libssl/src/crypto/gost/gostr341001_pmeth.c
index c7d4dc10aed..8a71f814b20 100644
--- a/lib/libssl/src/crypto/gost/gostr341001_pmeth.c
+++ b/lib/libssl/src/crypto/gost/gostr341001_pmeth.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: gostr341001_pmeth.c,v 1.7 2015/02/10 09:52:35 miod Exp $ */
+/* $OpenBSD: gostr341001_pmeth.c,v 1.8 2015/02/11 03:19:37 doug Exp $ */
/*
* Copyright (c) 2014 Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
* Copyright (c) 2005-2006 Cryptocom LTD
@@ -54,6 +54,7 @@
#include <openssl/opensslconf.h>
#ifndef OPENSSL_NO_GOST
+#include <openssl/bn.h>
#include <openssl/evp.h>
#include <openssl/err.h>
#include <openssl/gost.h>
diff --git a/lib/libssl/src/crypto/pem/pem_lib.c b/lib/libssl/src/crypto/pem/pem_lib.c
index e3629762f9c..011e9e36de5 100644
--- a/lib/libssl/src/crypto/pem/pem_lib.c
+++ b/lib/libssl/src/crypto/pem/pem_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pem_lib.c,v 1.36 2015/02/10 09:52:35 miod Exp $ */
+/* $OpenBSD: pem_lib.c,v 1.37 2015/02/11 03:19:37 doug Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@@ -64,6 +64,7 @@
#include <openssl/opensslconf.h>
#include <openssl/buffer.h>
+#include <openssl/err.h>
#include <openssl/evp.h>
#include <openssl/objects.h>
#include <openssl/pem.h>
diff --git a/lib/libssl/src/crypto/pem/pem_pkey.c b/lib/libssl/src/crypto/pem/pem_pkey.c
index 2e2129da115..e9c0a8b1c9f 100644
--- a/lib/libssl/src/crypto/pem/pem_pkey.c
+++ b/lib/libssl/src/crypto/pem/pem_pkey.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pem_pkey.c,v 1.19 2014/10/18 17:20:40 jsing Exp $ */
+/* $OpenBSD: pem_pkey.c,v 1.20 2015/02/11 03:19:37 doug Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@@ -62,6 +62,7 @@
#include <openssl/opensslconf.h>
#include <openssl/buffer.h>
+#include <openssl/err.h>
#include <openssl/evp.h>
#include <openssl/objects.h>
#include <openssl/pem.h>
diff --git a/lib/libssl/src/crypto/rsa/rsa_crpt.c b/lib/libssl/src/crypto/rsa/rsa_crpt.c
index cf7f9a328b4..809dd14c928 100644
--- a/lib/libssl/src/crypto/rsa/rsa_crpt.c
+++ b/lib/libssl/src/crypto/rsa/rsa_crpt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rsa_crpt.c,v 1.13 2015/02/09 15:49:22 jsing Exp $ */
+/* $OpenBSD: rsa_crpt.c,v 1.14 2015/02/11 03:19:37 doug Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@@ -62,6 +62,7 @@
#include <openssl/bn.h>
#include <openssl/crypto.h>
+#include <openssl/err.h>
#include <openssl/lhash.h>
#include <openssl/rsa.h>
diff --git a/lib/libssl/src/crypto/rsa/rsa_lib.c b/lib/libssl/src/crypto/rsa/rsa_lib.c
index 967fc36f258..51dc94a1340 100644
--- a/lib/libssl/src/crypto/rsa/rsa_lib.c
+++ b/lib/libssl/src/crypto/rsa/rsa_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rsa_lib.c,v 1.29 2014/10/18 17:20:40 jsing Exp $ */
+/* $OpenBSD: rsa_lib.c,v 1.30 2015/02/11 03:19:37 doug Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@@ -62,6 +62,7 @@
#include <openssl/bn.h>
#include <openssl/crypto.h>
+#include <openssl/err.h>
#include <openssl/lhash.h>
#include <openssl/rsa.h>
diff --git a/lib/libssl/src/crypto/ts/ts_conf.c b/lib/libssl/src/crypto/ts/ts_conf.c
index 5266f91e638..bb98a6ff4c9 100644
--- a/lib/libssl/src/crypto/ts/ts_conf.c
+++ b/lib/libssl/src/crypto/ts/ts_conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ts_conf.c,v 1.8 2014/10/28 05:46:56 miod Exp $ */
+/* $OpenBSD: ts_conf.c,v 1.9 2015/02/11 03:19:37 doug Exp $ */
/* Written by Zoltan Glozik (zglozik@stones.com) for the OpenSSL
* project 2002.
*/
@@ -61,6 +61,7 @@
#include <openssl/opensslconf.h>
#include <openssl/crypto.h>
+#include <openssl/err.h>
#include <openssl/pem.h>
#include <openssl/ts.h>
diff --git a/lib/libssl/src/ssl/ssl_lib.c b/lib/libssl/src/ssl/ssl_lib.c
index 8ebcb74ab9a..34f83089201 100644
--- a/lib/libssl/src/ssl/ssl_lib.c
+++ b/lib/libssl/src/ssl/ssl_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl_lib.c,v 1.97 2015/02/09 07:17:55 doug Exp $ */
+/* $OpenBSD: ssl_lib.c,v 1.98 2015/02/11 03:19:37 doug Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@@ -144,6 +144,7 @@
#include "ssl_locl.h"
+#include <openssl/bn.h>
#include <openssl/dh.h>
#include <openssl/lhash.h>
#include <openssl/objects.h>