X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=openssl.c;h=32891cbb012b66c0eaf5b8ca56f2c4288cd3bb1b;hb=d440a71683940a58747de6dc32643db452d9cf54;hp=9782b5e23cd0530d521f098d2683dc83230b0c78;hpb=09dbc597fa9661f8dfd96684430531fe6575d26c;p=paraslash.git

diff --git a/openssl.c b/openssl.c
index 9782b5e2..32891cbb 100644
--- a/openssl.c
+++ b/openssl.c
@@ -57,7 +57,15 @@ void crypt_init(void)
 
 void crypt_shutdown(void)
 {
+#ifdef HAVE_CRYPTO_CLEANUP_ALL_EX_DATA
 	CRYPTO_cleanup_all_ex_data();
+#endif
+#ifdef HAVE_OPENSSL_THREAD_STOP /* openssl-1.1 or later */
+	OPENSSL_thread_stop();
+#else /* openssl-1.0 */
+	ERR_remove_thread_state(NULL);
+#endif
+	EVP_cleanup();
 }
 
 /*
@@ -406,3 +414,11 @@ void hash_function(const char *data, unsigned long len, unsigned char *hash)
 	SHA1_Update(&c, data, len);
 	SHA1_Final(hash, &c);
 }
+
+void hash2_function(const char *data, unsigned long len, unsigned char *hash)
+{
+	SHA256_CTX c;
+	SHA256_Init(&c);
+	SHA256_Update(&c, data, len);
+	SHA256_Final(hash, &c);
+}