From f32b0abe26285c6ba2ff258512c08e8f2fbcbdc9 Mon Sep 17 00:00:00 2001
From: Pauli <paul.dale@oracle.com>
Date: Fri, 29 Sep 2017 07:27:04 +1000
Subject: [PATCH] Remove unnecessary #include <openssl/lhash.h> directives.

Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4431)
---
 apps/apps.h              | 1 -
 apps/errstr.c            | 1 -
 apps/s_server.c          | 1 -
 apps/spkac.c             | 1 -
 crypto/err/err.c         | 3 +--
 crypto/err/err_prn.c     | 3 +--
 crypto/ex_data.c         | 3 +--
 crypto/objects/obj_lib.c | 3 +--
 crypto/rsa/rsa_crpt.c    | 1 -
 crypto/rsa/rsa_lib.c     | 1 -
 crypto/x509/by_dir.c     | 2 --
 crypto/x509/by_file.c    | 1 -
 crypto/x509/x509_lu.c    | 1 -
 crypto/x509/x509_obj.c   | 3 +--
 crypto/x509/x509_txt.c   | 3 +--
 crypto/x509/x509_vfy.c   | 1 -
 crypto/x509/x509_vpm.c   | 3 +--
 include/openssl/ssl.h    | 2 +-
 ssl/ssl_cert.c           | 1 -
 ssl/ssl_lib.c            | 1 -
 ssl/ssl_sess.c           | 1 -
 21 files changed, 8 insertions(+), 29 deletions(-)

diff --git a/apps/apps.h b/apps/apps.h
index 70c9278c6f..a279d42b56 100644
--- a/apps/apps.h
+++ b/apps/apps.h
@@ -18,7 +18,6 @@
 # include <openssl/ossl_typ.h>
 # include <openssl/bio.h>
 # include <openssl/x509.h>
-# include <openssl/lhash.h>
 # include <openssl/conf.h>
 # include <openssl/txt_db.h>
 # include <openssl/engine.h>
diff --git a/apps/errstr.c b/apps/errstr.c
index 8b993fa20e..a02fa689dc 100644
--- a/apps/errstr.c
+++ b/apps/errstr.c
@@ -12,7 +12,6 @@
 #include <string.h>
 #include "apps.h"
 #include <openssl/bio.h>
-#include <openssl/lhash.h>
 #include <openssl/err.h>
 #include <openssl/ssl.h>
 
diff --git a/apps/s_server.c b/apps/s_server.c
index bc3922b030..b22f08311b 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -35,7 +35,6 @@
 typedef unsigned int u_int;
 #endif
 
-#include <openssl/lhash.h>
 #include <openssl/bn.h>
 #include "apps.h"
 #include <openssl/err.h>
diff --git a/apps/spkac.c b/apps/spkac.c
index 0560cc8233..d1414d6713 100644
--- a/apps/spkac.c
+++ b/apps/spkac.c
@@ -16,7 +16,6 @@
 #include <openssl/conf.h>
 #include <openssl/err.h>
 #include <openssl/evp.h>
-#include <openssl/lhash.h>
 #include <openssl/x509.h>
 #include <openssl/pem.h>
 
diff --git a/crypto/err/err.c b/crypto/err/err.c
index 5e3474ffff..58a58c22b6 100644
--- a/crypto/err/err.c
+++ b/crypto/err/err.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -13,7 +13,6 @@
 #include "internal/cryptlib_int.h"
 #include "internal/err.h"
 #include "internal/err_int.h"
-#include <openssl/lhash.h>
 #include <openssl/err.h>
 #include <openssl/crypto.h>
 #include <openssl/buffer.h>
diff --git a/crypto/err/err_prn.c b/crypto/err/err_prn.c
index c7dc1d151a..a528d08d4e 100644
--- a/crypto/err/err_prn.c
+++ b/crypto/err/err_prn.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -9,7 +9,6 @@
 
 #include <stdio.h>
 #include "internal/cryptlib.h"
-#include <openssl/lhash.h>
 #include <openssl/crypto.h>
 #include <openssl/buffer.h>
 #include <openssl/err.h>
diff --git a/crypto/ex_data.c b/crypto/ex_data.c
index 30b16f9457..78162b5c09 100644
--- a/crypto/ex_data.c
+++ b/crypto/ex_data.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -9,7 +9,6 @@
 
 #include "internal/cryptlib_int.h"
 #include "internal/thread_once.h"
