summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@redhat.com>2016-05-24 09:58:12 +0200
committerNikos Mavrogiannopoulos <nmav@redhat.com>2016-05-24 09:58:12 +0200
commit8bdb2aaf5df0ac6927ae828b4cc1c4b5b44f84e8 (patch)
treeda66d4fdf804501a0b6976b7a02144bf6b6b916f
parent2ca4724e269a3c315f9223a788333d766e4fd8e6 (diff)
downloadgnutls-8bdb2aaf5df0ac6927ae828b4cc1c4b5b44f84e8.tar.gz
Amend the "Allow for conditional compilation of SSL 3.0 protocol patch"
That is fix bug introduced by an incorrect #ifdef, and unconditionally provide access to certificate callbacks. This amends 89faab9e9e9123f39e8c0c6f8da1f67de423254a
-rw-r--r--lib/kx.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/kx.c b/lib/kx.c
index dc0bef847e..3da82e38cc 100644
--- a/lib/kx.c
+++ b/lib/kx.c
@@ -415,12 +415,12 @@ int _gnutls_send_client_certificate(gnutls_session_t session, int again)
_gnutls_buffer_init(&data);
if (again == 0) {
- if (
#ifdef ENABLE_SSL3
- get_num_version(session) != GNUTLS_SSL3 ||
+ if (get_num_version(session) != GNUTLS_SSL3 ||
+ session->internals.selected_cert_list_length > 0)
#endif
- session->internals.selected_cert_list_length > 0) {
- /* TLS 1.0 or SSL 3.0 with a valid certificate
+ {
+ /* TLS 1.x or SSL 3.0 with a valid certificate
*/
ret =
session->internals.auth_struct->