Rebuild CMS error codes.

2 files changed, 117 insertions, 139 deletions

diff --git a/crypto/cms/cms.h b/crypto/cms/cms.h
index 49fdcf539c..4f74cd14bf 100644
--- a/crypto/cms/cms.h
+++ b/crypto/cms/cms.h
@@ -290,139 +290,128 @@ void ERR_load_CMS_strings(void);
 /* Error codes for the CMS functions. */
 
 /* Function codes. */
-#define CMS_F_CHECK_CONTENT				 151
-#define CMS_F_CMS_ADD0_RECIPIENT_KEY			 157
-#define CMS_F_CMS_ADD1_RECIPIENT_CERT			 99
-#define CMS_F_CMS_ADD1_SIGNER				 100
-#define CMS_F_CMS_ADD1_SIGNINGTIME			 101
-#define CMS_F_CMS_BIO_TO_ENCRYPTEDCONTENT		 137
-#define CMS_F_CMS_BIO_TO_ENCRYPTEDCONTENT_BIO		 142
-#define CMS_F_CMS_COMPRESS				 102
-#define CMS_F_CMS_COMPRESSEDDATA_CREATE			 103
-#define CMS_F_CMS_COMPRESSEDDATA_INIT_BIO		 104
-#define CMS_F_CMS_COPY_CONTENT				 105
-#define CMS_F_CMS_COPY_MESSAGEDIGEST			 106
-#define CMS_F_CMS_DATA					 107
-#define CMS_F_CMS_DATAFINAL				 108
-#define CMS_F_CMS_DATAINIT				 109
-#define CMS_F_CMS_DECRYPT				 152
-#define CMS_F_CMS_DECRYPTEDCONTENT_DECRYPT_BIO		 145
-#define CMS_F_CMS_DECRYPTEDCONTENT_ENCRYPT_BIO		 143
-#define CMS_F_CMS_DECRYPT_SET1_KEY			 167
-#define CMS_F_CMS_DECRYPT_SET1_PKEY			 168
-#define CMS_F_CMS_DIGESTALGORITHM_FIND_CTX		 110
-#define CMS_F_CMS_DIGESTALGORITHM_INIT_BIO		 111
-#define CMS_F_CMS_DIGESTEDDATA_DO_FINAL			 112
-#define CMS_F_CMS_DIGEST_VERIFY				 113
-#define CMS_F_CMS_ENCRYPT				 154
-#define CMS_F_CMS_ENCRYPTEDCONTENT_DECRYPT_BIO		 146
-#define CMS_F_CMS_ENCRYPTEDCONTENT_ENCRYPT_BIO		 144
-#define CMS_F_CMS_ENCRYPTEDCONTENT_INIT_BIO		 148
-#define CMS_F_CMS_ENCRYPTEDCONTENT_TO_BIO		 138
-#define CMS_F_CMS_ENCRYPTEDDATA_DECRYPT			 140
-#define CMS_F_CMS_ENCRYPTEDDATA_ENCRYPT			 149
-#define CMS_F_CMS_ENCRYPTEDDATA_INIT_BIO		 147
-#define CMS_F_CMS_ENCRYPTEDDATA_SET1_KEY		 141
-#define CMS_F_CMS_ENCRYPTED_DATA_DECRYPT		 139
-#define CMS_F_CMS_ENVELOPEDDATA_CREATE			 153
-#define CMS_F_CMS_ENVELOPEDDATA_INIT_BIO		 156
-#define CMS_F_CMS_ENVELOPED_DATA_INIT			 114
-#define CMS_F_CMS_FINAL					 115
-#define CMS_F_CMS_GET0_CERTIFICATE_CHOICES		 116
-#define CMS_F_CMS_GET0_CONTENT				 117
-#define CMS_F_CMS_GET0_ECONTENT_TYPE			 118
-#define CMS_F_CMS_GET0_ENVELOPED			 119
-#define CMS_F_CMS_GET0_REVOCATION_CHOICES		 120
-#define CMS_F_CMS_GET0_SIGNED				 121
-#define CMS_F_CMS_RECIPIENTINFO_DECRYPT			 150
-#define CMS_F_CMS_RECIPIENTINFO_KEKI_KEY_CMP		 164
-#define CMS_F_CMS_RECIPIENTINFO_KEKRI_DECRYPT		 161
-#define CMS_F_CMS_RECIPIENTINFO_KEKRI_ENCRYPT		 162
-#define CMS_F_CMS_RECIPIENTINFO_KEKRI_GET0_ID		 158
-#define CMS_F_CMS_RECIPIENTINFO_KEKRI_ID_CMP		 166
-#define CMS_F_CMS_RECIPIENTINFO_KEKRI_KEY_CMP		 165
-#define CMS_F_CMS_RECIPIENTINFO_KTRI_CERT_CMP		 122
-#define CMS_F_CMS_RECIPIENTINFO_KTRI_DECRYPT		 160
-#define CMS_F_CMS_RECIPIENTINFO_KTRI_ENCRYPT		 155
-#define CMS_F_CMS_RECIPIENTINFO_KTRI_GET0_ALGS		 123
-#define CMS_F_CMS_RECIPIENTINFO_KTRI_GET0_SIGNER_ID	 124
-#define CMS_F_CMS_RECIPIENTINFO_SET0_KEY		 163
-#define CMS_F_CMS_RECIPIENTINFO_SET0_PKEY		 159
-#define CMS_F_CMS_SET1_SIGNERIDENTIFIER			 125
-#define CMS_F_CMS_SET_DETACHED				 126
-#define CMS_F_CMS_SIGN					 127
-#define CMS_F_CMS_SIGNED_DATA_INIT			 128
-#define CMS_F_CMS_SIGNERINFO_CONTENT_SIGN		 129
-#define CMS_F_CMS_SIGNERINFO_SIGN			 130
-#define CMS_F_CMS_SIGNERINFO_VERIFY			 131
-#define CMS_F_CMS_SIGNERINFO_VERIFY_CERT		 132
-#define CMS_F_CMS_SIGNERINFO_VERIFY_CONTENT		 133
-#define CMS_F_CMS_STREAM				 134
-#define CMS_F_CMS_UNCOMPRESS				 135
-#define CMS_F_CMS_VERIFY				 136
+#define CMS_F_CHECK_CONTENT				 99
+#define CMS_F_CMS_ADD0_RECIPIENT_KEY			 100
+#define CMS_F_CMS_ADD1_RECIPIENT_CERT			 101
+#define CMS_F_CMS_ADD1_SIGNER				 102
+#define CMS_F_CMS_ADD1_SIGNINGTIME			 103
+#define CMS_F_CMS_COMPRESS				 104
+#define CMS_F_CMS_COMPRESSEDDATA_CREATE			 105
+#define CMS_F_CMS_COMPRESSEDDATA_INIT_BIO		 106
+#define CMS_F_CMS_COPY_CONTENT				 107
+#define CMS_F_CMS_COPY_MESSAGEDIGEST			 108
+#define CMS_F_CMS_DATA					 109
+#define CMS_F_CMS_DATAFINAL				 110
+#define CMS_F_CMS_DATAINIT				 111
+#define CMS_F_CMS_DECRYPT				 112
+#define CMS_F_CMS_DECRYPT_SET1_KEY			 113
+#define CMS_F_CMS_DECRYPT_SET1_PKEY			 114
+#define CMS_F_CMS_DIGESTALGORITHM_FIND_CTX		 115
+#define CMS_F_CMS_DIGESTALGORITHM_INIT_BIO		 116
+#define CMS_F_CMS_DIGESTEDDATA_DO_FINAL			 117
+#define CMS_F_CMS_DIGEST_VERIFY				 118
+#define CMS_F_CMS_ENCRYPT				 119
+#define CMS_F_CMS_ENCRYPTEDCONTENT_INIT_BIO		 120
+#define CMS_F_CMS_ENCRYPTEDDATA_DECRYPT			 121
+#define CMS_F_CMS_ENCRYPTEDDATA_ENCRYPT			 122
+#define CMS_F_CMS_ENCRYPTEDDATA_SET1_KEY		 123
+#define CMS_F_CMS_ENVELOPEDDATA_CREATE			 124
+#define CMS_F_CMS_ENVELOPEDDATA_INIT_BIO		 125
+#define CMS_F_CMS_ENVELOPED_DATA_INIT			 126
+#define CMS_F_CMS_FINAL					 127
+#define CMS_F_CMS_GET0_CERTIFICATE_CHOICES		 128
+#define CMS_F_CMS_GET0_CONTENT				 129
+#define CMS_F_CMS_GET0_ECONTENT_TYPE			 130
+#define CMS_F_CMS_GET0_ENVELOPED			 131
+#define CMS_F_CMS_GET0_REVOCATION_CHOICES		 132
+#define CMS_F_CMS_GET0_SIGNED				 133
+#define CMS_F_CMS_RECIPIENTINFO_DECRYPT			 134
+#define CMS_F_CMS_RECIPIENTINFO_KEKRI_DECRYPT		 135
+#define CMS_F_CMS_RECIPIENTINFO_KEKRI_ENCRYPT		 136
+#define CMS_F_CMS_RECIPIENTINFO_KEKRI_GET0_ID		 137
+#define CMS_F_CMS_RECIPIENTINFO_KEKRI_ID_CMP		 138
+#define CMS_F_CMS_RECIPIENTINFO_KTRI_CERT_CMP		 139
+#define CMS_F_CMS_RECIPIENTINFO_KTRI_DECRYPT		 140
+#define CMS_F_CMS_RECIPIENTINFO_KTRI_ENCRYPT		 141
+#define CMS_F_CMS_RECIPIENTINFO_KTRI_GET0_ALGS		 142
+#define CMS_F_CMS_RECIPIENTINFO_KTRI_GET0_SIGNER_ID	 143
+#define CMS_F_CMS_RECIPIENTINFO_SET0_KEY		 144
+#define CMS_F_CMS_RECIPIENTINFO_SET0_PKEY		 145
+#define CMS_F_CMS_SET1_SIGNERIDENTIFIER			 146
+#define CMS_F_CMS_SET_DETACHED				 147
+#define CMS_F_CMS_SIGN					 148
+#define CMS_F_CMS_SIGNED_DATA_INIT			 149
+#define CMS_F_CMS_SIGNERINFO_CONTENT_SIGN		 150
+#define CMS_F_CMS_SIGNERINFO_SIGN			 151
+#define CMS_F_CMS_SIGNERINFO_VERIFY			 152
+#define CMS_F_CMS_SIGNERINFO_VERIFY_CERT		 153
+#define CMS_F_CMS_SIGNERINFO_VERIFY_CONTENT		 154
+#define CMS_F_CMS_STREAM				 155
+#define CMS_F_CMS_UNCOMPRESS				 156
+#define CMS_F_CMS_VERIFY				 157
 
 /* Reason codes. */
 #define CMS_R_ADD_SIGNER_ERROR				 99
 #define CMS_R_CERTIFICATE_VERIFY_ERROR			 100
