This is the result of a "make errors" with the new error building functionality

in place.

diff --git a/crypto/asn1/asn1.err b/crypto/asn1/asn1.err
index 1f5af96941fe18312da79516eeba1948940687d5..aacd076c3bb045548149f29b0715d16265cc8786 100644 (file)
--- a/crypto/asn1/asn1.err
+++ b/crypto/asn1/asn1.err
@@ -8,6 +8,7 @@
 #define ASN1_F_ASN1_D2I_BIO                             104
 #define ASN1_F_ASN1_D2I_FP                              105
 #define ASN1_F_ASN1_DUP                                         106
+#define ASN1_F_ASN1_GENERALIZEDTIME_NEW                         222
 #define ASN1_F_ASN1_GET_OBJECT                          107
 #define ASN1_F_ASN1_HEADER_NEW                          108
 #define ASN1_F_ASN1_I2D_BIO                             109
@@ -28,12 +29,14 @@
 #define ASN1_F_D2I_ASN1_BMPSTRING                       124
 #define ASN1_F_D2I_ASN1_BOOLEAN                                 125
 #define ASN1_F_D2I_ASN1_BYTES                           126
+#define ASN1_F_D2I_ASN1_GENERALIZEDTIME                         223
 #define ASN1_F_D2I_ASN1_HEADER                          127
 #define ASN1_F_D2I_ASN1_INTEGER                                 128
 #define ASN1_F_D2I_ASN1_OBJECT                          129
 #define ASN1_F_D2I_ASN1_OCTET_STRING                    130
 #define ASN1_F_D2I_ASN1_PRINT_TYPE                      131
 #define ASN1_F_D2I_ASN1_SET                             132
+#define ASN1_F_D2I_ASN1_TIME                            224
 #define ASN1_F_D2I_ASN1_TYPE                            133
 #define ASN1_F_D2I_ASN1_TYPE_BYTES                      134
 #define ASN1_F_D2I_ASN1_UTCTIME                                 135
@@ -78,6 +81,7 @@
 #define ASN1_F_D2I_X509_SIG                             174
 #define ASN1_F_D2I_X509_VAL                             175
 #define ASN1_F_I2D_ASN1_HEADER                          176
+#define ASN1_F_I2D_ASN1_TIME                            225
 #define ASN1_F_I2D_DHPARAMS                             177
 #define ASN1_F_I2D_DSAPARAMS                            178
 #define ASN1_F_I2D_DSAPRIVATEKEY                        179
@@ -143,8 +147,11 @@
 #define ASN1_R_EXPECTING_AN_OCTET_STRING                115
 #define ASN1_R_EXPECTING_A_BIT_STRING                   116
 #define ASN1_R_EXPECTING_A_BOOLEAN                      117
+#define ASN1_R_EXPECTING_A_GENERALIZEDTIME              151
+#define ASN1_R_EXPECTING_A_TIME                                 152
 #define ASN1_R_EXPECTING_A_UTCTIME                      118
 #define ASN1_R_FIRST_NUM_TOO_LARGE                      119
+#define ASN1_R_GENERALIZEDTIME_TOO_LONG                         153
 #define ASN1_R_HEADER_TOO_LONG                          120
 #define ASN1_R_INVALID_DIGIT                            121
 #define ASN1_R_INVALID_SEPARATOR                        122

diff --git a/crypto/asn1/asn1.h b/crypto/asn1/asn1.h
index a8fa68c4ca64f4d99c0fa1f67cd366a1c0972ae3..7d925a67331d8b9385b5df15141cc378d7756ffe 100644 (file)
--- a/crypto/asn1/asn1.h
+++ b/crypto/asn1/asn1.h
@@ -662,6 +662,7 @@ ASN1_BMPSTRING *d2i_ASN1_BMPSTRING();
 #define ASN1_F_ASN1_D2I_BIO                             104
 #define ASN1_F_ASN1_D2I_FP                              105
 #define ASN1_F_ASN1_DUP                                         106
+#define ASN1_F_ASN1_GENERALIZEDTIME_NEW                         222
 #define ASN1_F_ASN1_GET_OBJECT                          107
 #define ASN1_F_ASN1_HEADER_NEW                          108
 #define ASN1_F_ASN1_I2D_BIO                             109
@@ -682,12 +683,14 @@ ASN1_BMPSTRING *d2i_ASN1_BMPSTRING();
 #define ASN1_F_D2I_ASN1_BMPSTRING                       124
 #define ASN1_F_D2I_ASN1_BOOLEAN                                 125
 #define ASN1_F_D2I_ASN1_BYTES                           126
+#define ASN1_F_D2I_ASN1_GENERALIZEDTIME                         223
 #define ASN1_F_D2I_ASN1_HEADER                          127
 #define ASN1_F_D2I_ASN1_INTEGER                                 128
 #define ASN1_F_D2I_ASN1_OBJECT                          129
 #define ASN1_F_D2I_ASN1_OCTET_STRING                    130
 #define ASN1_F_D2I_ASN1_PRINT_TYPE                      131
 #define ASN1_F_D2I_ASN1_SET                             132
