diff options
| author | djm <> | 2010-10-01 22:59:01 +0000 |
|---|---|---|
| committer | djm <> | 2010-10-01 22:59:01 +0000 |
| commit | 8922d4bc4a8b8893d72a48deb2cdf58215f98505 (patch) | |
| tree | 939b752540947d33507b3acc48d76a8bfb7c3dc3 /src/lib/libcrypto/engine/enginetest.c | |
| parent | 76262f7bf9262f965142b1b2b2105cb279c5c696 (diff) | |
| download | openbsd-8922d4bc4a8b8893d72a48deb2cdf58215f98505.tar.gz openbsd-8922d4bc4a8b8893d72a48deb2cdf58215f98505.tar.bz2 openbsd-8922d4bc4a8b8893d72a48deb2cdf58215f98505.zip | |
resolve conflicts, fix local changes
Diffstat (limited to 'src/lib/libcrypto/engine/enginetest.c')
| -rw-r--r-- | src/lib/libcrypto/engine/enginetest.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/libcrypto/engine/enginetest.c b/src/lib/libcrypto/engine/enginetest.c index e3834611db..f4d70e7e0a 100644 --- a/src/lib/libcrypto/engine/enginetest.c +++ b/src/lib/libcrypto/engine/enginetest.c | |||
| @@ -276,7 +276,7 @@ end: | |||
| 276 | ENGINE_cleanup(); | 276 | ENGINE_cleanup(); |
| 277 | CRYPTO_cleanup_all_ex_data(); | 277 | CRYPTO_cleanup_all_ex_data(); |
| 278 | ERR_free_strings(); | 278 | ERR_free_strings(); |
| 279 | ERR_remove_state(0); | 279 | ERR_remove_thread_state(NULL); |
| 280 | CRYPTO_mem_leaks_fp(stderr); | 280 | CRYPTO_mem_leaks_fp(stderr); |
| 281 | return to_return; | 281 | return to_return; |
| 282 | } | 282 | } |