Fix hang in EGD/PRNGD query when communication socket is closed

[oweals/openssl.git] / crypto / ex_data.c

diff --git a/crypto/ex_data.c b/crypto/ex_data.c
index 8914218fe8f9c00430d9ab66af4be84e11c376d0..5b2e345c27b7b7e4f7f3997a9c89d806526cad7e 100644 (file)
--- a/crypto/ex_data.c
+++ b/crypto/ex_data.c
@@ -138,8 +138,12 @@
  *
  */
 
-#include "cryptlib.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <openssl/buffer.h>
+#include <openssl/bio.h>
 #include <openssl/lhash.h>
+#include "cryptlib.h"
 
 /* What an "implementation of ex_data functionality" looks like */
 struct st_CRYPTO_EX_DATA_IMPL
@@ -283,7 +287,7 @@ static void def_cleanup_util_cb(CRYPTO_EX_DATA_FUNCS *funcs)
 /* This callback is used in lh_doall to destroy all EX_CLASS_ITEM values from
  * "ex_data" prior to the ex_data hash table being itself destroyed. Doesn't do
  * any locking. */
-static void def_cleanup_cb(void *a_void)
+static void def_cleanup_cb(const void *a_void)
        {
        EX_CLASS_ITEM *item = (EX_CLASS_ITEM *)a_void;
        sk_CRYPTO_EX_DATA_FUNCS_pop_free(item->meth, def_cleanup_util_cb);