[pkg-opensc-commit] [libp11] 77/86: Use ERR_remove_state() for OpenSSL version < 1.0.0

Eric Dorland eric at moszumanska.debian.org
Sun Jul 24 21:40:25 UTC 2016


This is an automated email from the git hooks/post-receive script.

eric pushed a commit to branch master
in repository libp11.

commit 37773aeaf28dce0c9570c33c22f1ab21b50fc020
Author: Michał Trojnara <Michal.Trojnara at stunnel.org>
Date:   Mon Mar 21 16:43:26 2016 +0100

    Use ERR_remove_state() for OpenSSL version < 1.0.0
---
 examples/decrypt.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/examples/decrypt.c b/examples/decrypt.c
index 6ab2bcf..7090206 100644
--- a/examples/decrypt.c
+++ b/examples/decrypt.c
@@ -232,9 +232,14 @@ loggedin:
 	CRYPTO_cleanup_all_ex_data();
 	ERR_free_strings();
 #if OPENSSL_VERSION_NUMBER >= 0x10100004L
+	/* OpenSSL version >= 1.1.0-pre4 */
 	ERR_remove_thread_state();
-#else
+#elif OPENSSL_VERSION_NUMBER >= 0x10000000L
+	/* OpenSSL version >= 1.0.0 */
 	ERR_remove_thread_state(NULL);
+#else
+	/* OpenSSL version < 1.0.0 */
+	ERR_remove_state(0);
 #endif
 
 	printf("decryption successfull.\n");

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-opensc/libp11.git



More information about the pkg-opensc-commit mailing list