OpenWrt – Blame information for rev 1
?pathlinks?
Rev | Author | Line No. | Line |
---|---|---|---|
1 | office | 1 | From f519e0f30a00393b949c4e20868952726a9c6d2e Mon Sep 17 00:00:00 2001 |
2 | From: Pierce Lopez <pierce.lopez@gmail.com> |
||
3 | Date: Thu, 2 Mar 2017 21:09:32 -0500 |
||
4 | Subject: [PATCH] Do not check for ERR_remove_thread_state() (do not link ssl |
||
5 | into every library) |
||
6 | |||
7 | This reverts commit c4e9d9bd662de7f575f2172c160795d452ebe709 |
||
8 | ("sample/https-client: check for ERR_remove_thread_state() existence"). |
||
9 | |||
10 | Calling AC_SEARCH_LIBS() modifies LIBS - -lcrypto incorrectly |
||
11 | ends up in LIBS, and thus linked to by libevent_core.so. |
||
12 | |||
13 | Checking for ERR_remove_thread_state should no longer be needed |
||
14 | because it was introduced in openssl 1.0.0, and the previous line |
||
15 | 0.9.8 had support discontinued at the end of 2015. |
||
16 | |||
17 | Fixes: #473 |
||
18 | --- |
||
19 | configure.ac | 4 ---- |
||
20 | sample/https-client.c | 4 ---- |
||
21 | 2 files changed, 8 deletions(-) |
||
22 | |||
23 | --- a/configure.ac |
||
24 | +++ b/configure.ac |
||
25 | @@ -791,10 +791,6 @@ fi |
||
26 | |||
27 | # check if we have and should use openssl |
||
28 | AM_CONDITIONAL(OPENSSL, [test "$enable_openssl" != "no" && test "$have_openssl" = "yes"]) |
||
29 | -if test "x$enable_openssl" = "xyes"; then |
||
30 | - AC_SEARCH_LIBS([ERR_remove_thread_state], [crypto eay32], |
||
31 | - [AC_DEFINE(HAVE_ERR_REMOVE_THREAD_STATE, 1, [Define to 1 if you have ERR_remove_thread_stat().])]) |
||
32 | -fi |
||
33 | |||
34 | # Add some more warnings which we use in development but not in the |
||
35 | # released versions. (Some relevant gcc versions can't handle these.) |
||
36 | --- a/sample/https-client.c |
||
37 | +++ b/sample/https-client.c |
||
38 | @@ -484,11 +484,7 @@ cleanup: |
||
39 | EVP_cleanup(); |
||
40 | ERR_free_strings(); |
||
41 | |||
42 | -#ifdef EVENT__HAVE_ERR_REMOVE_THREAD_STATE |
||
43 | ERR_remove_thread_state(NULL); |
||
44 | -#else |
||
45 | - ERR_remove_state(0); |
||
46 | -#endif |
||
47 | CRYPTO_cleanup_all_ex_data(); |
||
48 | |||
49 | sk_SSL_COMP_free(SSL_COMP_get_compression_methods()); |