generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

4
ssl/ssl_lib.c
View File

@@ -2290,7 +2290,7 @@ int ssl_check_srvr_ecc_cert_and_alg(X509 *x, SSL *s)
#endif
/* THIS NEEDS CLEANING UP */
X509 *ssl_get_server_send_cert(SSL *s)
CERT_PKEY *ssl_get_server_send_pkey(SSL *s)
{
unsigned long alg_k,alg_a;
CERT *c;
@@ -2350,7 +2350,7 @@ X509 *ssl_get_server_send_cert(SSL *s)
}
if (c->pkeys[i].x509 == NULL) return(NULL);
return(c->pkeys[i].x509);
return(&c->pkeys[i]);
}
EVP_PKEY *ssl_get_sign_pkey(SSL *s,const SSL_CIPHER *cipher, const EVP_MD **pmd)