Commit b8fb5989 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Rebuild error source files. 



Rebuild error source files: the new mkerr.pl functionality will now
pick up and translate static function names properly.

Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
parent 525cc5e7

crypto/asn1/asn1_err.c

+35 −35
Original line number Diff line number Diff line
@@ -74,28 +74,28 @@ static ERR_STRING_DATA ASN1_str_functs[] = { 
    {ERR_FUNC(ASN1_F_A2I_ASN1_ENUMERATED), "a2i_ASN1_ENUMERATED"},

    {ERR_FUNC(ASN1_F_A2I_ASN1_INTEGER), "a2i_ASN1_INTEGER"},

    {ERR_FUNC(ASN1_F_A2I_ASN1_STRING), "a2i_ASN1_STRING"},

    {ERR_FUNC(ASN1_F_APPEND_EXP), "APPEND_EXP"},

    {ERR_FUNC(ASN1_F_APPEND_EXP), "append_exp"},

    {ERR_FUNC(ASN1_F_ASN1_BIT_STRING_SET_BIT), "ASN1_BIT_STRING_set_bit"},

    {ERR_FUNC(ASN1_F_ASN1_CB), "ASN1_CB"},

    {ERR_FUNC(ASN1_F_ASN1_CHECK_TLEN), "ASN1_CHECK_TLEN"},

    {ERR_FUNC(ASN1_F_ASN1_CB), "asn1_cb"},

    {ERR_FUNC(ASN1_F_ASN1_CHECK_TLEN), "asn1_check_tlen"},

    {ERR_FUNC(ASN1_F_ASN1_COLLATE_PRIMITIVE), "ASN1_COLLATE_PRIMITIVE"},

    {ERR_FUNC(ASN1_F_ASN1_COLLECT), "ASN1_COLLECT"},

    {ERR_FUNC(ASN1_F_ASN1_D2I_EX_PRIMITIVE), "ASN1_D2I_EX_PRIMITIVE"},

    {ERR_FUNC(ASN1_F_ASN1_COLLECT), "asn1_collect"},

    {ERR_FUNC(ASN1_F_ASN1_D2I_EX_PRIMITIVE), "asn1_d2i_ex_primitive"},

    {ERR_FUNC(ASN1_F_ASN1_D2I_FP), "ASN1_d2i_fp"},

    {ERR_FUNC(ASN1_F_ASN1_D2I_READ_BIO), "ASN1_D2I_READ_BIO"},

    {ERR_FUNC(ASN1_F_ASN1_D2I_READ_BIO), "asn1_d2i_read_bio"},

    {ERR_FUNC(ASN1_F_ASN1_DIGEST), "ASN1_digest"},

    {ERR_FUNC(ASN1_F_ASN1_DO_ADB), "ASN1_DO_ADB"},

    {ERR_FUNC(ASN1_F_ASN1_DO_ADB), "asn1_do_adb"},

    {ERR_FUNC(ASN1_F_ASN1_DUP), "ASN1_dup"},

    {ERR_FUNC(ASN1_F_ASN1_ENUMERATED_SET), "ASN1_ENUMERATED_set"},

    {ERR_FUNC(ASN1_F_ASN1_ENUMERATED_TO_BN), "ASN1_ENUMERATED_to_BN"},

    {ERR_FUNC(ASN1_F_ASN1_EX_C2I), "ASN1_EX_C2I"},

    {ERR_FUNC(ASN1_F_ASN1_FIND_END), "ASN1_FIND_END"},

    {ERR_FUNC(ASN1_F_ASN1_EX_C2I), "asn1_ex_c2i"},

    {ERR_FUNC(ASN1_F_ASN1_FIND_END), "asn1_find_end"},

    {ERR_FUNC(ASN1_F_ASN1_GENERALIZEDTIME_ADJ), "ASN1_GENERALIZEDTIME_adj"},

    {ERR_FUNC(ASN1_F_ASN1_GENERALIZEDTIME_SET), "ASN1_GENERALIZEDTIME_set"},

    {ERR_FUNC(ASN1_F_ASN1_GENERATE_V3), "ASN1_generate_v3"},

    {ERR_FUNC(ASN1_F_ASN1_GET_INT64), "ASN1_GET_INT64"},

    {ERR_FUNC(ASN1_F_ASN1_GET_INT64), "asn1_get_int64"},

    {ERR_FUNC(ASN1_F_ASN1_GET_OBJECT), "ASN1_get_object"},

    {ERR_FUNC(ASN1_F_ASN1_GET_UINT64), "ASN1_GET_UINT64"},

    {ERR_FUNC(ASN1_F_ASN1_GET_UINT64), "asn1_get_uint64"},

    {ERR_FUNC(ASN1_F_ASN1_HEADER_NEW), "ASN1_HEADER_NEW"},

    {ERR_FUNC(ASN1_F_ASN1_I2D_BIO), "ASN1_i2d_bio"},

    {ERR_FUNC(ASN1_F_ASN1_I2D_FP), "ASN1_i2d_fp"},
@@ -104,7 +104,7 @@ static ERR_STRING_DATA ASN1_str_functs[] = { 
    {ERR_FUNC(ASN1_F_ASN1_ITEM_D2I_FP), "ASN1_item_d2i_fp"},

    {ERR_FUNC(ASN1_F_ASN1_ITEM_DUP), "ASN1_item_dup"},

    {ERR_FUNC(ASN1_F_ASN1_ITEM_EMBED_D2I), "asn1_item_embed_d2i"},

    {ERR_FUNC(ASN1_F_ASN1_ITEM_EMBED_NEW), "ASN1_ITEM_EMBED_NEW"},

    {ERR_FUNC(ASN1_F_ASN1_ITEM_EMBED_NEW), "asn1_item_embed_new"},

    {ERR_FUNC(ASN1_F_ASN1_ITEM_I2D_BIO), "ASN1_item_i2d_bio"},

    {ERR_FUNC(ASN1_F_ASN1_ITEM_I2D_FP), "ASN1_item_i2d_fp"},

    {ERR_FUNC(ASN1_F_ASN1_ITEM_PACK), "ASN1_item_pack"},
@@ -114,7 +114,7 @@ static ERR_STRING_DATA ASN1_str_functs[] = { 
    {ERR_FUNC(ASN1_F_ASN1_ITEM_VERIFY), "ASN1_item_verify"},

    {ERR_FUNC(ASN1_F_ASN1_MBSTRING_NCOPY), "ASN1_mbstring_ncopy"},

    {ERR_FUNC(ASN1_F_ASN1_OBJECT_NEW), "ASN1_OBJECT_new"},

    {ERR_FUNC(ASN1_F_ASN1_OUTPUT_DATA), "ASN1_OUTPUT_DATA"},

    {ERR_FUNC(ASN1_F_ASN1_OUTPUT_DATA), "asn1_output_data"},

    {ERR_FUNC(ASN1_F_ASN1_PACK_STRING), "ASN1_pack_string"},

    {ERR_FUNC(ASN1_F_ASN1_PCTX_NEW), "ASN1_PCTX_new"},

    {ERR_FUNC(ASN1_F_ASN1_PKCS5_PBE_SET), "ASN1_PKCS5_PBE_SET"},
@@ -122,16 +122,16 @@ static ERR_STRING_DATA ASN1_str_functs[] = { 
    {ERR_FUNC(ASN1_F_ASN1_SEQ_PACK), "ASN1_seq_pack"},

    {ERR_FUNC(ASN1_F_ASN1_SEQ_UNPACK), "ASN1_seq_unpack"},

    {ERR_FUNC(ASN1_F_ASN1_SIGN), "ASN1_sign"},

    {ERR_FUNC(ASN1_F_ASN1_STR2TYPE), "ASN1_STR2TYPE"},

    {ERR_FUNC(ASN1_F_ASN1_STRING_GET_INT64), "ASN1_STRING_GET_INT64"},

    {ERR_FUNC(ASN1_F_ASN1_STRING_GET_UINT64), "ASN1_STRING_GET_UINT64"},

    {ERR_FUNC(ASN1_F_ASN1_STR2TYPE), "asn1_str2type"},

    {ERR_FUNC(ASN1_F_ASN1_STRING_GET_INT64), "asn1_string_get_int64"},

    {ERR_FUNC(ASN1_F_ASN1_STRING_GET_UINT64), "asn1_string_get_uint64"},

    {ERR_FUNC(ASN1_F_ASN1_STRING_SET), "ASN1_STRING_set"},

    {ERR_FUNC(ASN1_F_ASN1_STRING_TABLE_ADD), "ASN1_STRING_TABLE_add"},

    {ERR_FUNC(ASN1_F_ASN1_STRING_TO_BN), "ASN1_STRING_TO_BN"},

    {ERR_FUNC(ASN1_F_ASN1_STRING_TO_BN), "asn1_string_to_bn"},

    {ERR_FUNC(ASN1_F_ASN1_STRING_TYPE_NEW), "ASN1_STRING_type_new"},

    {ERR_FUNC(ASN1_F_ASN1_TEMPLATE_EX_D2I), "ASN1_TEMPLATE_EX_D2I"},

    {ERR_FUNC(ASN1_F_ASN1_TEMPLATE_NEW), "ASN1_TEMPLATE_NEW"},

    {ERR_FUNC(ASN1_F_ASN1_TEMPLATE_NOEXP_D2I), "ASN1_TEMPLATE_NOEXP_D2I"},

    {ERR_FUNC(ASN1_F_ASN1_TEMPLATE_EX_D2I), "asn1_template_ex_d2i"},

    {ERR_FUNC(ASN1_F_ASN1_TEMPLATE_NEW), "asn1_template_new"},

    {ERR_FUNC(ASN1_F_ASN1_TEMPLATE_NOEXP_D2I), "asn1_template_noexp_d2i"},

    {ERR_FUNC(ASN1_F_ASN1_TIME_ADJ), "ASN1_TIME_adj"},

    {ERR_FUNC(ASN1_F_ASN1_TIME_SET), "ASN1_TIME_set"},

    {ERR_FUNC(ASN1_F_ASN1_TYPE_GET_INT_OCTETSTRING),
@@ -141,18 +141,18 @@ static ERR_STRING_DATA ASN1_str_functs[] = { 
    {ERR_FUNC(ASN1_F_ASN1_UTCTIME_ADJ), "ASN1_UTCTIME_adj"},

    {ERR_FUNC(ASN1_F_ASN1_UTCTIME_SET), "ASN1_UTCTIME_set"},

    {ERR_FUNC(ASN1_F_ASN1_VERIFY), "ASN1_verify"},

    {ERR_FUNC(ASN1_F_B64_READ_ASN1), "B64_READ_ASN1"},

    {ERR_FUNC(ASN1_F_B64_WRITE_ASN1), "B64_WRITE_ASN1"},

    {ERR_FUNC(ASN1_F_B64_READ_ASN1), "b64_read_asn1"},

    {ERR_FUNC(ASN1_F_B64_WRITE_ASN1), "B64_write_ASN1"},

    {ERR_FUNC(ASN1_F_BIO_NEW_NDEF), "BIO_new_NDEF"},

    {ERR_FUNC(ASN1_F_BITSTR_CB), "BITSTR_CB"},

    {ERR_FUNC(ASN1_F_BITSTR_CB), "bitstr_cb"},

    {ERR_FUNC(ASN1_F_BN_TO_ASN1_ENUMERATED), "BN_to_ASN1_ENUMERATED"},

    {ERR_FUNC(ASN1_F_BN_TO_ASN1_INTEGER), "BN_to_ASN1_INTEGER"},

    {ERR_FUNC(ASN1_F_BN_TO_ASN1_STRING), "BN_TO_ASN1_STRING"},

    {ERR_FUNC(ASN1_F_BN_TO_ASN1_STRING), "bn_to_asn1_string"},

    {ERR_FUNC(ASN1_F_C2I_ASN1_BIT_STRING), "c2i_ASN1_BIT_STRING"},

    {ERR_FUNC(ASN1_F_C2I_ASN1_INTEGER), "c2i_ASN1_INTEGER"},

    {ERR_FUNC(ASN1_F_C2I_ASN1_OBJECT), "c2i_ASN1_OBJECT"},

    {ERR_FUNC(ASN1_F_C2I_IBUF), "C2I_IBUF"},

    {ERR_FUNC(ASN1_F_COLLECT_DATA), "COLLECT_DATA"},

    {ERR_FUNC(ASN1_F_C2I_IBUF), "c2i_ibuf"},

    {ERR_FUNC(ASN1_F_COLLECT_DATA), "collect_data"},

    {ERR_FUNC(ASN1_F_D2I_ASN1_BIT_STRING), "D2I_ASN1_BIT_STRING"},

    {ERR_FUNC(ASN1_F_D2I_ASN1_BOOLEAN), "d2i_ASN1_BOOLEAN"},

    {ERR_FUNC(ASN1_F_D2I_ASN1_BYTES), "d2i_ASN1_bytes"},
@@ -172,7 +172,7 @@ static ERR_STRING_DATA ASN1_str_functs[] = { 
    {ERR_FUNC(ASN1_F_D2I_X509), "D2I_X509"},

    {ERR_FUNC(ASN1_F_D2I_X509_CINF), "D2I_X509_CINF"},

    {ERR_FUNC(ASN1_F_D2I_X509_PKEY), "d2i_X509_PKEY"},

    {ERR_FUNC(ASN1_F_DO_TCREATE), "DO_TCREATE"},

    {ERR_FUNC(ASN1_F_DO_TCREATE), "do_tcreate"},

    {ERR_FUNC(ASN1_F_I2D_ASN1_BIO_STREAM), "i2d_ASN1_bio_stream"},

    {ERR_FUNC(ASN1_F_I2D_ASN1_SET), "i2d_ASN1_SET"},

    {ERR_FUNC(ASN1_F_I2D_ASN1_TIME), "I2D_ASN1_TIME"},
@@ -181,24 +181,24 @@ static ERR_STRING_DATA ASN1_str_functs[] = { 
    {ERR_FUNC(ASN1_F_I2D_PRIVATEKEY), "i2d_PrivateKey"},

    {ERR_FUNC(ASN1_F_I2D_PUBLICKEY), "i2d_PublicKey"},

    {ERR_FUNC(ASN1_F_I2D_RSA_PUBKEY), "i2d_RSA_PUBKEY"},

    {ERR_FUNC(ASN1_F_LONG_C2I), "LONG_C2I"},

    {ERR_FUNC(ASN1_F_OID_MODULE_INIT), "OID_MODULE_INIT"},

    {ERR_FUNC(ASN1_F_PARSE_TAGGING), "PARSE_TAGGING"},

    {ERR_FUNC(ASN1_F_LONG_C2I), "long_c2i"},

    {ERR_FUNC(ASN1_F_OID_MODULE_INIT), "oid_module_init"},

    {ERR_FUNC(ASN1_F_PARSE_TAGGING), "parse_tagging"},

    {ERR_FUNC(ASN1_F_PKCS5_PBE2_SET_IV), "PKCS5_pbe2_set_iv"},

    {ERR_FUNC(ASN1_F_PKCS5_PBE2_SET_SCRYPT), "PKCS5_pbe2_set_scrypt"},

    {ERR_FUNC(ASN1_F_PKCS5_PBE_SET), "PKCS5_pbe_set"},

    {ERR_FUNC(ASN1_F_PKCS5_PBE_SET0_ALGOR), "PKCS5_pbe_set0_algor"},

    {ERR_FUNC(ASN1_F_PKCS5_PBKDF2_SET), "PKCS5_pbkdf2_set"},

    {ERR_FUNC(ASN1_F_PKCS5_SCRYPT_SET), "PKCS5_SCRYPT_SET"},

    {ERR_FUNC(ASN1_F_PKCS5_SCRYPT_SET), "pkcs5_scrypt_set"},

    {ERR_FUNC(ASN1_F_SMIME_READ_ASN1), "SMIME_read_ASN1"},

    {ERR_FUNC(ASN1_F_SMIME_TEXT), "SMIME_text"},

    {ERR_FUNC(ASN1_F_STBL_MODULE_INIT), "STBL_MODULE_INIT"},

    {ERR_FUNC(ASN1_F_STBL_MODULE_INIT), "stbl_module_init"},

    {ERR_FUNC(ASN1_F_X509_CINF_NEW), "X509_CINF_NEW"},

    {ERR_FUNC(ASN1_F_X509_CRL_ADD0_REVOKED), "X509_CRL_add0_revoked"},

    {ERR_FUNC(ASN1_F_X509_INFO_NEW), "X509_INFO_new"},

    {ERR_FUNC(ASN1_F_X509_NAME_ENCODE), "X509_NAME_ENCODE"},

    {ERR_FUNC(ASN1_F_X509_NAME_EX_D2I), "X509_NAME_EX_D2I"},

    {ERR_FUNC(ASN1_F_X509_NAME_EX_NEW), "X509_NAME_EX_NEW"},

    {ERR_FUNC(ASN1_F_X509_NAME_ENCODE), "x509_name_encode"},

    {ERR_FUNC(ASN1_F_X509_NAME_EX_D2I), "x509_name_ex_d2i"},

    {ERR_FUNC(ASN1_F_X509_NAME_EX_NEW), "x509_name_ex_new"},

    {ERR_FUNC(ASN1_F_X509_NEW), "X509_NEW"},

    {ERR_FUNC(ASN1_F_X509_PKEY_NEW), "X509_PKEY_new"},

    {0, NULL}

crypto/bio/bio_err.c

+11 −11
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ 
# define ERR_REASON(reason) ERR_PACK(ERR_LIB_BIO,0,reason)



static ERR_STRING_DATA BIO_str_functs[] = {

    {ERR_FUNC(BIO_F_ACPT_STATE), "ACPT_STATE"},

    {ERR_FUNC(BIO_F_ACPT_STATE), "acpt_state"},

    {ERR_FUNC(BIO_F_BIO_ACCEPT), "BIO_accept"},

    {ERR_FUNC(BIO_F_BIO_BER_GET_HEADER), "BIO_BER_GET_HEADER"},

    {ERR_FUNC(BIO_F_BIO_CALLBACK_CTRL), "BIO_callback_ctrl"},
@@ -80,7 +80,7 @@ static ERR_STRING_DATA BIO_str_functs[] = { 
    {ERR_FUNC(BIO_F_BIO_GET_ACCEPT_SOCKET), "BIO_get_accept_socket"},

    {ERR_FUNC(BIO_F_BIO_GET_HOST_IP), "BIO_get_host_ip"},

    {ERR_FUNC(BIO_F_BIO_GET_PORT), "BIO_get_port"},

    {ERR_FUNC(BIO_F_BIO_MAKE_PAIR), "BIO_MAKE_PAIR"},

    {ERR_FUNC(BIO_F_BIO_MAKE_PAIR), "bio_make_pair"},

    {ERR_FUNC(BIO_F_BIO_NEW), "BIO_new"},

    {ERR_FUNC(BIO_F_BIO_NEW_FILE), "BIO_new_file"},

    {ERR_FUNC(BIO_F_BIO_NEW_MEM_BUF), "BIO_new_mem_buf"},
@@ -92,16 +92,16 @@ static ERR_STRING_DATA BIO_str_functs[] = { 
    {ERR_FUNC(BIO_F_BIO_READ), "BIO_read"},

    {ERR_FUNC(BIO_F_BIO_SOCK_INIT), "BIO_sock_init"},

    {ERR_FUNC(BIO_F_BIO_WRITE), "BIO_write"},

    {ERR_FUNC(BIO_F_BUFFER_CTRL), "BUFFER_CTRL"},

    {ERR_FUNC(BIO_F_CONN_CTRL), "CONN_CTRL"},

    {ERR_FUNC(BIO_F_CONN_STATE), "CONN_STATE"},

    {ERR_FUNC(BIO_F_DGRAM_SCTP_READ), "DGRAM_SCTP_READ"},

    {ERR_FUNC(BIO_F_DGRAM_SCTP_WRITE), "DGRAM_SCTP_WRITE"},

    {ERR_FUNC(BIO_F_FILE_CTRL), "FILE_CTRL"},

    {ERR_FUNC(BIO_F_FILE_READ), "FILE_READ"},

    {ERR_FUNC(BIO_F_LINEBUFFER_CTRL), "LINEBUFFER_CTRL"},

    {ERR_FUNC(BIO_F_BUFFER_CTRL), "buffer_ctrl"},

    {ERR_FUNC(BIO_F_CONN_CTRL), "conn_ctrl"},

    {ERR_FUNC(BIO_F_CONN_STATE), "conn_state"},

    {ERR_FUNC(BIO_F_DGRAM_SCTP_READ), "dgram_sctp_read"},

    {ERR_FUNC(BIO_F_DGRAM_SCTP_WRITE), "dgram_sctp_write"},

    {ERR_FUNC(BIO_F_FILE_CTRL), "file_ctrl"},

    {ERR_FUNC(BIO_F_FILE_READ), "file_read"},

    {ERR_FUNC(BIO_F_LINEBUFFER_CTRL), "linebuffer_ctrl"},

    {ERR_FUNC(BIO_F_MEM_READ), "MEM_READ"},

    {ERR_FUNC(BIO_F_MEM_WRITE), "MEM_WRITE"},

    {ERR_FUNC(BIO_F_MEM_WRITE), "mem_write"},

    {ERR_FUNC(BIO_F_SSL_NEW), "SSL_new"},

    {ERR_FUNC(BIO_F_WSASTARTUP), "WSASTARTUP"},

    {0, NULL}

crypto/bn/bn_err.c

+2 −2
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ 
# define ERR_REASON(reason) ERR_PACK(ERR_LIB_BN,0,reason)



static ERR_STRING_DATA BN_str_functs[] = {

    {ERR_FUNC(BN_F_BNRAND), "BNRAND"},

    {ERR_FUNC(BN_F_BNRAND), "bnrand"},

    {ERR_FUNC(BN_F_BN_BLINDING_CONVERT_EX), "BN_BLINDING_convert_ex"},

    {ERR_FUNC(BN_F_BN_BLINDING_CREATE_PARAM), "BN_BLINDING_create_param"},

    {ERR_FUNC(BN_F_BN_BLINDING_INVERT_EX), "BN_BLINDING_invert_ex"},
@@ -87,7 +87,7 @@ static ERR_STRING_DATA BN_str_functs[] = { 
    {ERR_FUNC(BN_F_BN_DIV_RECP), "BN_div_recp"},

    {ERR_FUNC(BN_F_BN_EXP), "BN_exp"},

    {ERR_FUNC(BN_F_BN_EXPAND2), "bn_expand2"},

    {ERR_FUNC(BN_F_BN_EXPAND_INTERNAL), "BN_EXPAND_INTERNAL"},

    {ERR_FUNC(BN_F_BN_EXPAND_INTERNAL), "bn_expand_internal"},

    {ERR_FUNC(BN_F_BN_GENCB_NEW), "BN_GENCB_new"},

    {ERR_FUNC(BN_F_BN_GENERATE_DSA_NONCE), "BN_generate_dsa_nonce"},

    {ERR_FUNC(BN_F_BN_GENERATE_PRIME_EX), "BN_generate_prime_ex"},

crypto/buffer/buf_err.c

+1 −1
Original line number Diff line number Diff line 
/* crypto/buffer/buf_err.c */

/* ====================================================================

 * Copyright (c) 1999-2006 The OpenSSL Project.  All rights reserved.

 * Copyright (c) 1999-2015 The OpenSSL Project.  All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions

crypto/cms/cms_err.c

+18 −18
Original line number Diff line number Diff line 
/* crypto/cms/cms_err.c */

/* ====================================================================

 * Copyright (c) 1999-2013 The OpenSSL Project.  All rights reserved.

 * Copyright (c) 1999-2015 The OpenSSL Project.  All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions
@@ -70,7 +70,7 @@ 
# define ERR_REASON(reason) ERR_PACK(ERR_LIB_CMS,0,reason)



static ERR_STRING_DATA CMS_str_functs[] = {

    {ERR_FUNC(CMS_F_CHECK_CONTENT), "CHECK_CONTENT"},

    {ERR_FUNC(CMS_F_CHECK_CONTENT), "check_content"},

    {ERR_FUNC(CMS_F_CMS_ADD0_CERT), "CMS_add0_cert"},

    {ERR_FUNC(CMS_F_CMS_ADD0_RECIPIENT_KEY), "CMS_add0_recipient_key"},

    {ERR_FUNC(CMS_F_CMS_ADD0_RECIPIENT_PASSWORD),
@@ -78,13 +78,13 @@ static ERR_STRING_DATA CMS_str_functs[] = { 
    {ERR_FUNC(CMS_F_CMS_ADD1_RECEIPTREQUEST), "CMS_add1_ReceiptRequest"},

    {ERR_FUNC(CMS_F_CMS_ADD1_RECIPIENT_CERT), "CMS_add1_recipient_cert"},

    {ERR_FUNC(CMS_F_CMS_ADD1_SIGNER), "CMS_add1_signer"},

    {ERR_FUNC(CMS_F_CMS_ADD1_SIGNINGTIME), "CMS_ADD1_SIGNINGTIME"},

    {ERR_FUNC(CMS_F_CMS_ADD1_SIGNINGTIME), "cms_add1_signingTime"},

    {ERR_FUNC(CMS_F_CMS_COMPRESS), "CMS_compress"},

    {ERR_FUNC(CMS_F_CMS_COMPRESSEDDATA_CREATE), "cms_CompressedData_create"},

    {ERR_FUNC(CMS_F_CMS_COMPRESSEDDATA_INIT_BIO),

     "cms_CompressedData_init_bio"},

    {ERR_FUNC(CMS_F_CMS_COPY_CONTENT), "CMS_COPY_CONTENT"},

    {ERR_FUNC(CMS_F_CMS_COPY_MESSAGEDIGEST), "CMS_COPY_MESSAGEDIGEST"},

    {ERR_FUNC(CMS_F_CMS_COPY_CONTENT), "cms_copy_content"},

    {ERR_FUNC(CMS_F_CMS_COPY_MESSAGEDIGEST), "cms_copy_messageDigest"},

    {ERR_FUNC(CMS_F_CMS_DATA), "CMS_data"},

    {ERR_FUNC(CMS_F_CMS_DATAFINAL), "CMS_dataFinal"},

    {ERR_FUNC(CMS_F_CMS_DATAINIT), "CMS_dataInit"},
@@ -109,17 +109,17 @@ static ERR_STRING_DATA CMS_str_functs[] = { 
    {ERR_FUNC(CMS_F_CMS_ENVELOPEDDATA_CREATE), "CMS_EnvelopedData_create"},

    {ERR_FUNC(CMS_F_CMS_ENVELOPEDDATA_INIT_BIO),

     "cms_EnvelopedData_init_bio"},

    {ERR_FUNC(CMS_F_CMS_ENVELOPED_DATA_INIT), "CMS_ENVELOPED_DATA_INIT"},

    {ERR_FUNC(CMS_F_CMS_ENVELOPED_DATA_INIT), "cms_enveloped_data_init"},

    {ERR_FUNC(CMS_F_CMS_ENV_ASN1_CTRL), "cms_env_asn1_ctrl"},

    {ERR_FUNC(CMS_F_CMS_FINAL), "CMS_final"},

    {ERR_FUNC(CMS_F_CMS_GET0_CERTIFICATE_CHOICES),

     "CMS_GET0_CERTIFICATE_CHOICES"},

     "cms_get0_certificate_choices"},

    {ERR_FUNC(CMS_F_CMS_GET0_CONTENT), "CMS_get0_content"},

    {ERR_FUNC(CMS_F_CMS_GET0_ECONTENT_TYPE), "CMS_GET0_ECONTENT_TYPE"},

    {ERR_FUNC(CMS_F_CMS_GET0_ECONTENT_TYPE), "cms_get0_econtent_type"},

    {ERR_FUNC(CMS_F_CMS_GET0_ENVELOPED), "cms_get0_enveloped"},

    {ERR_FUNC(CMS_F_CMS_GET0_REVOCATION_CHOICES),

     "CMS_GET0_REVOCATION_CHOICES"},

    {ERR_FUNC(CMS_F_CMS_GET0_SIGNED), "CMS_GET0_SIGNED"},

     "cms_get0_revocation_choices"},

    {ERR_FUNC(CMS_F_CMS_GET0_SIGNED), "cms_get0_signed"},

    {ERR_FUNC(CMS_F_CMS_MSGSIGDIGEST_ADD1), "cms_msgSigDigest_add1"},

    {ERR_FUNC(CMS_F_CMS_RECEIPTREQUEST_CREATE0),

     "CMS_ReceiptRequest_create0"},
@@ -137,9 +137,9 @@ static ERR_STRING_DATA CMS_str_functs[] = { 
    {ERR_FUNC(CMS_F_CMS_RECIPIENTINFO_KARI_ORIG_ID_CMP),

     "CMS_RecipientInfo_kari_orig_id_cmp"},

    {ERR_FUNC(CMS_F_CMS_RECIPIENTINFO_KEKRI_DECRYPT),

     "CMS_RECIPIENTINFO_KEKRI_DECRYPT"},

     "cms_RecipientInfo_kekri_decrypt"},

    {ERR_FUNC(CMS_F_CMS_RECIPIENTINFO_KEKRI_ENCRYPT),

     "CMS_RECIPIENTINFO_KEKRI_ENCRYPT"},

     "cms_RecipientInfo_kekri_encrypt"},

    {ERR_FUNC(CMS_F_CMS_RECIPIENTINFO_KEKRI_GET0_ID),

     "CMS_RecipientInfo_kekri_get0_id"},

    {ERR_FUNC(CMS_F_CMS_RECIPIENTINFO_KEKRI_ID_CMP),
@@ -147,9 +147,9 @@ static ERR_STRING_DATA CMS_str_functs[] = { 
    {ERR_FUNC(CMS_F_CMS_RECIPIENTINFO_KTRI_CERT_CMP),

     "CMS_RecipientInfo_ktri_cert_cmp"},

    {ERR_FUNC(CMS_F_CMS_RECIPIENTINFO_KTRI_DECRYPT),

     "CMS_RECIPIENTINFO_KTRI_DECRYPT"},

     "cms_RecipientInfo_ktri_decrypt"},

    {ERR_FUNC(CMS_F_CMS_RECIPIENTINFO_KTRI_ENCRYPT),

     "CMS_RECIPIENTINFO_KTRI_ENCRYPT"},

     "cms_RecipientInfo_ktri_encrypt"},

    {ERR_FUNC(CMS_F_CMS_RECIPIENTINFO_KTRI_GET0_ALGS),

     "CMS_RecipientInfo_ktri_get0_algs"},

    {ERR_FUNC(CMS_F_CMS_RECIPIENTINFO_KTRI_GET0_SIGNER_ID),
@@ -162,19 +162,19 @@ static ERR_STRING_DATA CMS_str_functs[] = { 
     "CMS_RecipientInfo_set0_password"},

    {ERR_FUNC(CMS_F_CMS_RECIPIENTINFO_SET0_PKEY),

     "CMS_RecipientInfo_set0_pkey"},

    {ERR_FUNC(CMS_F_CMS_SD_ASN1_CTRL), "CMS_SD_ASN1_CTRL"},

    {ERR_FUNC(CMS_F_CMS_SD_ASN1_CTRL), "cms_sd_asn1_ctrl"},

    {ERR_FUNC(CMS_F_CMS_SET1_IAS), "cms_set1_ias"},

    {ERR_FUNC(CMS_F_CMS_SET1_KEYID), "cms_set1_keyid"},

    {ERR_FUNC(CMS_F_CMS_SET1_SIGNERIDENTIFIER), "cms_set1_SignerIdentifier"},

    {ERR_FUNC(CMS_F_CMS_SET_DETACHED), "CMS_set_detached"},

    {ERR_FUNC(CMS_F_CMS_SIGN), "CMS_sign"},

    {ERR_FUNC(CMS_F_CMS_SIGNED_DATA_INIT), "CMS_SIGNED_DATA_INIT"},

    {ERR_FUNC(CMS_F_CMS_SIGNED_DATA_INIT), "cms_signed_data_init"},

    {ERR_FUNC(CMS_F_CMS_SIGNERINFO_CONTENT_SIGN),

     "CMS_SIGNERINFO_CONTENT_SIGN"},

     "cms_SignerInfo_content_sign"},

    {ERR_FUNC(CMS_F_CMS_SIGNERINFO_SIGN), "CMS_SignerInfo_sign"},

    {ERR_FUNC(CMS_F_CMS_SIGNERINFO_VERIFY), "CMS_SignerInfo_verify"},

    {ERR_FUNC(CMS_F_CMS_SIGNERINFO_VERIFY_CERT),

     "CMS_SIGNERINFO_VERIFY_CERT"},

     "cms_signerinfo_verify_cert"},

    {ERR_FUNC(CMS_F_CMS_SIGNERINFO_VERIFY_CONTENT),

     "CMS_SignerInfo_verify_content"},

    {ERR_FUNC(CMS_F_CMS_SIGN_RECEIPT), "CMS_sign_receipt"},