projects
/
platform
/
upstream
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3cfd821
)
Fix diff between upstream and tizen
05/49505/1
accepted/tizen/mobile/20151105.020049
accepted/tizen/tv/20151105.020102
accepted/tizen/wearable/20151105.020114
submit/tizen/20151014.061836
submit/tizen/20151102.020329
author
Kyungwook Tak
<k.tak@samsung.com>
Mon, 12 Oct 2015 06:50:14 +0000
(15:50 +0900)
committer
Kyungwook Tak
<k.tak@samsung.com>
Mon, 12 Oct 2015 06:50:32 +0000
(15:50 +0900)
Change-Id: I30681b310869557c60a2d8ab3b76d999c9c2fa97
Signed-off-by: Kyungwook Tak <k.tak@samsung.com>
ssl/ssl_lib.c
patch
|
blob
|
history
diff --git
a/ssl/ssl_lib.c
b/ssl/ssl_lib.c
index
f2f76d4
..
c0931e7
100644
(file)
--- 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)
{