RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-03-22 19:06:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

BUILD: ssl: silence a warning reported for ERR_remove_state()

Browse Source 
In 1.0.0, this function was replaced with ERR_remove_thread_state().
As of openssl 1.1.0, both are now deprecated and do nothing at all.
Thus we simply make this call do nothing in 1.1.0 to silence the
warning.

The change was tested with 0.9.8, 1.0.0, 1.0.1, 1.0.2 and 1.1.0.

This kills the following warning on 1.1.0 :
   src/ssl_sock.c:7266:9: warning: 'ERR_remove_state' is deprecated (declared at /dev/shm/openssl-1.1.0b/include/openssl/err.h:247) [-Wdeprecated-declarations]

This fix should be backported to 1.7.
This commit is contained in:
Willy Tarreau 2017-01-19 16:50:25 +01:00
parent 2b3205b5fa
commit a4fb8ed1f2
1 changed files with 10 additions and 0 deletions

10
include/proto/openssl-compat.h
View File

@ -161,4 +161,14 @@ static inline int EVP_PKEY_base_id(EVP_PKEY *pkey)
}
#endif
/* ERR_remove_state() was deprecated in 1.0.0 in favor of
* ERR_remove_thread_state(), which was in turn deprecated in
* 1.1.0 and does nothing anymore. Let's simply silently kill
* it.
*/
#if (OPENSSL_VERSION_NUMBER >= 0x1010000fL)
#undef ERR_remove_state
#define ERR_remove_state(x)
#endif
#endif /* _PROTO_OPENSSL_COMPAT_H */