diff options
| author | Steffan Karger <steffan.karger@fox-it.com> | 2013-04-04 21:53:07 +0200 |
|---|---|---|
| committer | Gert Doering <gert@greenie.muc.de> | 2013-04-05 10:47:37 +0200 |
| commit | 0bcde52f6a96a19c28e035e2c562f8a66eaa416f (patch) | |
| tree | 095aff729e07fd78b4c177ab257e4aa3ce0c84dc /src | |
| parent | 792e8956b999b6932d472e4ab592bff160e52888 (diff) | |
| download | openvpn-0bcde52f6a96a19c28e035e2c562f8a66eaa416f.tar.gz openvpn-0bcde52f6a96a19c28e035e2c562f8a66eaa416f.tar.xz openvpn-0bcde52f6a96a19c28e035e2c562f8a66eaa416f.zip | |
Fixed tls-cipher translation bug in openssl-build
Signed-off-by: Steffan Karger <steffan.karger@fox-it.com>
Acked-by: Arne Schwabe <arne@rfc2549.org>
Message-Id: <1CED409804E2164C8104F9E623B08B9013BC28A538@FOXDFT02.FOX.local>
URL: http://article.gmane.org/gmane.network.openvpn.devel/7480
Signed-off-by: Gert Doering <gert@greenie.muc.de>
Diffstat (limited to 'src')
| -rw-r--r-- | src/openvpn/ssl_openssl.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/openvpn/ssl_openssl.c b/src/openvpn/ssl_openssl.c index 1006617..79cc056 100644 --- a/src/openvpn/ssl_openssl.c +++ b/src/openvpn/ssl_openssl.c @@ -217,8 +217,9 @@ tls_ctx_restrict_ciphers(struct tls_root_ctx *ctx, const char *ciphers) 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 @@ tls_ctx_restrict_ciphers(struct tls_root_ctx *ctx, const char *ciphers) openssl_ciphers_len += current_cipher_len; openssl_ciphers[openssl_ciphers_len] = ':'; openssl_ciphers_len++; + + end_of_cipher++; } if (openssl_ciphers_len > 0) |