summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoe <joe@61a7d7f5-40b7-0310-9c16-bb0ea8cb1845>2010-11-11 12:26:45 +0000
committerjoe <joe@61a7d7f5-40b7-0310-9c16-bb0ea8cb1845>2010-11-11 12:26:45 +0000
commit24d80deab345b00a431de0bcef1bd8fb715d9fa0 (patch)
tree75ca2131168c988f3bfca79d096288dc829e99c5
parent13c1d3e2a4f870b142d09262b55d940e3345acfb (diff)
downloadneon-24d80deab345b00a431de0bcef1bd8fb715d9fa0.tar.gz
Merge r1828 from trunk:
* src/ne_gnutls.c (provide_client_cert): Return success with no cert if no cert is available; match behaviour with OpenSSL. Thanks to Patrick Ohly. git-svn-id: http://svn.webdav.org/repos/projects/neon/branches/0.29.x@1829 61a7d7f5-40b7-0310-9c16-bb0ea8cb1845
-rw-r--r--src/ne_gnutls.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/ne_gnutls.c b/src/ne_gnutls.c
index 24d59ca..ef12e2d 100644
--- a/src/ne_gnutls.c
+++ b/src/ne_gnutls.c
@@ -1,6 +1,6 @@
/*
neon SSL/TLS support using GNU TLS
- Copyright (C) 2002-2009, Joe Orton <joe@manyfish.co.uk>
+ Copyright (C) 2002-2010, Joe Orton <joe@manyfish.co.uk>
Copyright (C) 2004, Aleix Conchillo Flaque <aleix@member.fsf.org>
This library is free software; you can redistribute it and/or
@@ -620,10 +620,12 @@ static int provide_client_cert(gnutls_session session,
} else {
return GNUTLS_E_UNSUPPORTED_CERTIFICATE_TYPE;
}
- } else {
+ }
+ else {
NE_DEBUG(NE_DBG_SSL, "No client certificate supplied.\n");
+ st->ncerts = 0;
sess->ssl_cc_requested = 1;
- return GNUTLS_E_NO_CERTIFICATE_FOUND;
+ return 0;
}
return 0;