Commit 739a543e 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 01c76c66

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/dso/dso.h

+7 −2
Original line number Diff line number Diff line
@@ -350,26 +350,31 @@ void ERR_load_DSO_strings(void); 
#define DSO_F_DSO_FREE					 111

#define DSO_F_DSO_GET_FILENAME				 127

#define DSO_F_DSO_GET_LOADED_FILENAME			 128

#define DSO_F_DSO_GLOBAL_LOOKUP				 139

#define DSO_F_DSO_LOAD					 112

#define DSO_F_DSO_MERGE					 132

#define DSO_F_DSO_NEW_METHOD				 113

#define DSO_F_DSO_PATHBYADDR				 140

#define DSO_F_DSO_SET_FILENAME				 129

#define DSO_F_DSO_SET_NAME_CONVERTER			 122

#define DSO_F_DSO_UP_REF				 114

#define DSO_F_GLOBAL_LOOKUP_FUNC			 138

#define DSO_F_PATHBYADDR				 137

#define DSO_F_VMS_BIND_SYM				 115

#define DSO_F_VMS_LOAD					 116

#define DSO_F_VMS_MERGER				 133

#define DSO_F_VMS_UNLOAD				 117

#define DSO_F_WIN32_BIND_FUNC				 118

#define DSO_F_WIN32_BIND_VAR				 119

#define DSO_F_WIN32_GLOBALLOOKUP			 142

#define DSO_F_WIN32_GLOBALLOOKUP_FUNC			 143

#define DSO_F_WIN32_JOINER				 135

#define DSO_F_WIN32_LOAD				 120

#define DSO_F_WIN32_MERGER				 134

#define DSO_F_WIN32_NAME_CONVERTER			 125

#define DSO_F_WIN32_PATHBYADDR				 141

#define DSO_F_WIN32_SPLITTER				 136

#define DSO_F_WIN32_UNLOAD				 121

#define DSO_F_PATHBYADDR				 137

#define DSO_F_GLOBAL_LOOKUP_FUNC			 138



/* Reason codes. */

#define DSO_R_CTRL_FAILED				 100

crypto/dso/dso_lib.c

+2 −2
Original line number Diff line number Diff line
@@ -471,7 +471,7 @@ int DSO_pathbyaddr(void *addr,char *path,int sz) 
	if (meth == NULL) meth = DSO_METHOD_openssl();

	if (meth->pathbyaddr == NULL)

		{

		DSOerr(DSO_F_PATHBYADDR,DSO_R_UNSUPPORTED);

		DSOerr(DSO_F_DSO_PATHBYADDR,DSO_R_UNSUPPORTED);

		return -1;

		}

	return (*meth->pathbyaddr)(addr,path,sz);
@@ -483,7 +483,7 @@ void *DSO_global_lookup(const char *name) 
	if (meth == NULL) meth = DSO_METHOD_openssl();

	if (meth->globallookup == NULL)

		{

		DSOerr(DSO_F_GLOBAL_LOOKUP_FUNC,DSO_R_UNSUPPORTED);

		DSOerr(DSO_F_DSO_GLOBAL_LOOKUP,DSO_R_UNSUPPORTED);

		return NULL;

		}

	return (*meth->globallookup)(name);

crypto/dso/dso_win32.c

+7 −7
Original line number Diff line number Diff line
@@ -698,7 +698,7 @@ static int win32_pathbyaddr(void *addr,char *path,int sz) 
	dll = LoadLibrary(TEXT(DLLNAME));

	if (dll == NULL)

		{

		DSOerr(DSO_F_PATHBYADDR,DSO_R_UNSUPPORTED);

		DSOerr(DSO_F_WIN32_PATHBYADDR,DSO_R_UNSUPPORTED);

		return -1;

		}
@@ -707,7 +707,7 @@ static int win32_pathbyaddr(void *addr,char *path,int sz) 
	if (create_snap == NULL)

		{

		FreeLibrary(dll);

		DSOerr(DSO_F_PATHBYADDR,DSO_R_UNSUPPORTED);

		DSOerr(DSO_F_WIN32_PATHBYADDR,DSO_R_UNSUPPORTED);

		return -1;

		}

	/* We take the rest for granted... */
@@ -724,7 +724,7 @@ static int win32_pathbyaddr(void *addr,char *path,int sz) 
	if( hModuleSnap == INVALID_HANDLE_VALUE ) 

		{ 

		FreeLibrary(dll);

		DSOerr(DSO_F_PATHBYADDR,DSO_R_UNSUPPORTED);

		DSOerr(DSO_F_WIN32_PATHBYADDR,DSO_R_UNSUPPORTED);

		return -1;

		}
@@ -734,7 +734,7 @@ static int win32_pathbyaddr(void *addr,char *path,int sz) 
		{ 

		(*close_snap)(hModuleSnap);

		FreeLibrary(dll);

		DSOerr(DSO_F_PATHBYADDR,DSO_R_FAILURE);

		DSOerr(DSO_F_WIN32_PATHBYADDR,DSO_R_FAILURE);

		return -1;

		}
@@ -786,7 +786,7 @@ static void *win32_globallookup(const char *name) 
	dll = LoadLibrary(TEXT(DLLNAME));

	if (dll == NULL)

		{

		DSOerr(DSO_F_GLOBAL_LOOKUP_FUNC,DSO_R_UNSUPPORTED);

		DSOerr(DSO_F_WIN32_GLOBALLOOKUP,DSO_R_UNSUPPORTED);

		return NULL;

		}
@@ -795,7 +795,7 @@ static void *win32_globallookup(const char *name) 
	if (create_snap == NULL)

		{

		FreeLibrary(dll);

		DSOerr(DSO_F_GLOBAL_LOOKUP_FUNC,DSO_R_UNSUPPORTED);

		DSOerr(DSO_F_WIN32_GLOBALLOOKUP,DSO_R_UNSUPPORTED);

		return NULL;

		}

	/* We take the rest for granted... */
@@ -812,7 +812,7 @@ static void *win32_globallookup(const char *name) 
	if( hModuleSnap == INVALID_HANDLE_VALUE )

		{

		FreeLibrary(dll);

		DSOerr(DSO_F_PATHBYADDR,DSO_R_UNSUPPORTED);

		DSOerr(DSO_F_WIN32_GLOBALLOOKUP,DSO_R_UNSUPPORTED);

		return NULL;

		}

crypto/ec/ec.h

+2 −1
Original line number Diff line number Diff line
@@ -932,6 +932,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
@@ -982,7 +983,7 @@ void ERR_load_EC_strings(void); 
#define EC_F_EC_GROUP_PRECOMPUTE_MULT			 142

#define EC_F_EC_GROUP_SET_CURVE_GF2M			 176

#define EC_F_EC_GROUP_SET_CURVE_GFP			 109

#define EC_F_EC_EX_DATA_SET_DATA			 110

#define EC_F_EC_GROUP_SET_EXTRA_DATA			 110

#define EC_F_EC_GROUP_SET_GENERATOR			 111

#define EC_F_EC_KEY_CHECK_KEY				 177

#define EC_F_EC_KEY_COPY				 178