diff options
author | 2010-10-01 22:58:41 +0000 | |
---|---|---|
committer | 2010-10-01 22:58:41 +0000 | |
commit | 0a5d6eded2bd6dd9bf9d298f0d7139301afe8abe (patch) | |
tree | 9173c770f38c55515569708729da7e02172d3f3d /lib/libssl/src/crypto/rsa/rsa_test.c | |
parent | import OpenSSL-1.0.0a (diff) | |
download | wireguard-openbsd-0a5d6eded2bd6dd9bf9d298f0d7139301afe8abe.tar.xz wireguard-openbsd-0a5d6eded2bd6dd9bf9d298f0d7139301afe8abe.zip |
resolve conflicts, fix local changes
Diffstat (limited to 'lib/libssl/src/crypto/rsa/rsa_test.c')
-rw-r--r-- | lib/libssl/src/crypto/rsa/rsa_test.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/libssl/src/crypto/rsa/rsa_test.c b/lib/libssl/src/crypto/rsa/rsa_test.c index 4080de8bcf9..c8705a0f6e5 100644 --- a/lib/libssl/src/crypto/rsa/rsa_test.c +++ b/lib/libssl/src/crypto/rsa/rsa_test.c @@ -328,7 +328,7 @@ int main(int argc, char *argv[]) } CRYPTO_cleanup_all_ex_data(); - ERR_remove_state(0); + ERR_remove_thread_state(NULL); CRYPTO_mem_leaks_fp(stderr); |