mirror/openvpn
0
0
Fork 0
mirror of https://github.com/OpenVPN/openvpn.git synced 2024-09-20 20:03:13 +02:00
Code

ssl_openssl: fix compiler warning by removing getbio() wrapper

Browse Source 
An API change in openssl 1.1 made the BIO_METHOD * returned by BIO_f_ssl()
and BIO_s_mem() const, as well as the BIO_METHOD * argment of BIO_new()
const.  This meant that our getbio() function would either have an API
inconsistent with 1.0 or 1.1.

The wrapper was basically an ASSERT, so fix this by replacing the wrapper
with an ASSERT.

Signed-off-by: Steffan Karger <steffan@karger.me>
Acked-by: Arne Schwabe <arne@rfc2549.org>
Message-Id: <1513246897-28171-1-git-send-email-steffan@karger.me>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg16083.html
Signed-off-by: Gert Doering <gert@greenie.muc.de>
This commit is contained in:
Steffan Karger 2017-12-14 11:21:37 +01:00 committed by Gert Doering
parent b395f36e57
commit 006d6a57b8
1 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/openvpn/ssl_openssl.c
View File

@ -1415,23 +1415,6 @@ bio_debug_oc(const char *mode, BIO *bio)
#endif /* ifdef BIO_DEBUG */
/*
* OpenVPN's interface to SSL/TLS authentication,
* encryption, and decryption is exclusively
* through "memory BIOs".
*/
static BIO *
getbio(BIO_METHOD *type, const char *desc)
{
BIO *ret;
ret = BIO_new(type);
if (!ret)
{
crypto_msg(M_FATAL, "Error creating %s BIO", desc);
}
return ret;
}
/*
* Write to an OpenSSL BIO in non-blocking mode.
*/
@ -1573,9 +1556,9 @@ key_state_ssl_init(struct key_state_ssl *ks_ssl, const struct tls_root_ctx *ssl_
* from verify callback*/
SSL_set_ex_data(ks_ssl->ssl, mydata_index, session);
ks_ssl->ssl_bio = getbio(BIO_f_ssl(), "ssl_bio");
ks_ssl->ct_in = getbio(BIO_s_mem(), "ct_in");
ks_ssl->ct_out = getbio(BIO_s_mem(), "ct_out");
ASSERT((ks_ssl->ssl_bio = BIO_new(BIO_f_ssl())));
ASSERT((ks_ssl->ct_in = BIO_new(BIO_s_mem())));
ASSERT((ks_ssl->ct_out = BIO_new(BIO_s_mem())));
#ifdef BIO_DEBUG
bio_debug_oc("open ssl_bio", ks_ssl->ssl_bio);