diff options
author | jsing <> | 2020-06-05 16:51:12 +0000 |
---|---|---|
committer | jsing <> | 2020-06-05 16:51:12 +0000 |
commit | d1639bc05cd860481736ffc4782233545afc8f08 (patch) | |
tree | 16fc2b046ad99e43416803a66a4a1a51036af1d5 /src/lib/libcrypto/cms/cms_err.c | |
parent | 75c7565b81e7b9e3b8d8ba8f4f4ce32274401332 (diff) | |
download | openbsd-d1639bc05cd860481736ffc4782233545afc8f08.tar.gz openbsd-d1639bc05cd860481736ffc4782233545afc8f08.tar.bz2 openbsd-d1639bc05cd860481736ffc4782233545afc8f08.zip |
Remove remaining error *_str_functs[]
A number of years ago we dropped the concept of having function names in
errors, since it is not that useful and very quickly gets out of sync when
refactoring. It would seem that some new ones got imported and some missed
the last clean up.
ok tb@ beck@ "kill it with fire"
Diffstat (limited to 'src/lib/libcrypto/cms/cms_err.c')
-rw-r--r-- | src/lib/libcrypto/cms/cms_err.c | 142 |
1 files changed, 5 insertions, 137 deletions
diff --git a/src/lib/libcrypto/cms/cms_err.c b/src/lib/libcrypto/cms/cms_err.c index 9b2abaa03b..2fd550cae3 100644 --- a/src/lib/libcrypto/cms/cms_err.c +++ b/src/lib/libcrypto/cms/cms_err.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: cms_err.c,v 1.11 2019/08/11 14:18:38 jsing Exp $ */ | 1 | /* $OpenBSD: cms_err.c,v 1.12 2020/06/05 16:51:12 jsing Exp $ */ |
2 | /* | 2 | /* |
3 | * Generated by util/mkerr.pl DO NOT EDIT | 3 | * Generated by util/mkerr.pl DO NOT EDIT |
4 | * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. | 4 | * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. |
@@ -14,143 +14,11 @@ | |||
14 | 14 | ||
15 | #ifndef OPENSSL_NO_ERR | 15 | #ifndef OPENSSL_NO_ERR |
16 | 16 | ||
17 | #define ERR_FUNC(func) ERR_PACK(ERR_LIB_CMS,func,0) | ||
18 | #define ERR_REASON(reason) ERR_PACK(ERR_LIB_CMS,0,reason) | ||
19 | |||
17 | static ERR_STRING_DATA CMS_str_functs[] = { | 20 | static ERR_STRING_DATA CMS_str_functs[] = { |
18 | {ERR_PACK(ERR_LIB_CMS, CMS_F_CHECK_CONTENT, 0), "check_content"}, | 21 | {ERR_FUNC(0xfff), "CRYPTO_internal"}, |
19 | {ERR_PACK(ERR_LIB_CMS, CMS_F_CMS_ADD0_CERT, 0), "CMS_add0_cert"}, | ||
20 | {ERR_PACK(ERR_LIB_CMS, CMS_F_CMS_ADD0_RECIPIENT_KEY, 0), | ||
21 | "CMS_add0_recipient_key"}, | ||
22 | {ERR_PACK(ERR_LIB_CMS, CMS_F_CMS_ADD0_RECIPIENT_PASSWORD, 0), | ||
23 | "CMS_add0_recipient_password"}, | ||
24 | {ERR_PACK(ERR_LIB_CMS, CMS_F_CMS_ADD1_RECEIPTREQUEST, 0), | ||
25 | "CMS_add1_ReceiptRequest"}, | ||
26 | {ERR_PACK(ERR_LIB_CMS, CMS_F_CMS_ADD1_RECIPIENT_CERT, 0), | ||
27 | "CMS_add1_recipient_cert"}, | ||
28 | {ERR_PACK(ERR_LIB_CMS, CMS_F_CMS_ADD1_SIGNER, 0), "CMS_add1_signer"}, | ||
29 | {ERR_PACK(ERR_LIB_CMS, CMS_F_CMS_ADD1_SIGNINGTIME, 0), | ||
30 | "cms_add1_signingTime"}, | ||
31 | {ERR_PACK(ERR_LIB_CMS, CMS_F_CMS_COMPRESS, 0), "CMS_compress"}, | ||
32 | {ERR_PACK(ERR_LIB_CMS, CMS_F_CMS_COMPRESSEDDATA_CREATE, 0), | ||
33 | "cms_CompressedData_create"}, | ||
34 | {ERR_PACK(ERR_LIB_CMS, CMS_F_CMS_COMPRESSEDDATA_INIT_BIO, 0), | ||
35 | "cms_CompressedData_init_bio"}, | ||
36 | {ERR_PACK(ERR_LIB_CMS, CMS_F_CMS_COPY_CONTENT, 0), "cms_copy_content"}, | ||
37 | {ERR_PACK(ERR_LIB_CMS, CMS_F_CMS_COPY_MESSAGEDIGEST, 0), | ||
38 | "cms_copy_messageDigest"}, | ||
39 | {ERR_PACK(ERR_LIB_CMS, CMS_F_CMS_DATA, 0), "CMS_data"}, | ||
40 | {ERR_PACK(ERR_LIB_CMS, CMS_F_CMS_DATAFINAL, 0), "CMS_dataFinal"}, | ||
41 | {ERR_PACK(ERR_LIB_CMS, CMS_F_CMS_DATAINIT, 0), "CMS_dataInit"}, | ||
42 | {ERR_PACK(ERR_LIB_CMS, CMS_F_CMS_DECRYPT, 0), "CMS_decrypt"}, | ||
43 | {ERR_PACK(ERR_LIB_CMS, CMS_F_CMS_DECRYPT_SET1_KEY, 0), | ||
44 | "CMS_decrypt_set1_key"}, | ||
45 | {ERR_PACK(ERR_LIB_CMS, CMS_F_CMS_DECRYPT_SET1_PASSWORD, 0), | ||
46 | "CMS_decrypt_set1_password"}, | ||
47 | {ERR_PACK(ERR_LIB_CMS, CMS_F_CMS_DECRYPT_SET1_PKEY, 0), | ||
48 | "CMS_decrypt_set1_pkey"}, | ||
49 | {ERR_PACK(ERR_LIB_CMS, CMS_F_CMS_DIGESTALGORITHM_FIND_CTX, 0), | ||
50 | "cms_DigestAlgorithm_find_ctx"}, | ||
51 | {ERR_PACK(ERR_LIB_CMS, CMS_F_CMS_DIGESTALGORITHM_INIT_BIO, 0), | ||
52 | "cms_DigestAlgorithm_init_bio"}, | ||
53 | {ERR_PACK(ERR_LIB_CMS, CMS_F_CMS_DIGESTEDDATA_DO_FINAL, 0), | ||
54 | "cms_DigestedData_do_final"}, | ||
55 | {ERR_PACK(ERR_LIB_CMS, CMS_F_CMS_DIGEST_VERIFY, 0), "CMS_digest_verify"}, | ||
56 | {ERR_PACK(ERR_LIB_CMS, CMS_F_CMS_ENCODE_RECEIPT, 0), "cms_encode_Receipt"}, | ||
57 | {ERR_PACK(ERR_LIB_CMS, CMS_F_CMS_ENCRYPT, 0), "CMS_encrypt"}, | ||
58 | {ERR_PACK(ERR_LIB_CMS, CMS_F_CMS_ENCRYPTEDCONTENT_INIT, 0), | ||
59 | "cms_EncryptedContent_init"}, | ||
60 | {ERR_PACK(ERR_LIB_CMS, CMS_F_CMS_ENCRYPTEDCONTENT_INIT_BIO, 0), | ||
61 | "cms_EncryptedContent_init_bio"}, | ||
62 | {ERR_PACK(ERR_LIB_CMS, CMS_F_CMS_ENCRYPTEDDATA_DECRYPT, 0), | ||
63 | "CMS_EncryptedData_decrypt"}, | ||
64 | {ERR_PACK(ERR_LIB_CMS, CMS_F_CMS_ENCRYPTEDDATA_ENCRYPT, 0), | ||
65 | "CMS_EncryptedData_encrypt"}, | ||
66 | {ERR_PACK(ERR_LIB_CMS, CMS_F_CMS_ENCRYPTEDDATA_SET1_KEY, 0), | ||
67 | "CMS_EncryptedData_set1_key"}, | ||
68 | {ERR_PACK(ERR_LIB_CMS, CMS_F_CMS_ENVELOPEDDATA_CREATE, 0), | ||
69 | "CMS_EnvelopedData_create"}, | ||
70 | {ERR_PACK(ERR_LIB_CMS, CMS_F_CMS_ENVELOPEDDATA_INIT_BIO, 0), | ||
71 | "cms_EnvelopedData_init_bio"}, | ||
72 | {ERR_PACK(ERR_LIB_CMS, CMS_F_CMS_ENVELOPED_DATA_INIT, 0), | ||
73 | "cms_enveloped_data_init"}, | ||
74 | {ERR_PACK(ERR_LIB_CMS, CMS_F_CMS_ENV_ASN1_CTRL, 0), "cms_env_asn1_ctrl"}, | ||
75 | {ERR_PACK(ERR_LIB_CMS, CMS_F_CMS_FINAL, 0), "CMS_final"}, | ||
76 | {ERR_PACK(ERR_LIB_CMS, CMS_F_CMS_GET0_CERTIFICATE_CHOICES, 0), | ||
77 | "cms_get0_certificate_choices"}, | ||
78 | {ERR_PACK(ERR_LIB_CMS, CMS_F_CMS_GET0_CONTENT, 0), "CMS_get0_content"}, | ||
79 | {ERR_PACK(ERR_LIB_CMS, CMS_F_CMS_GET0_ECONTENT_TYPE, 0), | ||
80 | "cms_get0_econtent_type"}, | ||
81 | {ERR_PACK(ERR_LIB_CMS, CMS_F_CMS_GET0_ENVELOPED, 0), "cms_get0_enveloped"}, | ||
82 | {ERR_PACK(ERR_LIB_CMS, CMS_F_CMS_GET0_REVOCATION_CHOICES, 0), | ||
83 | "cms_get0_revocation_choices"}, | ||
84 | {ERR_PACK(ERR_LIB_CMS, CMS_F_CMS_GET0_SIGNED, 0), "cms_get0_signed"}, | ||
85 | {ERR_PACK(ERR_LIB_CMS, CMS_F_CMS_MSGSIGDIGEST_ADD1, 0), | ||
86 | "cms_msgSigDigest_add1"}, | ||
87 | {ERR_PACK(ERR_LIB_CMS, CMS_F_CMS_RECEIPTREQUEST_CREATE0, 0), | ||
88 | "CMS_ReceiptRequest_create0"}, | ||
89 | {ERR_PACK(ERR_LIB_CMS, CMS_F_CMS_RECEIPT_VERIFY, 0), "cms_Receipt_verify"}, | ||
90 | {ERR_PACK(ERR_LIB_CMS, CMS_F_CMS_RECIPIENTINFO_DECRYPT, 0), | ||
91 | "CMS_RecipientInfo_decrypt"}, | ||
92 | {ERR_PACK(ERR_LIB_CMS, CMS_F_CMS_RECIPIENTINFO_ENCRYPT, 0), | ||
93 | "CMS_RecipientInfo_encrypt"}, | ||
94 | {ERR_PACK(ERR_LIB_CMS, CMS_F_CMS_RECIPIENTINFO_KARI_ENCRYPT, 0), | ||
95 | "cms_RecipientInfo_kari_encrypt"}, | ||
96 | {ERR_PACK(ERR_LIB_CMS, CMS_F_CMS_RECIPIENTINFO_KARI_GET0_ALG, 0), | ||
97 | "CMS_RecipientInfo_kari_get0_alg"}, | ||
98 | {ERR_PACK(ERR_LIB_CMS, CMS_F_CMS_RECIPIENTINFO_KARI_GET0_ORIG_ID, 0), | ||
99 | "CMS_RecipientInfo_kari_get0_orig_id"}, | ||
100 | {ERR_PACK(ERR_LIB_CMS, CMS_F_CMS_RECIPIENTINFO_KARI_GET0_REKS, 0), | ||
101 | "CMS_RecipientInfo_kari_get0_reks"}, | ||
102 | {ERR_PACK(ERR_LIB_CMS, CMS_F_CMS_RECIPIENTINFO_KARI_ORIG_ID_CMP, 0), | ||
103 | "CMS_RecipientInfo_kari_orig_id_cmp"}, | ||
104 | {ERR_PACK(ERR_LIB_CMS, CMS_F_CMS_RECIPIENTINFO_KEKRI_DECRYPT, 0), | ||
105 | "cms_RecipientInfo_kekri_decrypt"}, | ||
106 | {ERR_PACK(ERR_LIB_CMS, CMS_F_CMS_RECIPIENTINFO_KEKRI_ENCRYPT, 0), | ||
107 | "cms_RecipientInfo_kekri_encrypt"}, | ||
108 | {ERR_PACK(ERR_LIB_CMS, CMS_F_CMS_RECIPIENTINFO_KEKRI_GET0_ID, 0), | ||
109 | "CMS_RecipientInfo_kekri_get0_id"}, | ||
110 | {ERR_PACK(ERR_LIB_CMS, CMS_F_CMS_RECIPIENTINFO_KEKRI_ID_CMP, 0), | ||
111 | "CMS_RecipientInfo_kekri_id_cmp"}, | ||
112 | {ERR_PACK(ERR_LIB_CMS, CMS_F_CMS_RECIPIENTINFO_KTRI_CERT_CMP, 0), | ||
113 | "CMS_RecipientInfo_ktri_cert_cmp"}, | ||
114 | {ERR_PACK(ERR_LIB_CMS, CMS_F_CMS_RECIPIENTINFO_KTRI_DECRYPT, 0), | ||
115 | "cms_RecipientInfo_ktri_decrypt"}, | ||
116 | {ERR_PACK(ERR_LIB_CMS, CMS_F_CMS_RECIPIENTINFO_KTRI_ENCRYPT, 0), | ||
117 | "cms_RecipientInfo_ktri_encrypt"}, | ||
118 | {ERR_PACK(ERR_LIB_CMS, CMS_F_CMS_RECIPIENTINFO_KTRI_GET0_ALGS, 0), | ||
119 | "CMS_RecipientInfo_ktri_get0_algs"}, | ||
120 | {ERR_PACK(ERR_LIB_CMS, CMS_F_CMS_RECIPIENTINFO_KTRI_GET0_SIGNER_ID, 0), | ||
121 | "CMS_RecipientInfo_ktri_get0_signer_id"}, | ||
122 | {ERR_PACK(ERR_LIB_CMS, CMS_F_CMS_RECIPIENTINFO_PWRI_CRYPT, 0), | ||
123 | "cms_RecipientInfo_pwri_crypt"}, | ||
124 | {ERR_PACK(ERR_LIB_CMS, CMS_F_CMS_RECIPIENTINFO_SET0_KEY, 0), | ||
125 | "CMS_RecipientInfo_set0_key"}, | ||
126 | {ERR_PACK(ERR_LIB_CMS, CMS_F_CMS_RECIPIENTINFO_SET0_PASSWORD, 0), | ||
127 | "CMS_RecipientInfo_set0_password"}, | ||
128 | {ERR_PACK(ERR_LIB_CMS, CMS_F_CMS_RECIPIENTINFO_SET0_PKEY, 0), | ||
129 | "CMS_RecipientInfo_set0_pkey"}, | ||
130 | {ERR_PACK(ERR_LIB_CMS, CMS_F_CMS_SD_ASN1_CTRL, 0), "cms_sd_asn1_ctrl"}, | ||
131 | {ERR_PACK(ERR_LIB_CMS, CMS_F_CMS_SET1_IAS, 0), "cms_set1_ias"}, | ||
132 | {ERR_PACK(ERR_LIB_CMS, CMS_F_CMS_SET1_KEYID, 0), "cms_set1_keyid"}, | ||
133 | {ERR_PACK(ERR_LIB_CMS, CMS_F_CMS_SET1_SIGNERIDENTIFIER, 0), | ||
134 | "cms_set1_SignerIdentifier"}, | ||
135 | {ERR_PACK(ERR_LIB_CMS, CMS_F_CMS_SET_DETACHED, 0), "CMS_set_detached"}, | ||
136 | {ERR_PACK(ERR_LIB_CMS, CMS_F_CMS_SIGN, 0), "CMS_sign"}, | ||
137 | {ERR_PACK(ERR_LIB_CMS, CMS_F_CMS_SIGNED_DATA_INIT, 0), | ||
138 | "cms_signed_data_init"}, | ||
139 | {ERR_PACK(ERR_LIB_CMS, CMS_F_CMS_SIGNERINFO_CONTENT_SIGN, 0), | ||
140 | "cms_SignerInfo_content_sign"}, | ||
141 | {ERR_PACK(ERR_LIB_CMS, CMS_F_CMS_SIGNERINFO_SIGN, 0), | ||
142 | "CMS_SignerInfo_sign"}, | ||
143 | {ERR_PACK(ERR_LIB_CMS, CMS_F_CMS_SIGNERINFO_VERIFY, 0), | ||
144 | "CMS_SignerInfo_verify"}, | ||
145 | {ERR_PACK(ERR_LIB_CMS, CMS_F_CMS_SIGNERINFO_VERIFY_CERT, 0), | ||
146 | "cms_signerinfo_verify_cert"}, | ||
147 | {ERR_PACK(ERR_LIB_CMS, CMS_F_CMS_SIGNERINFO_VERIFY_CONTENT, 0), | ||
148 | "CMS_SignerInfo_verify_content"}, | ||
149 | {ERR_PACK(ERR_LIB_CMS, CMS_F_CMS_SIGN_RECEIPT, 0), "CMS_sign_receipt"}, | ||
150 | {ERR_PACK(ERR_LIB_CMS, CMS_F_CMS_STREAM, 0), "CMS_stream"}, | ||
151 | {ERR_PACK(ERR_LIB_CMS, CMS_F_CMS_UNCOMPRESS, 0), "CMS_uncompress"}, | ||
152 | {ERR_PACK(ERR_LIB_CMS, CMS_F_CMS_VERIFY, 0), "CMS_verify"}, | ||
153 | {ERR_PACK(ERR_LIB_CMS, CMS_F_KEK_UNWRAP_KEY, 0), "kek_unwrap_key"}, | ||
154 | {0, NULL} | 22 | {0, NULL} |
155 | }; | 23 | }; |
156 | 24 | ||