Commit 2e885232 authored by Bodo Möller's avatar Bodo Möller
Browse files

Some error code cleanups (SSL lib. used SSL_R_... codes reserved for alerts)

parent 970d9b37

crypto/asn1/t_pkey.c

+2 −2
Original line number Diff line number Diff line
@@ -740,7 +740,7 @@ int DSAparams_print(BIO *bp, const DSA *x) 
		buf_len = (size_t)BN_num_bytes(x->p);

	else

		{

		DSAerr(DSA_F_DSA_PRINT,DSA_R_MISSING_PARAMETERS);

		DSAerr(DSA_F_DSAPARAMS_PRINT,DSA_R_MISSING_PARAMETERS);

		goto err;

		}

	if (x->q)
@@ -752,7 +752,7 @@ int DSAparams_print(BIO *bp, const DSA *x) 
	m=(unsigned char *)OPENSSL_malloc(buf_len+10);

	if (m == NULL)

		{

		DSAerr(DSA_F_DSA_PRINT,ERR_R_MALLOC_FAILURE);

		DSAerr(DSA_F_DSAPARAMS_PRINT,ERR_R_MALLOC_FAILURE);

		goto err;

		}

crypto/ec/ec.h

+1 −0
Original line number Diff line number Diff line
@@ -385,6 +385,7 @@ void ERR_load_EC_strings(void); 
#define EC_F_EC_ASN1_GROUP2PKPARAMETERS			 156

#define EC_F_EC_ASN1_PARAMETERS2GROUP			 157

#define EC_F_EC_ASN1_PKPARAMETERS2GROUP			 158

#define EC_F_EC_EX_DATA_SET_DATA			 211

#define EC_F_EC_GF2M_MONTGOMERY_POINT_MULTIPLY		 208

#define EC_F_EC_GF2M_SIMPLE_GROUP_CHECK_DISCRIMINANT	 159

#define EC_F_EC_GF2M_SIMPLE_GROUP_SET_CURVE		 195

crypto/ec/ec_err.c

+2 −1
Original line number Diff line number Diff line
@@ -88,6 +88,7 @@ static ERR_STRING_DATA EC_str_functs[]= 
{ERR_FUNC(EC_F_EC_ASN1_GROUP2PKPARAMETERS),	"EC_ASN1_GROUP2PKPARAMETERS"},

{ERR_FUNC(EC_F_EC_ASN1_PARAMETERS2GROUP),	"EC_ASN1_PARAMETERS2GROUP"},

{ERR_FUNC(EC_F_EC_ASN1_PKPARAMETERS2GROUP),	"EC_ASN1_PKPARAMETERS2GROUP"},

{ERR_FUNC(EC_F_EC_EX_DATA_SET_DATA),	"EC_EX_DATA_set_data"},

{ERR_FUNC(EC_F_EC_GF2M_MONTGOMERY_POINT_MULTIPLY),	"EC_GF2M_MONTGOMERY_POINT_MULTIPLY"},

{ERR_FUNC(EC_F_EC_GF2M_SIMPLE_GROUP_CHECK_DISCRIMINANT),	"ec_GF2m_simple_group_check_discriminant"},

{ERR_FUNC(EC_F_EC_GF2M_SIMPLE_GROUP_SET_CURVE),	"ec_GF2m_simple_group_set_curve"},
@@ -138,7 +139,7 @@ static ERR_STRING_DATA EC_str_functs[]= 
{ERR_FUNC(EC_F_EC_GROUP_PRECOMPUTE_MULT),	"EC_GROUP_precompute_mult"},

{ERR_FUNC(EC_F_EC_GROUP_SET_CURVE_GF2M),	"EC_GROUP_set_curve_GF2m"},

{ERR_FUNC(EC_F_EC_GROUP_SET_CURVE_GFP),	"EC_GROUP_set_curve_GFp"},

{ERR_FUNC(EC_F_EC_GROUP_SET_EXTRA_DATA),	"EC_GROUP_set_extra_data"},

{ERR_FUNC(EC_F_EC_GROUP_SET_EXTRA_DATA),	"EC_GROUP_SET_EXTRA_DATA"},

{ERR_FUNC(EC_F_EC_GROUP_SET_GENERATOR),	"EC_GROUP_set_generator"},

{ERR_FUNC(EC_F_EC_KEY_CHECK_KEY),	"EC_KEY_check_key"},

{ERR_FUNC(EC_F_EC_KEY_COPY),	"EC_KEY_copy"},

crypto/ec/ec_lib.c

+1 −1
Original line number Diff line number Diff line
@@ -558,7 +558,7 @@ int EC_EX_DATA_set_data(EC_EXTRA_DATA **ex_data, void *data, 
		{

		if (d->dup_func == dup_func && d->free_func == free_func && d->clear_free_func == clear_free_func)

			{

			ECerr(EC_F_EC_GROUP_SET_EXTRA_DATA, EC_R_SLOT_FULL);

			ECerr(EC_F_EC_EX_DATA_SET_DATA, EC_R_SLOT_FULL);

			return 0;

			}

		}

engines/e_cswift.c

+1 −1
Original line number Diff line number Diff line
@@ -1089,7 +1089,7 @@ static int cswift_rand_bytes(unsigned char *buf, int num) 
		if (swrc != SW_OK)

		{

			char tmpbuf[20];

			CSWIFTerr(CSWIFT_F_CSWIFT_CTRL, CSWIFT_R_REQUEST_FAILED);

			CSWIFTerr(CSWIFT_F_CSWIFT_RAND_BYTES, CSWIFT_R_REQUEST_FAILED);

			sprintf(tmpbuf, "%ld", swrc);

			ERR_add_error_data(2, "CryptoSwift error number is ", tmpbuf);

			goto err;