+#define ASN1_F_D2I_ASN1_TIME                            224
 #define ASN1_F_D2I_ASN1_TYPE                            133
 #define ASN1_F_D2I_ASN1_TYPE_BYTES                      134
 #define ASN1_F_D2I_ASN1_UTCTIME                                 135
@@ -732,6 +735,7 @@ ASN1_BMPSTRING *d2i_ASN1_BMPSTRING();
 #define ASN1_F_D2I_X509_SIG                             174
 #define ASN1_F_D2I_X509_VAL                             175
 #define ASN1_F_I2D_ASN1_HEADER                          176
+#define ASN1_F_I2D_ASN1_TIME                            225
 #define ASN1_F_I2D_DHPARAMS                             177
 #define ASN1_F_I2D_DSAPARAMS                            178
 #define ASN1_F_I2D_DSAPRIVATEKEY                        179
@@ -797,8 +801,11 @@ ASN1_BMPSTRING *d2i_ASN1_BMPSTRING();
 #define ASN1_R_EXPECTING_AN_OCTET_STRING                115
 #define ASN1_R_EXPECTING_A_BIT_STRING                   116
 #define ASN1_R_EXPECTING_A_BOOLEAN                      117
+#define ASN1_R_EXPECTING_A_GENERALIZEDTIME              151
+#define ASN1_R_EXPECTING_A_TIME                                 152
 #define ASN1_R_EXPECTING_A_UTCTIME                      118
 #define ASN1_R_FIRST_NUM_TOO_LARGE                      119
+#define ASN1_R_GENERALIZEDTIME_TOO_LONG                         153
 #define ASN1_R_HEADER_TOO_LONG                          120
 #define ASN1_R_INVALID_DIGIT                            121
 #define ASN1_R_INVALID_SEPARATOR                        122

diff --git a/crypto/asn1/asn1_err.c b/crypto/asn1/asn1_err.c
index b7818f8477032e62b2014007a3111a79735da911..e36e0ed64dbdd1be2d91a3feff892d20b5cea6da 100644 (file)
--- a/crypto/asn1/asn1_err.c
+++ b/crypto/asn1/asn1_err.c
@@ -70,6 +70,7 @@ static ERR_STRING_DATA ASN1_str_functs[]=
 {ERR_PACK(0,ASN1_F_ASN1_D2I_BIO,0),    "ASN1_d2i_bio"},
 {ERR_PACK(0,ASN1_F_ASN1_D2I_FP,0),     "ASN1_d2i_fp"},
 {ERR_PACK(0,ASN1_F_ASN1_DUP,0),        "ASN1_dup"},
+{ERR_PACK(0,ASN1_F_ASN1_GENERALIZEDTIME_NEW,0),        "ASN1_GENERALIZEDTIME_NEW"},
 {ERR_PACK(0,ASN1_F_ASN1_GET_OBJECT,0), "ASN1_get_object"},
 {ERR_PACK(0,ASN1_F_ASN1_HEADER_NEW,0), "ASN1_HEADER_new"},
 {ERR_PACK(0,ASN1_F_ASN1_I2D_BIO,0),    "ASN1_i2d_bio"},
@@ -90,12 +91,14 @@ static ERR_STRING_DATA ASN1_str_functs[]=
 {ERR_PACK(0,ASN1_F_D2I_ASN1_BMPSTRING,0),      "d2i_ASN1_BMPSTRING"},
 {ERR_PACK(0,ASN1_F_D2I_ASN1_BOOLEAN,0),        "d2i_ASN1_BOOLEAN"},
 {ERR_PACK(0,ASN1_F_D2I_ASN1_BYTES,0),  "d2i_ASN1_bytes"},
+{ERR_PACK(0,ASN1_F_D2I_ASN1_GENERALIZEDTIME,0),        "d2i_ASN1_GENERALIZEDTIME"},
 {ERR_PACK(0,ASN1_F_D2I_ASN1_HEADER,0), "d2i_ASN1_HEADER"},
 {ERR_PACK(0,ASN1_F_D2I_ASN1_INTEGER,0),        "d2i_ASN1_INTEGER"},
 {ERR_PACK(0,ASN1_F_D2I_ASN1_OBJECT,0), "d2i_ASN1_OBJECT"},
 {ERR_PACK(0,ASN1_F_D2I_ASN1_OCTET_STRING,0),   "d2i_ASN1_OCTET_STRING"},
 {ERR_PACK(0,ASN1_F_D2I_ASN1_PRINT_TYPE,0),     "D2I_ASN1_PRINT_TYPE"},
 {ERR_PACK(0,ASN1_F_D2I_ASN1_SET,0),    "d2i_ASN1_SET"},
+{ERR_PACK(0,ASN1_F_D2I_ASN1_TIME,0),   "d2i_ASN1_TIME"},
 {ERR_PACK(0,ASN1_F_D2I_ASN1_TYPE,0),   "d2i_ASN1_TYPE"},
 {ERR_PACK(0,ASN1_F_D2I_ASN1_TYPE_BYTES,0),     "d2i_ASN1_type_bytes"},
 {ERR_PACK(0,ASN1_F_D2I_ASN1_UTCTIME,0),        "d2i_ASN1_UTCTIME"},
