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

diff --git a/openssl.c b/openssl.c
index 5f04c845..32891cbb 100644
--- a/openssl.c
+++ b/openssl.c
@@ -60,6 +60,12 @@ 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();
 }
 
 /*
@@ -408,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);
+}