Hi, On 25-05-14 21:56, Gert Doering wrote: > your patch has been applied to the OpenVPN master branch. Sorry it took > us so long...
Just noticed this patch needed a little more then resolving the merge conflict. The patch submission in 2011 was before the cipher abstraction layer was added. The attached patch contains the required extra change. I noticed this while working on something else, compiling using --enable-strict. The compiler is very good in catching these kind of mistakes, but there are currently too many warnings to spot the useful ones. This is a good example why I think it would be worthwhile to get rid of more warnings. -Steffan
>From 63cd7bba2884cc713118783adfe3f1b20623457d Mon Sep 17 00:00:00 2001 From: Steffan Karger <stef...@karger.me> List-Post: openvpn-devel@lists.sourceforge.net Date: Wed, 28 May 2014 21:40:34 +0200 Subject: [PATCH] Fix merge error in a6c573d, the ssl ctx is now abstracted. Between the origin patch submission (2011) and now the cipher abstraction layer has been added. This patch slipped through without proper adjustment. Signed-off-by: Steffan Karger <stef...@karger.me> --- src/openvpn/ssl_openssl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/openvpn/ssl_openssl.c b/src/openvpn/ssl_openssl.c index 4862bad..c9d2d26 100644 --- a/src/openvpn/ssl_openssl.c +++ b/src/openvpn/ssl_openssl.c @@ -199,7 +199,7 @@ tls_ctx_set_options (struct tls_root_ctx *ctx, unsigned int ssl_flags) } #ifdef SSL_MODE_RELEASE_BUFFERS - SSL_CTX_set_mode (ctx, SSL_MODE_RELEASE_BUFFERS); + SSL_CTX_set_mode (ctx->ctx, SSL_MODE_RELEASE_BUFFERS); #endif SSL_CTX_set_session_cache_mode (ctx->ctx, SSL_SESS_CACHE_OFF); SSL_CTX_set_default_passwd_cb (ctx->ctx, pem_password_callback); -- 1.9.1