@@ -140,6 +143,7 @@ static ERR_STRING_DATA ASN1_str_functs[]=
 {ERR_PACK(0,ASN1_F_D2I_X509_SIG,0),    "D2I_X509_SIG"},
 {ERR_PACK(0,ASN1_F_D2I_X509_VAL,0),    "D2I_X509_VAL"},
 {ERR_PACK(0,ASN1_F_I2D_ASN1_HEADER,0), "i2d_ASN1_HEADER"},
+{ERR_PACK(0,ASN1_F_I2D_ASN1_TIME,0),   "i2d_ASN1_TIME"},
 {ERR_PACK(0,ASN1_F_I2D_DHPARAMS,0),    "I2D_DHPARAMS"},
 {ERR_PACK(0,ASN1_F_I2D_DSAPARAMS,0),   "I2D_DSAPARAMS"},
 {ERR_PACK(0,ASN1_F_I2D_DSAPRIVATEKEY,0),       "I2D_DSAPRIVATEKEY"},
@@ -208,8 +212,11 @@ static ERR_STRING_DATA ASN1_str_reasons[]=
 {ASN1_R_EXPECTING_AN_OCTET_STRING        ,"expecting an octet string"},
 {ASN1_R_EXPECTING_A_BIT_STRING           ,"expecting a bit string"},
 {ASN1_R_EXPECTING_A_BOOLEAN              ,"expecting a boolean"},
+{ASN1_R_EXPECTING_A_GENERALIZEDTIME      ,"expecting a generalizedtime"},
+{ASN1_R_EXPECTING_A_TIME                 ,"expecting a time"},
 {ASN1_R_EXPECTING_A_UTCTIME              ,"expecting a utctime"},
 {ASN1_R_FIRST_NUM_TOO_LARGE              ,"first num too large"},
+{ASN1_R_GENERALIZEDTIME_TOO_LONG         ,"generalizedtime too long"},
 {ASN1_R_HEADER_TOO_LONG                  ,"header too long"},
 {ASN1_R_INVALID_DIGIT                    ,"invalid digit"},
 {ASN1_R_INVALID_SEPARATOR                ,"invalid separator"},

diff --git a/crypto/x509/x509.err b/crypto/x509/x509.err
index 8d0862d7d1d9531a29442b24f9339ec9dfea954c..c81001ae371821f34826e713cbbcf0006c112884 100644 (file)
--- a/crypto/x509/x509.err
+++ b/crypto/x509/x509.err
@@ -34,6 +34,7 @@
 #define X509_R_BAD_X509_FILETYPE                        100
 #define X509_R_CERT_ALREADY_IN_HASH_TABLE               101
 #define X509_R_ERR_ASN1_LIB                             102
+#define X509_R_INVALID_DIRECTORY                        113
 #define X509_R_LOADING_CERT_DIR                                 103
 #define X509_R_LOADING_DEFAULTS                                 104
 #define X509_R_NO_CERT_SET_FOR_US_TO_VERIFY             105

diff --git a/crypto/x509/x509.h b/crypto/x509/x509.h
index 4ae05bc0dee025f0503891047e1bfe89556a4989..b010de1fc76ace3356b6c802b8c7acca3fa5aa0d 100644 (file)
--- a/crypto/x509/x509.h
+++ b/crypto/x509/x509.h
@@ -1148,6 +1148,7 @@ X509 *X509_find_by_subject();
 #define X509_R_BAD_X509_FILETYPE                        100
 #define X509_R_CERT_ALREADY_IN_HASH_TABLE               101
 #define X509_R_ERR_ASN1_LIB                             102
+#define X509_R_INVALID_DIRECTORY                        113
 #define X509_R_LOADING_CERT_DIR                                 103
 #define X509_R_LOADING_DEFAULTS                                 104
 #define X509_R_NO_CERT_SET_FOR_US_TO_VERIFY             105

diff --git a/crypto/x509/x509_err.c b/crypto/x509/x509_err.c
index 0c7e30b2c9757f48631f248668eab2fada4a89c5..353b60dcc9717a06c92b717f5de6f735cf0396c9 100644 (file)
--- a/crypto/x509/x509_err.c
+++ b/crypto/x509/x509_err.c
@@ -99,6 +99,7 @@ static ERR_STRING_DATA X509_str_reasons[]=
 {X509_R_BAD_X509_FILETYPE                ,"bad x509 filetype"},
 {X509_R_CERT_ALREADY_IN_HASH_TABLE       ,"cert already in hash table"},
 {X509_R_ERR_ASN1_LIB                     ,"err asn1 lib"},
+{X509_R_INVALID_DIRECTORY                ,"invalid directory"},
 {X509_R_LOADING_CERT_DIR                 ,"loading cert dir"},
 {X509_R_LOADING_DEFAULTS                 ,"loading defaults"},
 {X509_R_NO_CERT_SET_FOR_US_TO_VERIFY     ,"no cert set for us to verify"},