Commit 17620eec authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Fix error codes.

parent 059230b3

ssl/d1_both.c

+1 −1
Original line number Diff line number Diff line
@@ -823,7 +823,7 @@ static int dtls1_add_cert_to_buf(BUF_MEM *buf, unsigned long *l, X509 *x) 
		n=i2d_X509(x,NULL);

		if (!BUF_MEM_grow_clean(buf,(int)(n+(*l)+3)))

			{

			SSLerr(SSL_F_DTLS1_OUTPUT_CERT_CHAIN,ERR_R_BUF_LIB);

			SSLerr(SSL_F_DTLS1_ADD_CERT_TO_BUF,ERR_R_BUF_LIB);

			return 0;

			}

		p=(unsigned char *)&(buf->data[*l]);

ssl/s23_clnt.c

+4 −1
Original line number Diff line number Diff line
@@ -202,11 +202,14 @@ static int ssl23_client_hello(SSL *s) 
	{

	unsigned char *buf;

	unsigned char *p,*d;

	int i,j,ch_len;

	int i,ch_len;

	unsigned long Time,l;

	int ssl2_compat;

	int version = 0, version_major, version_minor;

#ifndef OPENSSL_NO_COMP

	int j;

	SSL_COMP *comp;

#endif

	int ret;



	ssl2_compat = (s->options & SSL_OP_NO_SSLv2) ? 0 : 1;

ssl/s3_both.c

+1 −1
Original line number Diff line number Diff line
@@ -272,7 +272,7 @@ static int ssl3_add_cert_to_buf(BUF_MEM *buf, unsigned long *l, X509 *x) 
		n=i2d_X509(x,NULL);

		if (!BUF_MEM_grow_clean(buf,(int)(n+(*l)+3)))

			{

				SSLerr(SSL_F_SSL3_OUTPUT_CERT_CHAIN,ERR_R_BUF_LIB);

				SSLerr(SSL_F_SSL3_ADD_CERT_TO_BUF,ERR_R_BUF_LIB);

				return(-1);

			}

		p=(unsigned char *)&(buf->data[*l]);

ssl/ssl.h

+2 −0
Original line number Diff line number Diff line
@@ -1651,6 +1651,7 @@ void ERR_load_SSL_strings(void); 
#define SSL_F_DO_DTLS1_WRITE				 245

#define SSL_F_DO_SSL3_WRITE				 104

#define SSL_F_DTLS1_ACCEPT				 246

#define SSL_F_DTLS1_ADD_CERT_TO_BUF			 280

#define SSL_F_DTLS1_BUFFER_RECORD			 247

#define SSL_F_DTLS1_CLIENT_HELLO			 248

#define SSL_F_DTLS1_CONNECT				 249
@@ -1704,6 +1705,7 @@ void ERR_load_SSL_strings(void); 
#define SSL_F_SSL2_SET_CERTIFICATE			 126

#define SSL_F_SSL2_WRITE				 127

#define SSL_F_SSL3_ACCEPT				 128

#define SSL_F_SSL3_ADD_CERT_TO_BUF			 281

#define SSL_F_SSL3_CALLBACK_CTRL			 233

#define SSL_F_SSL3_CHANGE_CIPHER_STATE			 129

#define SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM		 130

ssl/ssl_err.c

+2 −0
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ static ERR_STRING_DATA SSL_str_functs[]= 
{ERR_FUNC(SSL_F_DO_DTLS1_WRITE),	"DO_DTLS1_WRITE"},

{ERR_FUNC(SSL_F_DO_SSL3_WRITE),	"DO_SSL3_WRITE"},

{ERR_FUNC(SSL_F_DTLS1_ACCEPT),	"DTLS1_ACCEPT"},

{ERR_FUNC(SSL_F_DTLS1_ADD_CERT_TO_BUF),	"DTLS1_ADD_CERT_TO_BUF"},

{ERR_FUNC(SSL_F_DTLS1_BUFFER_RECORD),	"DTLS1_BUFFER_RECORD"},

{ERR_FUNC(SSL_F_DTLS1_CLIENT_HELLO),	"DTLS1_CLIENT_HELLO"},

{ERR_FUNC(SSL_F_DTLS1_CONNECT),	"DTLS1_CONNECT"},
@@ -131,6 +132,7 @@ static ERR_STRING_DATA SSL_str_functs[]= 
{ERR_FUNC(SSL_F_SSL2_SET_CERTIFICATE),	"SSL2_SET_CERTIFICATE"},

{ERR_FUNC(SSL_F_SSL2_WRITE),	"SSL2_WRITE"},

{ERR_FUNC(SSL_F_SSL3_ACCEPT),	"SSL3_ACCEPT"},

{ERR_FUNC(SSL_F_SSL3_ADD_CERT_TO_BUF),	"SSL3_ADD_CERT_TO_BUF"},

{ERR_FUNC(SSL_F_SSL3_CALLBACK_CTRL),	"SSL3_CALLBACK_CTRL"},

{ERR_FUNC(SSL_F_SSL3_CHANGE_CIPHER_STATE),	"SSL3_CHANGE_CIPHER_STATE"},

{ERR_FUNC(SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM),	"SSL3_CHECK_CERT_AND_ALGORITHM"},