diff options
| author | Bernhard Schmidt <berni@debian.org> | 2020-10-28 19:46:08 +0100 |
|---|---|---|
| committer | Bernhard Schmidt <berni@debian.org> | 2020-10-28 19:46:08 +0100 |
| commit | 8231554c9f1ba25cb4e698ad5cfb3a56b258610a (patch) | |
| tree | 029108888123856ca13e34c612d4dd4845c2b6c3 /src/openvpn/ssl.c | |
| parent | 5bac5f7608a14e0989e95db1a1da2e65d9322127 (diff) | |
| parent | 76fee93e6fe89e5575bae2840b585d2f025b9050 (diff) | |
Merge tag 'debian/2.5.0-1' into buster-backports
openvpn Debian release 2.5.0-1
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 */ |