diff options
| author | Bernhard Schmidt <berni@debian.org> | 2020-10-20 19:17:00 +0200 |
|---|---|---|
| committer | Bernhard Schmidt <berni@debian.org> | 2020-10-20 19:17:00 +0200 |
| commit | 80285c31e83a8e233016e227a393543d508194eb (patch) | |
| tree | a76135587c708bf9e9bf424af2149b119efe6320 /src/openvpn/ssl.c | |
| parent | 5246174f27866c0e9e22844d998f3c97cac54050 (diff) | |
New upstream version 2.5~rc3upstream/2.5_rc3
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 */ |