Backport: Revise ssl code to use CERT_PKEY structure when outputting a certificate chain (from HEAD)

This commit is contained in:
Dr. Stephen Henson
2012-04-06 12:00:24 +00:00
parent 736d69750d
commit 7e65b21a24
9 changed files with 28 additions and 21 deletions

View File

@@ -319,13 +319,13 @@ int ssl3_send_change_cipher_spec(SSL *s, int a, int b)
return(ssl3_do_write(s,SSL3_RT_CHANGE_CIPHER_SPEC));
}
unsigned long ssl3_output_cert_chain(SSL *s, X509 *x)
unsigned long ssl3_output_cert_chain(SSL *s, CERT_PKEY *cpk)
{
unsigned char *p;
unsigned long l=7;
BUF_MEM *buf = s->init_buf;
if (!ssl_add_cert_chain(s, x, &l))
if (!ssl_add_cert_chain(s, cpk, &l))
return 0;
l-=7;