diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2013-02-11 18:24:03 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2013-02-11 18:27:41 +0000 |
| commit | f751dc47596050694c19feba162e63f610e29a74 (patch) | |
| tree | 7c736680a8143dc1484b4cc370f77a42f2de3439 /ssl | |
| parent | fbe621d08f2026926c91c1c5f386b27605e39a43 (diff) | |
Fix for SSL_get_certificate
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.
(cherry picked from commit 147dbb2fe3bead7a10e2f280261b661ce7af7adc)
Diffstat (limited to 'ssl')
| -rw-r--r-- | ssl/ssl_lib.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c index 8b6b601cab..4714d89a4c 100644 --- a/ssl/ssl_lib.c +++ b/ssl/ssl_lib.c @@ -2428,9 +2428,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); |