diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2012-04-06 12:00:24 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2012-04-06 12:00:24 +0000 |
| commit | 7e65b21a245e64f4e0984eddaaff4137e7bf616f (patch) | |
| tree | 1a97eb91abc903c8d09e6a3187f1b023c3ca0ad1 /ssl/ssl_cert.c | |
| parent | 736d69750dd248e246abf3d0377ba240aa0e8226 (diff) | |
Backport: Revise ssl code to use CERT_PKEY structure when outputting a certificate chain (from HEAD)
Diffstat (limited to 'ssl/ssl_cert.c')
| -rw-r--r-- | ssl/ssl_cert.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/ssl/ssl_cert.c b/ssl/ssl_cert.c index 1c6325e9f8..16c060b711 100644 --- a/ssl/ssl_cert.c +++ b/ssl/ssl_cert.c @@ -873,12 +873,19 @@ static int ssl_add_cert_to_buf(BUF_MEM *buf, unsigned long *l, X509 *x) } /* Add certificate chain to internal SSL BUF_MEM strcuture */ -int ssl_add_cert_chain(SSL *s, X509 *x, unsigned long *l) +int ssl_add_cert_chain(SSL *s, CERT_PKEY *cpk, unsigned long *l) { BUF_MEM *buf = s->init_buf; int no_chain; int i; + X509 *x; + + if (cpk) + x = cpk->x509; + else + x = NULL; + if ((s->mode & SSL_MODE_NO_AUTO_CHAIN) || s->ctx->extra_certs) no_chain = 1; else |