-#define CMS_R_CIPHER_INITIALISATION_ERROR		 138
-#define CMS_R_CIPHER_PARAMETER_INITIALISATION_ERROR	 139
-#define CMS_R_CMS_DATAFINAL_ERROR			 101
-#define CMS_R_CMS_LIB					 145
-#define CMS_R_CONTENT_NOT_FOUND				 102
-#define CMS_R_CONTENT_TYPE_NOT_COMPRESSED_DATA		 103
-#define CMS_R_CONTENT_TYPE_NOT_ENVELOPED_DATA		 104
-#define CMS_R_CONTENT_TYPE_NOT_SIGNED_DATA		 105
-#define CMS_R_CONTENT_VERIFY_ERROR			 106
-#define CMS_R_CTRL_ERROR				 107
-#define CMS_R_CTRL_FAILURE				 108
-#define CMS_R_DECRYPT_ERROR				 159
-#define CMS_R_ERROR_GETTING_PUBLIC_KEY			 109
-#define CMS_R_ERROR_READING_MESSAGEDIGEST_ATTRIBUTE	 110
-#define CMS_R_ERROR_SETTING_KEY				 155
-#define CMS_R_ERROR_SETTING_RECIPIENTINFO		 150
-#define CMS_R_INVALID_ENCRYPTED_KEY_LENGTH		 156
-#define CMS_R_INVALID_KEY_LENGTH			 140
-#define CMS_R_MD_BIO_INIT_ERROR				 111
-#define CMS_R_MESSAGEDIGEST_ATTRIBUTE_WRONG_LENGTH	 112
-#define CMS_R_MESSAGEDIGEST_WRONG_LENGTH		 113
-#define CMS_R_NOT_ENCRYPTED_DATA			 143
-#define CMS_R_NOT_KEK					 152
-#define CMS_R_NOT_KEY_TRANSPORT				 114
-#define CMS_R_NOT_SUPPORTED_FOR_THIS_KEY_TYPE		 115
-#define CMS_R_NO_CIPHER					 144
-#define CMS_R_NO_CONTENT				 116
-#define CMS_R_NO_DEFAULT_DIGEST				 117
-#define CMS_R_NO_DIGEST_SET				 118
-#define CMS_R_NO_KEY					 148
-#define CMS_R_NO_MATCHING_DIGEST			 119
-#define CMS_R_NO_MATCHING_RECIPIENT			 147
-#define CMS_R_NO_PRIVATE_KEY				 120
-#define CMS_R_NO_PUBLIC_KEY				 121
-#define CMS_R_NO_SIGNERS				 122
-#define CMS_R_PRIVATE_KEY_DOES_NOT_MATCH_CERTIFICATE	 123
-#define CMS_R_RECIPIENT_ERROR				 149
-#define CMS_R_SIGNER_CERTIFICATE_NOT_FOUND		 124
-#define CMS_R_SIGNFINAL_ERROR				 125
-#define CMS_R_SMIME_TEXT_ERROR				 126
-#define CMS_R_STORE_INIT_ERROR				 127
-#define CMS_R_TYPE_NOT_COMPRESSED_DATA			 128
-#define CMS_R_TYPE_NOT_DATA				 129
-#define CMS_R_TYPE_NOT_DIGESTED_DATA			 130
-#define CMS_R_TYPE_NOT_ENCRYPTED_DATA			 142
+#define CMS_R_CIPHER_INITIALISATION_ERROR		 101
+#define CMS_R_CIPHER_PARAMETER_INITIALISATION_ERROR	 102
+#define CMS_R_CMS_DATAFINAL_ERROR			 103
+#define CMS_R_CMS_LIB					 104
+#define CMS_R_CONTENT_NOT_FOUND				 105
+#define CMS_R_CONTENT_TYPE_NOT_COMPRESSED_DATA		 106
+#define CMS_R_CONTENT_TYPE_NOT_ENVELOPED_DATA		 107
+#define CMS_R_CONTENT_TYPE_NOT_SIGNED_DATA		 108
+#define CMS_R_CONTENT_VERIFY_ERROR			 109
+#define CMS_R_CTRL_ERROR				 110
+#define CMS_R_CTRL_FAILURE				 111
+#define CMS_R_DECRYPT_ERROR				 112
+#define CMS_R_ERROR_GETTING_PUBLIC_KEY			 113
+#define CMS_R_ERROR_READING_MESSAGEDIGEST_ATTRIBUTE	 114
+#define CMS_R_ERROR_SETTING_KEY				 115
+#define CMS_R_ERROR_SETTING_RECIPIENTINFO		 116
+#define CMS_R_INVALID_ENCRYPTED_KEY_LENGTH		 117
+#define CMS_R_INVALID_KEY_LENGTH			 118
+#define CMS_R_MD_BIO_INIT_ERROR				 119
+#define CMS_R_MESSAGEDIGEST_ATTRIBUTE_WRONG_LENGTH	 120
+#define CMS_R_MESSAGEDIGEST_WRONG_LENGTH		 121
+#define CMS_R_NOT_ENCRYPTED_DATA			 122
+#define CMS_R_NOT_KEK					 123
+#define CMS_R_NOT_KEY_TRANSPORT				 124
+#define CMS_R_NOT_SUPPORTED_FOR_THIS_KEY_TYPE		 125
+#define CMS_R_NO_CIPHER					 126
+#define CMS_R_NO_CONTENT				 127
+#define CMS_R_NO_DEFAULT_DIGEST				 128
+#define CMS_R_NO_DIGEST_SET				 129
+#define CMS_R_NO_KEY					 130
+#define CMS_R_NO_MATCHING_DIGEST			 131
+#define CMS_R_NO_MATCHING_RECIPIENT			 132
+#define CMS_R_NO_PRIVATE_KEY				 133
+#define CMS_R_NO_PUBLIC_KEY				 134
+#define CMS_R_NO_SIGNERS				 135
+#define CMS_R_PRIVATE_KEY_DOES_NOT_MATCH_CERTIFICATE	 136
+#define CMS_R_RECIPIENT_ERROR				 137
+#define CMS_R_SIGNER_CERTIFICATE_NOT_FOUND		 138
+#define CMS_R_SIGNFINAL_ERROR				 139
+#define CMS_R_SMIME_TEXT_ERROR				 140
+#define CMS_R_STORE_INIT_ERROR				 141
+#define CMS_R_TYPE_NOT_COMPRESSED_DATA			 142
+#define CMS_R_TYPE_NOT_DATA				 143
+#define CMS_R_TYPE_NOT_DIGESTED_DATA			 144
+#define CMS_R_TYPE_NOT_ENCRYPTED_DATA			 145
 #define CMS_R_TYPE_NOT_ENVELOPED_DATA			 146
