]> git.ipfire.org Git - thirdparty/gnutls.git/commitdiff
Amend the "Allow for conditional compilation of SSL 3.0 protocol patch"
authorNikos Mavrogiannopoulos <nmav@redhat.com>
Tue, 24 May 2016 07:58:12 +0000 (09:58 +0200)
committerNikos Mavrogiannopoulos <nmav@redhat.com>
Tue, 24 May 2016 07:58:12 +0000 (09:58 +0200)
That is fix bug introduced by an incorrect #ifdef, and unconditionally
provide access to certificate callbacks.

This amends 89faab9e9e9123f39e8c0c6f8da1f67de423254a

lib/kx.c

index dc0bef847e890b796c9d1099639eee1f7aae5af3..3da82e38cc11bb3356591bc486a4276e56f845dc 100644 (file)
--- 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->