diff options
| author | Bernhard Schmidt <berni@debian.org> | 2020-10-20 19:17:07 +0200 |
|---|---|---|
| committer | Bernhard Schmidt <berni@debian.org> | 2020-10-20 19:17:07 +0200 |
| commit | 63934be0e9a494086d103bc3ba43c444b5460b5b (patch) | |
| tree | e2b5876072df6d56023d21a66379544e2bef9d5f /src/openvpn/ssl.c | |
| parent | 4ca7910f8fbd80a28780cff34d27b481ae882f67 (diff) | |
| parent | 80285c31e83a8e233016e227a393543d508194eb (diff) | |
Update upstream source from tag 'upstream/2.5_rc3'
Update to upstream version '2.5~rc3'
with Debian dir 654a857be97a3895ea7ff814fea7c3f9f80e8794
Diffstat (limited to 'src/openvpn/ssl.c')
| -rw-r--r-- | src/openvpn/ssl.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/openvpn/ssl.c b/src/openvpn/ssl.c index f16114c..c6ba812 100644 --- a/src/openvpn/ssl.c +++ b/src/openvpn/ssl.c @@ -2484,6 +2484,14 @@ key_method_2_read(struct buffer *buf, struct tls_multi *multi, struct tls_sessio multi->remote_ciphername = options_string_extract_option(options, "cipher", NULL); + /* In OCC we send '[null-cipher]' instead 'none' */ + if (multi->remote_ciphername + && strcmp(multi->remote_ciphername, "[null-cipher]") == 0) + { + free(multi->remote_ciphername); + multi->remote_ciphername = string_alloc("none", NULL); + } + if (tls_session_user_pass_enabled(session)) { /* Perform username/password authentication */ |