From: Kyungwook Tak Date: Mon, 12 Oct 2015 06:50:14 +0000 (+0900) Subject: Fix diff between upstream and tizen X-Git-Tag: accepted/tizen/mobile/20151105.020049^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=07dca7cf11ce6b6b1b74d829fd3b9fe411d69b3c;p=platform%2Fupstream%2Fopenssl.git Fix diff between upstream and tizen Change-Id: I30681b310869557c60a2d8ab3b76d999c9c2fa97 Signed-off-by: Kyungwook Tak --- diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c index f2f76d4..c0931e7 100644 --- a/ssl/ssl_lib.c +++ b/ssl/ssl_lib.c @@ -2993,14 +2993,12 @@ void ssl_clear_cipher_ctx(SSL *s) } X509 *SSL_get_certificate(const SSL *s) - { - if (s->server) - return(ssl_get_server_send_cert(s)); - else if (s->cert != NULL) - return(s->cert->key->x509); - else - return(NULL); - } +{ + if (s->cert != NULL) + return (s->cert->key->x509); + else + return (NULL); +} EVP_PKEY *SSL_get_privatekey(const SSL *s) {