← Back to branch summary

~ubuntu-branches/ubuntu/gutsy/openssl/gutsy-security

« back to all changes in this revision

Viewing changes to crypto/x509v3/v3err.c

  • Committer: Bazaar Package Importer
  • Author(s): Kurt Roeckx
  • Date: 2007-03-10 17:11:46 UTC
  • mfrom: (1.1.5 upstream)
  • Revision ID: james.westby@ubuntu.com-20070310171146-ekahy2avht7qdc4f
Tags: 0.9.8e-4
http://bugs.debian.org/414283
openssl should depend on libssl0.9.8 0.9.8e-1 since it 
uses some of the defines that changed to functions.
Other things build against libssl or libcrypto shouldn't 
have this problem since they use the old headers.
(Closes: #414283)

Show diffs side-by-side

added added

removed removed

Lines of Context:
crypto/x509v3/v3err.c
70
70
 
71
71
static ERR_STRING_DATA X509V3_str_functs[]=
72
72
        {
 
73
{ERR_FUNC(X509V3_F_ASIDENTIFIERCHOICE_CANONIZE),        "ASIDENTIFIERCHOICE_CANONIZE"},
 
74
{ERR_FUNC(X509V3_F_ASIDENTIFIERCHOICE_IS_CANONICAL),    "ASIDENTIFIERCHOICE_IS_CANONICAL"},
73
75
{ERR_FUNC(X509V3_F_COPY_EMAIL), "COPY_EMAIL"},
74
76
{ERR_FUNC(X509V3_F_COPY_ISSUER),        "COPY_ISSUER"},
75
77
{ERR_FUNC(X509V3_F_DO_DIRNAME), "DO_DIRNAME"},
94
96
{ERR_FUNC(X509V3_F_S2I_ASN1_SKEY_ID),   "S2I_ASN1_SKEY_ID"},
95
97
{ERR_FUNC(X509V3_F_S2I_SKEY_ID),        "S2I_SKEY_ID"},
96
98
{ERR_FUNC(X509V3_F_STRING_TO_HEX),      "string_to_hex"},
97
 
{ERR_FUNC(X509V3_F_SXNET_ADD_ID_ASC),   "SXNET_ADD_ID_ASC"},
 
99
{ERR_FUNC(X509V3_F_SXNET_ADD_ID_ASC),   "SXNET_add_id_asc"},
98
100
{ERR_FUNC(X509V3_F_SXNET_ADD_ID_INTEGER),       "SXNET_add_id_INTEGER"},
99
101
{ERR_FUNC(X509V3_F_SXNET_ADD_ID_ULONG), "SXNET_add_id_ulong"},
100
102
{ERR_FUNC(X509V3_F_SXNET_GET_ID_ASC),   "SXNET_get_id_asc"},
101
103
{ERR_FUNC(X509V3_F_SXNET_GET_ID_ULONG), "SXNET_get_id_ulong"},
102
 
{ERR_FUNC(X509V3_F_V2I_ASN1_BIT_STRING),        "V2I_ASN1_BIT_STRING"},
 
104
{ERR_FUNC(X509V3_F_V2I_ASIDENTIFIERS),  "V2I_ASIDENTIFIERS"},
 
105
{ERR_FUNC(X509V3_F_V2I_ASN1_BIT_STRING),        "v2i_ASN1_BIT_STRING"},
103
106
{ERR_FUNC(X509V3_F_V2I_AUTHORITY_INFO_ACCESS),  "V2I_AUTHORITY_INFO_ACCESS"},
104
107
{ERR_FUNC(X509V3_F_V2I_AUTHORITY_KEYID),        "V2I_AUTHORITY_KEYID"},
105
108
{ERR_FUNC(X509V3_F_V2I_BASIC_CONSTRAINTS),      "V2I_BASIC_CONSTRAINTS"},
107
110
{ERR_FUNC(X509V3_F_V2I_EXTENDED_KEY_USAGE),     "V2I_EXTENDED_KEY_USAGE"},
108
111
{ERR_FUNC(X509V3_F_V2I_GENERAL_NAMES),  "v2i_GENERAL_NAMES"},
109
112
{ERR_FUNC(X509V3_F_V2I_GENERAL_NAME_EX),        "v2i_GENERAL_NAME_ex"},
 
113
{ERR_FUNC(X509V3_F_V2I_IPADDRBLOCKS),   "V2I_IPADDRBLOCKS"},
110
114
{ERR_FUNC(X509V3_F_V2I_ISSUER_ALT),     "V2I_ISSUER_ALT"},
111
115
{ERR_FUNC(X509V3_F_V2I_NAME_CONSTRAINTS),       "V2I_NAME_CONSTRAINTS"},
112
116
{ERR_FUNC(X509V3_F_V2I_POLICY_CONSTRAINTS),     "V2I_POLICY_CONSTRAINTS"},
113
117
{ERR_FUNC(X509V3_F_V2I_POLICY_MAPPINGS),        "V2I_POLICY_MAPPINGS"},
114
118
{ERR_FUNC(X509V3_F_V2I_SUBJECT_ALT),    "V2I_SUBJECT_ALT"},
 
119
{ERR_FUNC(X509V3_F_V3_ADDR_VALIDATE_PATH_INTERNAL),     "V3_ADDR_VALIDATE_PATH_INTERNAL"},
115
120
{ERR_FUNC(X509V3_F_V3_GENERIC_EXTENSION),       "V3_GENERIC_EXTENSION"},
116
121
{ERR_FUNC(X509V3_F_X509V3_ADD1_I2D),    "X509V3_add1_i2d"},
117
122
{ERR_FUNC(X509V3_F_X509V3_ADD_VALUE),   "X509V3_add_value"},
120
125
{ERR_FUNC(X509V3_F_X509V3_EXT_CONF),    "X509V3_EXT_conf"},
121
126
{ERR_FUNC(X509V3_F_X509V3_EXT_I2D),     "X509V3_EXT_i2d"},
122
127
{ERR_FUNC(X509V3_F_X509V3_EXT_NCONF),   "X509V3_EXT_nconf"},
123
 
{ERR_FUNC(X509V3_F_X509V3_GET_SECTION), "X509V3_GET_SECTION"},
 
128
{ERR_FUNC(X509V3_F_X509V3_GET_SECTION), "X509V3_get_section"},
124
129
{ERR_FUNC(X509V3_F_X509V3_GET_STRING),  "X509V3_get_string"},
125
130
{ERR_FUNC(X509V3_F_X509V3_GET_VALUE_BOOL),      "X509V3_get_value_bool"},
126
 
{ERR_FUNC(X509V3_F_X509V3_PARSE_LIST),  "X509V3_PARSE_LIST"},
 
131
{ERR_FUNC(X509V3_F_X509V3_PARSE_LIST),  "X509V3_parse_list"},
127
132
{ERR_FUNC(X509V3_F_X509_PURPOSE_ADD),   "X509_PURPOSE_add"},
128
133
{ERR_FUNC(X509V3_F_X509_PURPOSE_SET),   "X509_PURPOSE_set"},
129
134
{0,NULL}
149
154
{ERR_REASON(X509V3_R_ILLEGAL_EMPTY_EXTENSION),"illegal empty extension"},
150
155
{ERR_REASON(X509V3_R_ILLEGAL_HEX_DIGIT)  ,"illegal hex digit"},
151
156
{ERR_REASON(X509V3_R_INCORRECT_POLICY_SYNTAX_TAG),"incorrect policy syntax tag"},
 
157
{ERR_REASON(X509V3_R_INVALID_ASNUMBER)   ,"invalid asnumber"},
 
158
{ERR_REASON(X509V3_R_INVALID_ASRANGE)    ,"invalid asrange"},
152
159
{ERR_REASON(X509V3_R_INVALID_BOOLEAN_STRING),"invalid boolean string"},
153
160
{ERR_REASON(X509V3_R_INVALID_EXTENSION_STRING),"invalid extension string"},
 
161
{ERR_REASON(X509V3_R_INVALID_INHERITANCE),"invalid inheritance"},
 
162
{ERR_REASON(X509V3_R_INVALID_IPADDRESS)  ,"invalid ipaddress"},
154
163
{ERR_REASON(X509V3_R_INVALID_NAME)       ,"invalid name"},
155
164
{ERR_REASON(X509V3_R_INVALID_NULL_ARGUMENT),"invalid null argument"},
156
165
{ERR_REASON(X509V3_R_INVALID_NULL_NAME)  ,"invalid null name"},
162
171
{ERR_REASON(X509V3_R_INVALID_POLICY_IDENTIFIER),"invalid policy identifier"},
163
172
{ERR_REASON(X509V3_R_INVALID_PROXY_POLICY_SETTING),"invalid proxy policy setting"},
164
173
{ERR_REASON(X509V3_R_INVALID_PURPOSE)    ,"invalid purpose"},
 
174
{ERR_REASON(X509V3_R_INVALID_SAFI)       ,"invalid safi"},
165
175
{ERR_REASON(X509V3_R_INVALID_SECTION)    ,"invalid section"},
166
176
{ERR_REASON(X509V3_R_INVALID_SYNTAX)     ,"invalid syntax"},
167
177
{ERR_REASON(X509V3_R_ISSUER_DECODE_ERROR),"issuer decode error"},
198
208
 
199
209
void ERR_load_X509V3_strings(void)
200
210
        {
201
 
        static int init=1;
 
211
#ifndef OPENSSL_NO_ERR
202
212
 
203
 
        if (init)
 
213
        if (ERR_func_error_string(X509V3_str_functs[0].error) == NULL)
204
214
                {
205
 
                init=0;
206
 
#ifndef OPENSSL_NO_ERR
207
215
                ERR_load_strings(0,X509V3_str_functs);
208
216
                ERR_load_strings(0,X509V3_str_reasons);
209
 
#endif
210
 
 
211
217
                }
 
218
#endif
212
219
        }