Commit 7e65b21a authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Backport: Revise ssl code to use CERT_PKEY structure when outputting a... 

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

ssl/d1_both.c

+2 −2
Original line number Diff line number Diff line
@@ -992,13 +992,13 @@ int dtls1_send_change_cipher_spec(SSL *s, int a, int b) 
	return(dtls1_do_write(s,SSL3_RT_CHANGE_CIPHER_SPEC));

	}



unsigned long dtls1_output_cert_chain(SSL *s, X509 *x)

unsigned long dtls1_output_cert_chain(SSL *s, CERT_PKEY *cpk)

	{

	unsigned char *p;

	unsigned long l= 3 + DTLS1_HM_HEADER_LENGTH;

	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-= (3 + DTLS1_HM_HEADER_LENGTH);

ssl/d1_clnt.c

+1 −1
Original line number Diff line number Diff line
@@ -1694,7 +1694,7 @@ int dtls1_send_client_certificate(SSL *s) 
		{

		s->state=SSL3_ST_CW_CERT_D;

		l=dtls1_output_cert_chain(s,

			(s->s3->tmp.cert_req == 2)?NULL:s->cert->key->x509);

			(s->s3->tmp.cert_req == 2)?NULL:s->cert->key);

		s->init_num=(int)l;

		s->init_off=0;

ssl/d1_srvr.c

+4 −4
Original line number Diff line number Diff line
@@ -1569,12 +1569,12 @@ err: 
int dtls1_send_server_certificate(SSL *s)

	{

	unsigned long l;

	X509 *x;

	CERT_PKEY *cpk;



	if (s->state == SSL3_ST_SW_CERT_A)

		{

		x=ssl_get_server_send_cert(s);

		if (x == NULL)

		cpk=ssl_get_server_send_pkey(s);

		if (cpk == NULL)

			{

			/* VRS: allow null cert if auth == KRB5 */

			if ((s->s3->tmp.new_cipher->algorithm_mkey != SSL_kKRB5) ||
@@ -1585,7 +1585,7 @@ int dtls1_send_server_certificate(SSL *s) 
				}

			}



		l=dtls1_output_cert_chain(s,x);

		l=dtls1_output_cert_chain(s,cpk);

		s->state=SSL3_ST_SW_CERT_B;

		s->init_num=(int)l;

		s->init_off=0;

ssl/s3_both.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

ssl/s3_clnt.c

+1 −1
Original line number Diff line number Diff line
@@ -3211,7 +3211,7 @@ int ssl3_send_client_certificate(SSL *s) 
		{

		s->state=SSL3_ST_CW_CERT_D;

		l=ssl3_output_cert_chain(s,

			(s->s3->tmp.cert_req == 2)?NULL:s->cert->key->x509);

			(s->s3->tmp.cert_req == 2)?NULL:s->cert->key);

		s->init_num=(int)l;

		s->init_off=0;

		}