diff options
| author | Kyungwook Tak <k.tak@samsung.com> | 2015-10-12 15:50:14 +0900 |
|---|---|---|
| committer | Kyungwook Tak <k.tak@samsung.com> | 2015-10-12 15:50:32 +0900 |
| commit | 07dca7cf11ce6b6b1b74d829fd3b9fe411d69b3c (patch) | |
| tree | 564c06e51e0c9a31ad90a71845d0cc6cd94b1df7 | |
| parent | 3cfd821e8935946f3d66e97f449322f62f758c9f (diff) | |
| download | openssl-07dca7cf11ce6b6b1b74d829fd3b9fe411d69b3c.tar.gz openssl-07dca7cf11ce6b6b1b74d829fd3b9fe411d69b3c.tar.bz2 openssl-07dca7cf11ce6b6b1b74d829fd3b9fe411d69b3c.zip | |
Fix diff between upstream and tizensubmit/tizen/20151102.020329submit/tizen/20151014.061836accepted/tizen/wearable/20151105.020114accepted/tizen/tv/20151105.020102accepted/tizen/mobile/20151105.020049
Change-Id: I30681b310869557c60a2d8ab3b76d999c9c2fa97
Signed-off-by: Kyungwook Tak <k.tak@samsung.com>
| -rw-r--r-- | ssl/ssl_lib.c | 14 |
1 files changed, 6 insertions, 8 deletions
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) { |