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

correct error code

parent bb3add20

ssl/d1_lib.c

+1 −1
Original line number Diff line number Diff line
@@ -412,7 +412,7 @@ int dtls1_check_timeout_num(SSL *s) 
	if (s->d1->timeout.num_alerts > DTLS1_TMO_ALERT_COUNT)

		{

		/* fail the connection, enough alerts have been sent */

		SSLerr(SSL_F_DTLS1_HANDLE_TIMEOUT,SSL_R_READ_TIMEOUT_EXPIRED);

		SSLerr(SSL_F_DTLS1_CHECK_TIMEOUT_NUM,SSL_R_READ_TIMEOUT_EXPIRED);

		return -1;

		}

ssl/ssl.h

+3 −0
Original line number Diff line number Diff line
@@ -2109,6 +2109,7 @@ void ERR_load_SSL_strings(void); 
#define SSL_F_DTLS1_ACCEPT				 246

#define SSL_F_DTLS1_ADD_CERT_TO_BUF			 295

#define SSL_F_DTLS1_BUFFER_RECORD			 247

#define SSL_F_DTLS1_CHECK_TIMEOUT_NUM			 318

#define SSL_F_DTLS1_CLIENT_HELLO			 248

#define SSL_F_DTLS1_CONNECT				 249

#define SSL_F_DTLS1_ENC					 250
@@ -2258,6 +2259,7 @@ void ERR_load_SSL_strings(void); 
#define SSL_F_SSL_GET_NEW_SESSION			 181

#define SSL_F_SSL_GET_PREV_SESSION			 217

#define SSL_F_SSL_GET_SERVER_SEND_CERT			 182

#define SSL_F_SSL_GET_SERVER_SEND_PKEY			 319

#define SSL_F_SSL_GET_SIGN_PKEY				 183

#define SSL_F_SSL_INIT_WBIO_BUFFER			 184

#define SSL_F_SSL_LOAD_CLIENT_CA_FILE			 185
@@ -2274,6 +2276,7 @@ void ERR_load_SSL_strings(void); 
#define SSL_F_SSL_READ					 223

#define SSL_F_SSL_RSA_PRIVATE_DECRYPT			 187

#define SSL_F_SSL_RSA_PUBLIC_ENCRYPT			 188

#define SSL_F_SSL_SCAN_CLIENTHELLO_TLSEXT		 320

#define SSL_F_SSL_SESSION_NEW				 189

#define SSL_F_SSL_SESSION_PRINT_FP			 190

#define SSL_F_SSL_SESSION_SET1_ID_CONTEXT		 312

ssl/ssl_err.c

+4 −1
Original line number Diff line number Diff line 
/* ssl/ssl_err.c */

/* ====================================================================

 * Copyright (c) 1999-2011 The OpenSSL Project.  All rights reserved.

 * Copyright (c) 1999-2012 The OpenSSL Project.  All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions
@@ -80,6 +80,7 @@ static ERR_STRING_DATA SSL_str_functs[]= 
{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_CHECK_TIMEOUT_NUM),	"DTLS1_CHECK_TIMEOUT_NUM"},

{ERR_FUNC(SSL_F_DTLS1_CLIENT_HELLO),	"DTLS1_CLIENT_HELLO"},

{ERR_FUNC(SSL_F_DTLS1_CONNECT),	"DTLS1_CONNECT"},

{ERR_FUNC(SSL_F_DTLS1_ENC),	"DTLS1_ENC"},
@@ -229,6 +230,7 @@ static ERR_STRING_DATA SSL_str_functs[]= 
{ERR_FUNC(SSL_F_SSL_GET_NEW_SESSION),	"SSL_GET_NEW_SESSION"},

{ERR_FUNC(SSL_F_SSL_GET_PREV_SESSION),	"SSL_GET_PREV_SESSION"},

{ERR_FUNC(SSL_F_SSL_GET_SERVER_SEND_CERT),	"SSL_GET_SERVER_SEND_CERT"},

{ERR_FUNC(SSL_F_SSL_GET_SERVER_SEND_PKEY),	"SSL_GET_SERVER_SEND_PKEY"},

{ERR_FUNC(SSL_F_SSL_GET_SIGN_PKEY),	"SSL_GET_SIGN_PKEY"},

{ERR_FUNC(SSL_F_SSL_INIT_WBIO_BUFFER),	"SSL_INIT_WBIO_BUFFER"},

{ERR_FUNC(SSL_F_SSL_LOAD_CLIENT_CA_FILE),	"SSL_load_client_CA_file"},
@@ -245,6 +247,7 @@ static ERR_STRING_DATA SSL_str_functs[]= 
{ERR_FUNC(SSL_F_SSL_READ),	"SSL_read"},

{ERR_FUNC(SSL_F_SSL_RSA_PRIVATE_DECRYPT),	"SSL_RSA_PRIVATE_DECRYPT"},

{ERR_FUNC(SSL_F_SSL_RSA_PUBLIC_ENCRYPT),	"SSL_RSA_PUBLIC_ENCRYPT"},

{ERR_FUNC(SSL_F_SSL_SCAN_CLIENTHELLO_TLSEXT),	"SSL_SCAN_CLIENTHELLO_TLSEXT"},

{ERR_FUNC(SSL_F_SSL_SESSION_NEW),	"SSL_SESSION_new"},

{ERR_FUNC(SSL_F_SSL_SESSION_PRINT_FP),	"SSL_SESSION_print_fp"},

{ERR_FUNC(SSL_F_SSL_SESSION_SET1_ID_CONTEXT),	"SSL_SESSION_set1_id_context"},

ssl/ssl_lib.c

+1 −1
Original line number Diff line number Diff line
@@ -2375,7 +2375,7 @@ CERT_PKEY *ssl_get_server_send_pkey(SSL *s) 
		i=SSL_PKEY_GOST01;

	else /* if (alg_a & SSL_aNULL) */

		{

		SSLerr(SSL_F_SSL_GET_SERVER_SEND_CERT,ERR_R_INTERNAL_ERROR);

		SSLerr(SSL_F_SSL_GET_SERVER_SEND_PKEY,ERR_R_INTERNAL_ERROR);

		return(NULL);

		}

	if (c->pkeys[i].x509 == NULL) return(NULL);

ssl/t1_lib.c

+2 −2
Original line number Diff line number Diff line
@@ -1661,7 +1661,7 @@ static int ssl_scan_clienthello_tlsext(SSL *s, unsigned char **p, unsigned char 
		!(s->options & SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION))

		{

		*al = SSL_AD_HANDSHAKE_FAILURE;

	 	SSLerr(SSL_F_SSL_PARSE_CLIENTHELLO_TLSEXT,

	 	SSLerr(SSL_F_SSL_SCAN_CLIENTHELLO_TLSEXT,

				SSL_R_UNSAFE_LEGACY_RENEGOTIATION_DISABLED);

		return 0;

		}
@@ -1680,7 +1680,7 @@ int ssl_parse_clienthello_tlsext(SSL *s, unsigned char **p, unsigned char *d, in 


	if (ssl_check_clienthello_tlsext(s) <= 0) 

		{

		SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO,SSL_R_CLIENTHELLO_TLSEXT);

		SSLerr(SSL_F_SSL_PARSE_CLIENTHELLO_TLSEXT,SSL_R_CLIENTHELLO_TLSEXT);

		return 0;

		}

	return 1;