summaryrefslogtreecommitdiffstats
path: root/ssl
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2013-02-11 18:24:03 +0000
committerDr. Stephen Henson <steve@openssl.org>2013-02-11 18:24:03 +0000
commit147dbb2fe3bead7a10e2f280261b661ce7af7adc (patch)
tree9d37f2468e568f88417fb74283d1ae9c58aca446 /ssl
parentcbf9b4aed3e209fe8a39e1d6f55aaf46d1369dc4 (diff)
Fix for SSL_get_certificate
Now we set the current certificate to the one used by a server there is no need to call ssl_get_server_send_cert which will fail if we haven't sent a certificate yet.
Diffstat (limited to 'ssl')
-rw-r--r--ssl/ssl_lib.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index 14d143da04..ff5a85aaf1 100644
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -2792,9 +2792,7 @@ void ssl_clear_cipher_ctx(SSL *s)
/* Fix this function so that it takes an optional type parameter */
X509 *SSL_get_certificate(const SSL *s)
{
- if (s->server)
- return(ssl_get_server_send_cert(s));
- else if (s->cert != NULL)
+ if (s->cert != NULL)
return(s->cert->key->x509);
else
return(NULL);