-#include <openssl/lhash.h>
 
 /*
  * Each structure type (sometimes called a class), that supports
diff --git a/crypto/objects/obj_lib.c b/crypto/objects/obj_lib.c
index 33075e6451..ec791992d6 100644
--- a/crypto/objects/obj_lib.c
+++ b/crypto/objects/obj_lib.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -9,7 +9,6 @@
 
 #include <stdio.h>
 #include "internal/cryptlib.h"
-#include <openssl/lhash.h>
 #include <openssl/objects.h>
 #include <openssl/buffer.h>
 #include "internal/asn1_int.h"
diff --git a/crypto/rsa/rsa_crpt.c b/crypto/rsa/rsa_crpt.c
index cc62153039..f4ef8b4381 100644
--- a/crypto/rsa/rsa_crpt.c
+++ b/crypto/rsa/rsa_crpt.c
@@ -10,7 +10,6 @@
 #include <stdio.h>
 #include <openssl/crypto.h>
 #include "internal/cryptlib.h"
-#include <openssl/lhash.h>
 #include "internal/bn_int.h"
 #include <openssl/rand.h>
 #include "rsa_locl.h"
diff --git a/crypto/rsa/rsa_lib.c b/crypto/rsa/rsa_lib.c
index 45ec813376..e43d8238b5 100644
--- a/crypto/rsa/rsa_lib.c
+++ b/crypto/rsa/rsa_lib.c
@@ -11,7 +11,6 @@
 #include <openssl/crypto.h>
 #include "internal/cryptlib.h"
 #include "internal/refcount.h"
-#include <openssl/lhash.h>
 #include "internal/bn_int.h"
 #include <openssl/engine.h>
 #include <openssl/evp.h>
diff --git a/crypto/x509/by_dir.c b/crypto/x509/by_dir.c
index b83a473017..03c3cde96b 100644
--- a/crypto/x509/by_dir.c
+++ b/crypto/x509/by_dir.c
@@ -18,8 +18,6 @@
 # include <sys/stat.h>
 #endif
 
-
-#include <openssl/lhash.h>
 #include <openssl/x509.h>
 #include "internal/x509_int.h"
 #include "x509_lcl.h"
diff --git a/crypto/x509/by_file.c b/crypto/x509/by_file.c
index 457118ed63..1dbe351adc 100644
--- a/crypto/x509/by_file.c
+++ b/crypto/x509/by_file.c
@@ -12,7 +12,6 @@
 #include <errno.h>
 
 #include "internal/cryptlib.h"
-#include <openssl/lhash.h>
 #include <openssl/buffer.h>
 #include <openssl/x509.h>
 #include <openssl/pem.h>
diff --git a/crypto/x509/x509_lu.c b/crypto/x509/x509_lu.c
index f45b06112d..b8845f1e64 100644
--- a/crypto/x509/x509_lu.c
+++ b/crypto/x509/x509_lu.c
@@ -10,7 +10,6 @@
 #include <stdio.h>
 #include "internal/cryptlib.h"
 #include "internal/refcount.h"
-#include <openssl/lhash.h>
 #include <openssl/x509.h>
 #include "internal/x509_int.h"
 #include <openssl/x509v3.h>
diff --git a/crypto/x509/x509_obj.c b/crypto/x509/x509_obj.c
index 55dc778bba..b6d60be6fd 100644
--- a/crypto/x509/x509_obj.c
+++ b/crypto/x509/x509_obj.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -9,7 +9,6 @@
 
 #include <stdio.h>
 #include "internal/cryptlib.h"
-#include <openssl/lhash.h>
 #include <openssl/objects.h>
 #include <openssl/x509.h>
 #include <openssl/buffer.h>
diff --git a/crypto/x509/x509_txt.c b/crypto/x509/x509_txt.c
index a460bf5474..157db38f8c 100644
--- a/crypto/x509/x509_txt.c
+++ b/crypto/x509/x509_txt.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -12,7 +12,6 @@
 #include <errno.h>
 
 #include "internal/cryptlib.h"
-#include <openssl/lhash.h>
 #include <openssl/buffer.h>
 #include <openssl/evp.h>
 #include <openssl/asn1.h>
diff --git a/crypto/x509/x509_vfy.c b/crypto/x509/x509_vfy.c
index d4a5f3a6ba..9ebda1bb1f 100644
--- a/crypto/x509/x509_vfy.c
+++ b/crypto/x509/x509_vfy.c
@@ -15,7 +15,6 @@
 #include "internal/ctype.h"
 #include "internal/cryptlib.h"
 #include <openssl/crypto.h>
-#include <openssl/lhash.h>
 #include <openssl/buffer.h>
 #include <openssl/evp.h>
 #include <openssl/asn1.h>
diff --git a/crypto/x509/x509_vpm.c b/crypto/x509/x509_vpm.c
index 95f1c5b4c8..033ec423bc 100644
--- a/crypto/x509/x509_vpm.c
+++ b/crypto/x509/x509_vpm.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2004-2017 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -11,7 +11,6 @@
 
 #include "internal/cryptlib.h"
 #include <openssl/crypto.h>
-#include <openssl/lhash.h>
 #include <openssl/buffer.h>
 #include <openssl/x509.h>
 #include <openssl/x509v3.h>
diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h
index a79c6d377e..7bc409c494 100644
--- a/include/openssl/ssl.h
+++ b/include/openssl/ssl.h
@@ -19,9 +19,9 @@
 # if OPENSSL_API_COMPAT < 0x10100000L
 #  include <openssl/x509.h>
 #  include <openssl/crypto.h>
-#  include <openssl/lhash.h>
 #  include <openssl/buffer.h>
 # endif
+# include <openssl/lhash.h>
 # include <openssl/pem.h>
 # include <openssl/hmac.h>
 # include <openssl/async.h>
diff --git a/ssl/ssl_cert.c b/ssl/ssl_cert.c
index a517cf11e6..008b58f4bd 100644
--- a/ssl/ssl_cert.c
+++ b/ssl/ssl_cert.c
@@ -13,7 +13,6 @@
 
 #include "internal/nelem.h"
 #include "internal/o_dir.h"
-#include <openssl/lhash.h>
 #include <openssl/bio.h>
 #include <openssl/pem.h>
 #include <openssl/x509v3.h>
diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index 85425a1887..063c312080 100644
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -12,7 +12,6 @@
 #include <stdio.h>
 #include "ssl_locl.h"
 #include <openssl/objects.h>
-#include <openssl/lhash.h>
 #include <openssl/x509v3.h>
 #include <openssl/rand.h>
 #include <openssl/ocsp.h>
diff --git a/ssl/ssl_sess.c b/ssl/ssl_sess.c
index 1482a3e7c7..dcdf4f6e02 100644
--- a/ssl/ssl_sess.c
+++ b/ssl/ssl_sess.c
@@ -9,7 +9,6 @@
  */
 
 #include <stdio.h>
-#include <openssl/lhash.h>
 #include <openssl/rand.h>
 #include <openssl/engine.h>
 #include "internal/refcount.h"
-- 
2.39.2