]> granicus.if.org Git - openssl/commitdiff
Fix for SSL_get_certificate
authorDr. Stephen Henson <steve@openssl.org>
Mon, 11 Feb 2013 18:24:03 +0000 (18:24 +0000)
committerDr. Stephen Henson <steve@openssl.org>
Mon, 11 Feb 2013 18:24:03 +0000 (18:24 +0000)
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.

ssl/ssl_lib.c

index 14d143da0441eee78b3f9b50896a65022edb4cf4..ff5a85aaf152d8bde30f87e3dc04374a0d6c6082 100644 (file)
@@ -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);