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

8 files changed, 28 insertions, 17 deletions

diff --git a/crypto/asn1/t_pkey.c b/crypto/asn1/t_pkey.c
index f882161..f54e5df 100644
--- a/crypto/asn1/t_pkey.c
+++ b/crypto/asn1/t_pkey.c
@@ -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;
 		}
 
diff --git a/crypto/dso/dso.h b/crypto/dso/dso.h
index c1d0dfe..8934c4e 100644
--- a/crypto/dso/dso.h
+++ b/crypto/dso/dso.h
@@ -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
diff --git a/crypto/dso/dso_lib.c b/crypto/dso/dso_lib.c
index c9d978b..1e3d81c 100644
--- a/crypto/dso/dso_lib.c
+++ b/crypto/dso/dso_lib.c
@@ -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);
diff --git a/crypto/dso/dso_win32.c b/crypto/dso/dso_win32.c
index 7a3e2b7..34b94b3 100644
--- a/crypto/dso/dso_win32.c
+++ b/crypto/dso/dso_win32.c
@@ -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;
 		}
 
diff --git a/crypto/ec/ec.h b/crypto/ec/ec.h
index 3d187e9..a3fec5a 100644
--- a/crypto/ec/ec.h
+++ b/crypto/ec/ec.h
@@ -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
diff --git a/crypto/ec/ec_lib.c b/crypto/ec/ec_lib.c
index a987d89..60aa7fd 100644
--- a/crypto/ec/ec_lib.c
+++ b/crypto/ec/ec_lib.c
@@ -79,7 +79,7 @@ EC_GROUP *EC_GROUP_new(const EC_METHOD *meth)
 
 	if (meth == NULL)
 		{
-		ECerr(EC_F_EC_GROUP_NEW, ERR_R_PASSED_NULL_PARAMETER);
+		ECerr(EC_F_EC_GROUP_NEW, EC_R_SLOT_FULL);
 		return NULL;
 		}
 	if (meth->group_init == 0)
diff --git a/crypto/err/openssl.ec b/crypto/err/openssl.ec
index 64200fc..755d56c 100644
--- a/crypto/err/openssl.ec
+++ b/crypto/err/openssl.ec
@@ -67,6 +67,11 @@ R SSL_R_TLSV1_ALERT_INSUFFICIENT_SECURITY	1071
 R SSL_R_TLSV1_ALERT_INTERNAL_ERROR		1080
 R SSL_R_TLSV1_ALERT_USER_CANCELLED		1090
 R SSL_R_TLSV1_ALERT_NO_RENEGOTIATION		1100
+R SSL_R_TLSV1_UNSUPPORTED_EXTENSION		1110
+R SSL_R_TLSV1_CERTIFICATE_UNOBTAINABLE		1111
+R SSL_R_TLSV1_UNRECOGNIZED_NAME			1112
+R SSL_R_TLSV1_BAD_CERTIFICATE_STATUS_RESPONSE	1113
+R SSL_R_TLSV1_BAD_CERTIFICATE_HASH_VALUE	1114
 
 R RSAREF_R_CONTENT_ENCODING			0x0400
 R RSAREF_R_DATA					0x0401
diff --git a/crypto/rsa/rsa.h b/crypto/rsa/rsa.h
index a1ca347..d302254 100644
--- a/crypto/rsa/rsa.h
+++ b/crypto/rsa/rsa.h
@@ -411,17 +411,17 @@ void ERR_load_RSA_strings(void);
 #define RSA_R_NULL_BEFORE_BLOCK_MISSING			 113
 #define RSA_R_N_DOES_NOT_EQUAL_P_Q			 127
 #define RSA_R_OAEP_DECODING_ERROR			 121
-#define RSA_R_SLEN_RECOVERY_FAILED			 135
 #define RSA_R_PADDING_CHECK_FAILED			 114
 #define RSA_R_P_NOT_PRIME				 128
 #define RSA_R_Q_NOT_PRIME				 129
 #define RSA_R_RSA_OPERATIONS_NOT_SUPPORTED		 130
+#define RSA_R_SLEN_CHECK_FAILED				 136
+#define RSA_R_SLEN_RECOVERY_FAILED			 135
 #define RSA_R_SSLV3_ROLLBACK_ATTACK			 115
 #define RSA_R_THE_ASN1_OBJECT_IDENTIFIER_IS_NOT_KNOWN_FOR_THIS_MD 116
 #define RSA_R_UNKNOWN_ALGORITHM_TYPE			 117
 #define RSA_R_UNKNOWN_PADDING_TYPE			 118
 #define RSA_R_WRONG_SIGNATURE_LENGTH			 119
-#define RSA_R_SLEN_CHECK_FAILED				 136
 
 #ifdef  __cplusplus
 }