diff options
| author | Ben Laurie <ben@openssl.org> | 2012-10-05 12:50:24 +0000 |
|---|---|---|
| committer | Ben Laurie <ben@openssl.org> | 2012-10-05 12:50:24 +0000 |
| commit | 48bcdad0d564c3514a7473fa9e9e360780ee807a (patch) | |
| tree | 27220a4b82188c7d467636c3519c5d44383ed52c /ssl/ssl_lib.c | |
| parent | f7d2402cabbb453c878a4ddf18828b1b220ac909 (diff) | |
Backport OCSP fix.
Diffstat (limited to 'ssl/ssl_lib.c')
| -rw-r--r-- | ssl/ssl_lib.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c index 23de3151bf..25e95fd9d2 100644 --- a/ssl/ssl_lib.c +++ b/ssl/ssl_lib.c @@ -1943,7 +1943,7 @@ int check_srvr_ecc_cert_and_alg(X509 *x, SSL_CIPHER *cs) } /* THIS NEEDS CLEANING UP */ -X509 *ssl_get_server_send_cert(SSL *s) +X509 *ssl_get_server_send_cert(const SSL *s) { unsigned long alg,kalg; CERT *c; @@ -2420,7 +2420,9 @@ 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->cert != NULL) + if (s->server) + return(ssl_get_server_send_cert(s)); + else if (s->cert != NULL) return(s->cert->key->x509); else return(NULL); |