~ubuntu-branches/ubuntu/lucid/openssl/lucid-security

« back to all changes in this revision

Viewing changes to crypto/asn1/asn1_err.c

  • Committer: Bazaar Package Importer
  • Author(s): Kurt Roeckx
  • Date: 2007-03-10 17:11:46 UTC
  • mto: (11.1.1 lenny)
  • mto: This revision was merged to the branch mainline in revision 13.
  • Revision ID: james.westby@ubuntu.com-20070310171146-uo85b7ii5pi1unm2
Tags: upstream-0.9.8e
ImportĀ upstreamĀ versionĀ 0.9.8e

Show diffs side-by-side

added added

removed removed

Lines of Context:
123
123
{ERR_FUNC(ASN1_F_ASN1_TEMPLATE_EX_D2I), "ASN1_TEMPLATE_EX_D2I"},
124
124
{ERR_FUNC(ASN1_F_ASN1_TEMPLATE_NEW),    "ASN1_TEMPLATE_NEW"},
125
125
{ERR_FUNC(ASN1_F_ASN1_TEMPLATE_NOEXP_D2I),      "ASN1_TEMPLATE_NOEXP_D2I"},
126
 
{ERR_FUNC(ASN1_F_ASN1_TIME_SET),        "ASN1_TIME_SET"},
 
126
{ERR_FUNC(ASN1_F_ASN1_TIME_SET),        "ASN1_TIME_set"},
127
127
{ERR_FUNC(ASN1_F_ASN1_TYPE_GET_INT_OCTETSTRING),        "ASN1_TYPE_get_int_octetstring"},
128
128
{ERR_FUNC(ASN1_F_ASN1_TYPE_GET_OCTETSTRING),    "ASN1_TYPE_get_octetstring"},
129
129
{ERR_FUNC(ASN1_F_ASN1_UNPACK_STRING),   "ASN1_unpack_string"},
168
168
{ERR_FUNC(ASN1_F_OID_MODULE_INIT),      "OID_MODULE_INIT"},
169
169
{ERR_FUNC(ASN1_F_PARSE_TAGGING),        "PARSE_TAGGING"},
170
170
{ERR_FUNC(ASN1_F_PKCS5_PBE2_SET),       "PKCS5_pbe2_set"},
171
 
{ERR_FUNC(ASN1_F_PKCS5_PBE_SET),        "PKCS5_PBE_SET"},
 
171
{ERR_FUNC(ASN1_F_PKCS5_PBE_SET),        "PKCS5_pbe_set"},
172
172
{ERR_FUNC(ASN1_F_X509_CINF_NEW),        "X509_CINF_NEW"},
173
 
{ERR_FUNC(ASN1_F_X509_CRL_ADD0_REVOKED),        "X509_CRL_ADD0_REVOKED"},
174
 
{ERR_FUNC(ASN1_F_X509_INFO_NEW),        "X509_INFO_NEW"},
 
173
{ERR_FUNC(ASN1_F_X509_CRL_ADD0_REVOKED),        "X509_CRL_add0_revoked"},
 
174
{ERR_FUNC(ASN1_F_X509_INFO_NEW),        "X509_INFO_new"},
175
175
{ERR_FUNC(ASN1_F_X509_NAME_ENCODE),     "X509_NAME_ENCODE"},
176
176
{ERR_FUNC(ASN1_F_X509_NAME_EX_D2I),     "X509_NAME_EX_D2I"},
177
177
{ERR_FUNC(ASN1_F_X509_NAME_EX_NEW),     "X509_NAME_EX_NEW"},
287
287
 
288
288
void ERR_load_ASN1_strings(void)
289
289
        {
290
 
        static int init=1;
 
290
#ifndef OPENSSL_NO_ERR
291
291
 
292
 
        if (init)
 
292
        if (ERR_func_error_string(ASN1_str_functs[0].error) == NULL)
293
293
                {
294
 
                init=0;
295
 
#ifndef OPENSSL_NO_ERR
296
294
                ERR_load_strings(0,ASN1_str_functs);
297
295
                ERR_load_strings(0,ASN1_str_reasons);
298
 
#endif
299
 
 
300
296
                }
 
297
#endif
301
298
        }