-#define CMS_F_CHECK_CONTENT 151
-#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_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_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_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_KTRI_CERT_CMP 122
-#define CMS_F_CMS_RECIPIENTINFO_KTRI_GET0_ALGS 123
-#define CMS_F_CMS_RECIPIENTINFO_KTRI_GET0_SIGNER_ID 124
-#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_CERT 164
+#define CMS_F_CMS_ADD0_RECIPIENT_KEY 100
+#define CMS_F_CMS_ADD1_RECEIPTREQUEST 158
+#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_ENCODE_RECEIPT 161
+#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_MSGSIGDIGEST_ADD1 162
+#define CMS_F_CMS_RECEIPTREQUEST_CREATE0 159
+#define CMS_F_CMS_RECEIPT_VERIFY 160
+#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_SIGN_RECEIPT 163
+#define CMS_F_CMS_STREAM 155
+#define CMS_F_CMS_UNCOMPRESS 156
+#define CMS_F_CMS_VERIFY 157