Upgrade upstream version to 1.0.2d

[platform/upstream/openssl.git] / ssl / ssl_lib.c

diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index c0931e7..f2f76d4 100644 (file)
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -2993,12 +2993,14 @@ void ssl_clear_cipher_ctx(SSL *s)
 }
 
 X509 *SSL_get_certificate(const SSL *s)
-{
-    if (s->cert != NULL)
-        return (s->cert->key->x509);
-    else
-        return (NULL);
-}
+       {
+       if (s->server)
+               return(ssl_get_server_send_cert(s));
+       else if (s->cert != NULL)
+               return(s->cert->key->x509);
+       else
+               return(NULL);
+       }
 
 EVP_PKEY *SSL_get_privatekey(const SSL *s)
 {