From 0710f9259dd03bc23dcb621e38e203b1d6a9984e Mon Sep 17 00:00:00 2001 From: Steffan Karger Date: Thu, 4 Apr 2013 21:53:07 +0200 Subject: [PATCH] Fixed tls-cipher translation bug in openssl-build Signed-off-by: Steffan Karger Acked-by: Arne Schwabe Message-Id: <1CED409804E2164C8104F9E623B08B9013BC28A538@FOXDFT02.FOX.local> URL: http://article.gmane.org/gmane.network.openvpn.devel/7480 Signed-off-by: Gert Doering (cherry picked from commit 0bcde52f6a96a19c28e035e2c562f8a66eaa416f) --- src/openvpn/ssl_openssl.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git src/openvpn/ssl_openssl.c src/openvpn/ssl_openssl.c --- src/openvpn/ssl_openssl.c +++ src/openvpn/ssl_openssl.c @@ -217,8 +217,9 @@ bool tls_ctx_initialised(struct tls_root_ctx *ctx) ASSERT(NULL != ctx); // Translate IANA cipher suite names to OpenSSL names - for (begin_of_cipher = 0; begin_of_cipher < strlen(ciphers); begin_of_cipher = end_of_cipher+1) { - end_of_cipher = strcspn(&ciphers[begin_of_cipher], ":"); + begin_of_cipher = end_of_cipher = 0; + for (; begin_of_cipher < strlen(ciphers); begin_of_cipher = end_of_cipher) { + end_of_cipher += strcspn(&ciphers[begin_of_cipher], ":"); cipher_pair = tls_get_cipher_name_pair(&ciphers[begin_of_cipher], end_of_cipher - begin_of_cipher); if (NULL == cipher_pair) @@ -257,6 +258,8 @@ bool tls_ctx_initialised(struct tls_root_ctx *ctx) openssl_ciphers_len += current_cipher_len; openssl_ciphers[openssl_ciphers_len] = ':'; openssl_ciphers_len++; + + end_of_cipher++; } if (openssl_ciphers_len > 0)