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

Sort openssl.ec, the configuration file for mkerr.pl. 

Change mkerr.pl so that it puts the ERR_load_..._strings()
prototype in header files that it writes.
parent adfe54b7

crypto/ec/ec.h

+33 −32
Original line number Diff line number Diff line
@@ -158,49 +158,50 @@ int EC_POINT_make_affine(const EC_GROUP *, EC_POINT *, BN_CTX *); 
/* The following lines are auto generated by the script mkerr.pl. Any changes

 * made after this point may be overwritten when the script is next run.

 */

void ERR_load_EC_strings(void);



/* Error codes for the EC functions. */



/* Function codes. */

#define EC_F_EC_GFP_SIMPLE_GROUP_SET_CURVE_GFP		 127

#define EC_F_EC_GFP_SIMPLE_GROUP_SET_GENERATOR		 100

#define EC_F_EC_GFP_SIMPLE_MAKE_AFFINE			 101

#define EC_F_EC_GFP_SIMPLE_OCT2POINT			 102

#define EC_F_EC_GFP_SIMPLE_POINT2OCT			 103

#define EC_F_EC_GFP_SIMPLE_POINT_GET_AFFINE_COORDINATES_GFP 104

#define EC_F_EC_GROUP_COPY				 105

#define EC_F_EC_GROUP_GET_EXTRA_DATA			 106

#define EC_F_EC_GROUP_NEW				 107

#define EC_F_EC_GROUP_SET_CURVE_GFP			 108

#define EC_F_EC_GROUP_SET_EXTRA_DATA			 109

#define EC_F_EC_GROUP_SET_GENERATOR			 110

#define EC_F_EC_POINT_ADD				 111

#define EC_F_EC_POINT_CMP				 123

#define EC_F_EC_POINT_COPY				 112

#define EC_F_EC_POINT_DBL				 113

#define EC_F_EC_POINT_GET_AFFINE_COORDINATES_GFP	 114

#define EC_F_EC_POINT_GET_JPROJECTIVE_COORDINATES_GFP	 124

#define EC_F_EC_POINT_IS_AT_INFINITY			 115

#define EC_F_EC_POINT_IS_ON_CURVE			 116

#define EC_F_EC_POINT_MAKE_AFFINE			 117

#define EC_F_EC_POINT_NEW				 118

#define EC_F_EC_POINT_OCT2POINT				 119

#define EC_F_EC_POINT_POINT2OCT				 120

#define EC_F_EC_POINT_SET_AFFINE_COORDINATES_GFP	 121

#define EC_F_EC_GFP_SIMPLE_GROUP_SET_CURVE_GFP		 100

#define EC_F_EC_GFP_SIMPLE_GROUP_SET_GENERATOR		 101

#define EC_F_EC_GFP_SIMPLE_MAKE_AFFINE			 102

#define EC_F_EC_GFP_SIMPLE_OCT2POINT			 103

#define EC_F_EC_GFP_SIMPLE_POINT2OCT			 104

#define EC_F_EC_GFP_SIMPLE_POINT_GET_AFFINE_COORDINATES_GFP 105

#define EC_F_EC_GROUP_COPY				 106

#define EC_F_EC_GROUP_GET_EXTRA_DATA			 107

#define EC_F_EC_GROUP_NEW				 108

#define EC_F_EC_GROUP_SET_CURVE_GFP			 109

#define EC_F_EC_GROUP_SET_EXTRA_DATA			 110

#define EC_F_EC_GROUP_SET_GENERATOR			 111

#define EC_F_EC_POINT_ADD				 112

#define EC_F_EC_POINT_CMP				 113

#define EC_F_EC_POINT_COPY				 114

#define EC_F_EC_POINT_DBL				 115

#define EC_F_EC_POINT_GET_AFFINE_COORDINATES_GFP	 116

#define EC_F_EC_POINT_GET_JPROJECTIVE_COORDINATES_GFP	 117

#define EC_F_EC_POINT_IS_AT_INFINITY			 118

#define EC_F_EC_POINT_IS_ON_CURVE			 119

#define EC_F_EC_POINT_MAKE_AFFINE			 120

#define EC_F_EC_POINT_NEW				 121

#define EC_F_EC_POINT_OCT2POINT				 122

#define EC_F_EC_POINT_POINT2OCT				 123

#define EC_F_EC_POINT_SET_AFFINE_COORDINATES_GFP	 124

#define EC_F_EC_POINT_SET_COMPRESSED_COORDINATES_GFP	 125

#define EC_F_EC_POINT_SET_JPROJECTIVE_COORDINATES_GFP	 126

