summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@gnutls.org>2012-02-06 20:24:34 +0100
committerNikos Mavrogiannopoulos <nmav@gnutls.org>2012-02-06 20:24:40 +0100
commit621ad0d2e7955d2a78cf6c13e309065a57ed7406 (patch)
tree68ad879603a0b1396463b95ee5ffa9fa7e0aa4a1
parent1b88a2c731f58e5bcf7cd116972458d63153e8e8 (diff)
downloadgnutls-621ad0d2e7955d2a78cf6c13e309065a57ed7406.tar.gz
Corrected check for the callback for gnutls_certificate_set_retrieve_function(). Reported by Dan Winship.
-rw-r--r--lib/auth/cert.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/auth/cert.c b/lib/auth/cert.c
index db4b9af251..b2bfca896d 100644
--- a/lib/auth/cert.c
+++ b/lib/auth/cert.c
@@ -2135,7 +2135,7 @@ _gnutls_server_select_cert (gnutls_session_t session,
/* If the callback which retrieves certificate has been set,
* use it and leave.
*/
- if (cred->server_get_cert_callback != NULL || cred->server_get_cert_callback
+ if (cred->server_get_cert_callback || cred->get_cert_callback
|| cred->get_cert_callback2)
{
ret = call_get_cert_callback (session, NULL, 0, NULL, 0);