-#define CMS_R_UNABLE_TO_FINALIZE_CONTEXT		 131
-#define CMS_R_UNKNOWN_CIPHER				 141
-#define CMS_R_UNKNOWN_DIGEST_ALGORIHM			 132
-#define CMS_R_UNKNOWN_ID				 133
-#define CMS_R_UNSUPPORTED_COMPRESSION_ALGORITHM		 134
-#define CMS_R_UNSUPPORTED_CONTENT_TYPE			 135
+#define CMS_R_UNABLE_TO_FINALIZE_CONTEXT		 147
+#define CMS_R_UNKNOWN_CIPHER				 148
+#define CMS_R_UNKNOWN_DIGEST_ALGORIHM			 149
+#define CMS_R_UNKNOWN_ID				 150
+#define CMS_R_UNSUPPORTED_COMPRESSION_ALGORITHM		 151
+#define CMS_R_UNSUPPORTED_CONTENT_TYPE			 152
 #define CMS_R_UNSUPPORTED_KEK_ALGORITHM			 153
-#define CMS_R_UNSUPPORTED_RECIPIENT_TYPE		 151
-#define CMS_R_UNSUPPORTED_RECPIENTINFO_TYPE		 154
-#define CMS_R_UNSUPPORTED_TYPE				 136
+#define CMS_R_UNSUPPORTED_RECIPIENT_TYPE		 154
+#define CMS_R_UNSUPPORTED_RECPIENTINFO_TYPE		 155
+#define CMS_R_UNSUPPORTED_TYPE				 156
 #define CMS_R_UNWRAP_ERROR				 157