#define EC_F_EC_POINT_SET_TO_INFINITY			 122

#define EC_F_EC_POINT_SET_TO_INFINITY			 127



/* Reason codes. */

#define EC_R_BUFFER_TOO_SMALL				 100

#define EC_R_INCOMPATIBLE_OBJECTS			 101

#define EC_R_INVALID_ENCODING				 102

#define EC_R_INVALID_FIELD				 108

#define EC_R_INVALID_FORM				 103

#define EC_R_NO_SUCH_EXTRA_DATA				 104

#define EC_R_POINT_AT_INFINITY				 105

#define EC_R_POINT_IS_NOT_ON_CURVE			 106

#define EC_R_SLOT_FULL					 107

#define EC_R_INVALID_FIELD				 103

#define EC_R_INVALID_FORM				 104

#define EC_R_NO_SUCH_EXTRA_DATA				 105

#define EC_R_POINT_AT_INFINITY				 106

#define EC_R_POINT_IS_NOT_ON_CURVE			 107

#define EC_R_SLOT_FULL					 108



#ifdef  __cplusplus

}

crypto/ec/ec_err.c

+8 −8
Original line number Diff line number Diff line
@@ -66,17 +66,17 @@ 
#ifndef OPENSSL_NO_ERR

static ERR_STRING_DATA EC_str_functs[]=

	{

{ERR_PACK(0,EC_F_EC_GFP_SIMPLE_GROUP_SET_CURVE_GFP,0),	"EC_GFP_SIMPLE_GROUP_SET_CURVE_GFP"},

{ERR_PACK(0,EC_F_EC_GFP_SIMPLE_GROUP_SET_GENERATOR,0),	"EC_GFP_SIMPLE_GROUP_SET_GENERATOR"},

{ERR_PACK(0,EC_F_EC_GFP_SIMPLE_MAKE_AFFINE,0),	"EC_GFP_SIMPLE_MAKE_AFFINE"},

{ERR_PACK(0,EC_F_EC_GFP_SIMPLE_OCT2POINT,0),	"EC_GFP_SIMPLE_OCT2POINT"},

{ERR_PACK(0,EC_F_EC_GFP_SIMPLE_POINT2OCT,0),	"EC_GFP_SIMPLE_POINT2OCT"},

{ERR_PACK(0,EC_F_EC_GFP_SIMPLE_POINT_GET_AFFINE_COORDINATES_GFP,0),	"EC_GFP_SIMPLE_POINT_GET_AFFINE_COORDINATES_GFP"},

{ERR_PACK(0,EC_F_EC_GFP_SIMPLE_GROUP_SET_CURVE_GFP,0),	"ec_GFp_simple_group_set_curve_GFp"},

{ERR_PACK(0,EC_F_EC_GFP_SIMPLE_GROUP_SET_GENERATOR,0),	"ec_GFp_simple_group_set_generator"},

{ERR_PACK(0,EC_F_EC_GFP_SIMPLE_MAKE_AFFINE,0),	"ec_GFp_simple_make_affine"},

{ERR_PACK(0,EC_F_EC_GFP_SIMPLE_OCT2POINT,0),	"ec_GFp_simple_oct2point"},

{ERR_PACK(0,EC_F_EC_GFP_SIMPLE_POINT2OCT,0),	"ec_GFp_simple_point2oct"},

{ERR_PACK(0,EC_F_EC_GFP_SIMPLE_POINT_GET_AFFINE_COORDINATES_GFP,0),	"ec_GFp_simple_point_get_affine_coordinates_GFp"},

{ERR_PACK(0,EC_F_EC_GROUP_COPY,0),	"EC_GROUP_copy"},

{ERR_PACK(0,EC_F_EC_GROUP_GET_EXTRA_DATA,0),	"EC_GROUP_GET_EXTRA_DATA"},

{ERR_PACK(0,EC_F_EC_GROUP_GET_EXTRA_DATA,0),	"EC_GROUP_get_extra_data"},

{ERR_PACK(0,EC_F_EC_GROUP_NEW,0),	"EC_GROUP_new"},

{ERR_PACK(0,EC_F_EC_GROUP_SET_CURVE_GFP,0),	"EC_GROUP_set_curve_GFp"},

{ERR_PACK(0,EC_F_EC_GROUP_SET_EXTRA_DATA,0),	"EC_GROUP_SET_EXTRA_DATA"},

{ERR_PACK(0,EC_F_EC_GROUP_SET_EXTRA_DATA,0),	"EC_GROUP_set_extra_data"},

{ERR_PACK(0,EC_F_EC_GROUP_SET_GENERATOR,0),	"EC_GROUP_set_generator"},

{ERR_PACK(0,EC_F_EC_POINT_ADD,0),	"EC_POINT_add"},

{ERR_PACK(0,EC_F_EC_POINT_CMP,0),	"EC_POINT_cmp"},

crypto/err/err_all.c

+2 −1
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ 
#include <stdio.h>

#include <openssl/asn1.h>

#include <openssl/bn.h>

#include <openssl/ec.h>

#include <openssl/buffer.h>

#include <openssl/bio.h>

#ifndef OPENSSL_NO_RSA
@@ -91,7 +92,7 @@ void ERR_load_crypto_strings(void) 
	done=1;

#ifndef OPENSSL_NO_ERR

	ERR_load_ERR_strings(); /* include error strings for SYSerr */

	ERR_load_BN_strings()

	ERR_load_BN_strings();

#ifndef OPENSSL_NO_RSA

	ERR_load_RSA_strings();

#endif

crypto/err/openssl.ec

+17 −12
Original line number Diff line number Diff line 
# crypto/err/openssl.ec



# configuration file for util/mkerr.pl



# files that may have to be rewritten by util/mkerr.pl

L ERR		NONE				NONE

L CRYPTO	crypto/crypto.h			crypto/cpt_err.c

L BN		crypto/bn/bn.h			crypto/bn/bn_err.c

L EC		crypto/ec/ec.h			crypto/ec/ec_err.c

L RSA		crypto/rsa/rsa.h		crypto/rsa/rsa_err.c

L DSA		crypto/dsa/dsa.h		crypto/dsa/dsa_err.c

L DSO		crypto/dso/dso.h		crypto/dso/dso_err.c

L DH		crypto/dh/dh.h			crypto/dh/dh_err.c

L EVP		crypto/evp/evp.h		crypto/evp/evp_err.c

L BUF		crypto/buffer/buffer.h		crypto/buffer/buf_err.c

L BIO		crypto/bio/bio.h		crypto/bio/bio_err.c

L OBJ		crypto/objects/objects.h	crypto/objects/obj_err.c

L OCSP		crypto/ocsp/ocsp.h		crypto/ocsp/ocsp_err.c

L PEM		crypto/pem/pem.h		crypto/pem/pem_err.c

L DSA		crypto/dsa/dsa.h		crypto/dsa/dsa_err.c

L X509		crypto/x509/x509.h		crypto/x509/x509_err.c

L NONE		crypto/x509/x509_vfy.h		NONE

L X509V3	crypto/x509v3/x509v3.h		crypto/x509v3/v3err.c

#L METH		crypto/meth/meth.h		crypto/meth/meth_err.c

L ASN1		crypto/asn1/asn1.h		crypto/asn1/asn1_err.c

L CONF		crypto/conf/conf.h		crypto/conf/conf_err.c

#L PROXY		crypto/proxy/proxy.h		crypto/proxy/proxy_err.c

L CRYPTO	crypto/crypto.h			crypto/cpt_err.c

L EC		crypto/ec/ec.h			crypto/ec/ec_err.c

L SSL		ssl/ssl.h			ssl/ssl_err.c

L BIO		crypto/bio/bio.h		crypto/bio/bio_err.c

L PKCS7		crypto/pkcs7/pkcs7.h		crypto/pkcs7/pkcs7err.c

L X509V3	crypto/x509v3/x509v3.h		crypto/x509v3/v3err.c

L PKCS12	crypto/pkcs12/pkcs12.h		crypto/pkcs12/pk12err.c

L SSL		ssl/ssl.h			ssl/ssl_err.c

L COMP		crypto/comp/comp.h		crypto/comp/comp_err.c

L RAND		crypto/rand/rand.h		crypto/rand/rand_err.c

L DSO		crypto/dso/dso.h		crypto/dso/dso_err.c

L ENGINE	crypto/engine/engine.h		crypto/engine/engine_err.c

L OCSP		crypto/ocsp/ocsp.h		crypto/ocsp/ocsp_err.c



# additional header files to be scanned for function names

L NONE		crypto/x509/x509_vfy.h		NONE

L NONE		crypto/ec/ec_lcl.h		NONE





F RSAREF_F_RSA_BN2BIN

util/mkerr.pl

+1 −0
Original line number Diff line number Diff line
@@ -257,6 +257,7 @@ foreach $lib (keys %csrc) 
/* The following lines are auto generated by the script mkerr.pl. Any changes

 * made after this point may be overwritten when the script is next run.

 */

void ERR_load_${lib}_strings(void);



/* Error codes for the $lib functions. */