-#define CMS_R_VERIFICATION_FAILURE			 137
-#define CMS_R_WRAP_ERROR				 158
+#define CMS_R_VERIFICATION_FAILURE			 158
+#define CMS_R_WRAP_ERROR				 159
 
 #ifdef  __cplusplus
 }
diff --git a/crypto/cms/cms_err.c b/crypto/cms/cms_err.c
index 6fbab4da12..494544d836 100644
--- a/crypto/cms/cms_err.c
+++ b/crypto/cms/cms_err.c
@@ -75,8 +75,6 @@ static ERR_STRING_DATA CMS_str_functs[]=
 {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_BIO_TO_ENCRYPTEDCONTENT),	"CMS_BIO_TO_ENCRYPTEDCONTENT"},
-{ERR_FUNC(CMS_F_CMS_BIO_TO_ENCRYPTEDCONTENT_BIO),	"CMS_BIO_TO_ENCRYPTEDCONTENT_BIO"},
 {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"},
@@ -86,24 +84,17 @@ static ERR_STRING_DATA CMS_str_functs[]=
 {ERR_FUNC(CMS_F_CMS_DATAFINAL),	"CMS_dataFinal"},
 {ERR_FUNC(CMS_F_CMS_DATAINIT),	"CMS_dataInit"},
 {ERR_FUNC(CMS_F_CMS_DECRYPT),	"CMS_decrypt"},
-{ERR_FUNC(CMS_F_CMS_DECRYPTEDCONTENT_DECRYPT_BIO),	"CMS_DECRYPTEDCONTENT_DECRYPT_BIO"},
-{ERR_FUNC(CMS_F_CMS_DECRYPTEDCONTENT_ENCRYPT_BIO),	"CMS_DECRYPTEDCONTENT_ENCRYPT_BIO"},
-{ERR_FUNC(CMS_F_CMS_DECRYPT_SET1_KEY),	"CMS_DECRYPT_SET1_KEY"},
-{ERR_FUNC(CMS_F_CMS_DECRYPT_SET1_PKEY),	"CMS_DECRYPT_SET1_PKEY"},
+{ERR_FUNC(CMS_F_CMS_DECRYPT_SET1_KEY),	"CMS_decrypt_set1_key"},
+{ERR_FUNC(CMS_F_CMS_DECRYPT_SET1_PKEY),	"CMS_decrypt_set1_pkey"},
 {ERR_FUNC(CMS_F_CMS_DIGESTALGORITHM_FIND_CTX),	"CMS_DIGESTALGORITHM_FIND_CTX"},
 {ERR_FUNC(CMS_F_CMS_DIGESTALGORITHM_INIT_BIO),	"CMS_DIGESTALGORITHM_INIT_BIO"},
 {ERR_FUNC(CMS_F_CMS_DIGESTEDDATA_DO_FINAL),	"CMS_DIGESTEDDATA_DO_FINAL"},
 {ERR_FUNC(CMS_F_CMS_DIGEST_VERIFY),	"CMS_digest_verify"},
 {ERR_FUNC(CMS_F_CMS_ENCRYPT),	"CMS_encrypt"},
-{ERR_FUNC(CMS_F_CMS_ENCRYPTEDCONTENT_DECRYPT_BIO),	"CMS_ENCRYPTEDCONTENT_DECRYPT_BIO"},
-{ERR_FUNC(CMS_F_CMS_ENCRYPTEDCONTENT_ENCRYPT_BIO),	"CMS_ENCRYPTEDCONTENT_ENCRYPT_BIO"},
 {ERR_FUNC(CMS_F_CMS_ENCRYPTEDCONTENT_INIT_BIO),	"CMS_ENCRYPTEDCONTENT_INIT_BIO"},
-{ERR_FUNC(CMS_F_CMS_ENCRYPTEDCONTENT_TO_BIO),	"CMS_ENCRYPTEDCONTENT_TO_BIO"},
 {ERR_FUNC(CMS_F_CMS_ENCRYPTEDDATA_DECRYPT),	"CMS_EncryptedData_decrypt"},
 {ERR_FUNC(CMS_F_CMS_ENCRYPTEDDATA_ENCRYPT),	"CMS_EncryptedData_encrypt"},
-{ERR_FUNC(CMS_F_CMS_ENCRYPTEDDATA_INIT_BIO),	"CMS_ENCRYPTEDDATA_INIT_BIO"},
 {ERR_FUNC(CMS_F_CMS_ENCRYPTEDDATA_SET1_KEY),	"CMS_EncryptedData_set1_key"},
-{ERR_FUNC(CMS_F_CMS_ENCRYPTED_DATA_DECRYPT),	"CMS_ENCRYPTED_DATA_DECRYPT"},
 {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"},
@@ -115,12 +106,10 @@ static ERR_STRING_DATA CMS_str_functs[]=
 {ERR_FUNC(CMS_F_CMS_GET0_REVOCATION_CHOICES),	"CMS_GET0_REVOCATION_CHOICES"},
 {ERR_FUNC(CMS_F_CMS_GET0_SIGNED),	"CMS_GET0_SIGNED"},
 {ERR_FUNC(CMS_F_CMS_RECIPIENTINFO_DECRYPT),	"CMS_RecipientInfo_decrypt"},
-{ERR_FUNC(CMS_F_CMS_RECIPIENTINFO_KEKI_KEY_CMP),	"CMS_RECIPIENTINFO_KEKI_KEY_CMP"},
 {ERR_FUNC(CMS_F_CMS_RECIPIENTINFO_KEKRI_DECRYPT),	"CMS_RECIPIENTINFO_KEKRI_DECRYPT"},
 {ERR_FUNC(CMS_F_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),	"CMS_RecipientInfo_kekri_id_cmp"},
-{ERR_FUNC(CMS_F_CMS_RECIPIENTINFO_KEKRI_KEY_CMP),	"CMS_RECIPIENTINFO_KEKRI_KEY_CMP"},
 {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"},
 {ERR_FUNC(CMS_F_CMS_RECIPIENTINFO_KTRI_ENCRYPT),	"CMS_RECIPIENTINFO_KTRI_ENCRYPT"},