-#define CMS_R_CMS_DATAFINAL_ERROR 101
-#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_ERROR_GETTING_PUBLIC_KEY 109
-#define CMS_R_ERROR_READING_MESSAGEDIGEST_ATTRIBUTE 110
-#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_KEY_TRANSPORT 114
-#define CMS_R_NOT_SUPPORTED_FOR_THIS_KEY_TYPE 115
-#define CMS_R_NO_CONTENT 116
-#define CMS_R_NO_DEFAULT_DIGEST 117
-#define CMS_R_NO_DIGEST_SET 118
-#define CMS_R_NO_MATCHING_DIGEST 119
-#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_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_UNABLE_TO_FINALIZE_CONTEXT 131
-#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_UNSUPPORTED_TYPE 136
-#define CMS_R_VERIFICATION_FAILURE 137
+#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_CONTENTIDENTIFIER_MISMATCH 170
+#define CMS_R_CONTENT_NOT_FOUND 105
+#define CMS_R_CONTENT_TYPE_MISMATCH 171
+#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_DIGEST_ERROR 161
+#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_MSGSIGDIGEST_ERROR 172
+#define CMS_R_MSGSIGDIGEST_VERIFICATION_FAILURE 162
+#define CMS_R_MSGSIGDIGEST_WRONG_LENGTH 163
+#define CMS_R_NEED_ONE_SIGNER 164
+#define CMS_R_NOT_A_SIGNED_RECEIPT 165
+#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_CONTENT_TYPE 173
+#define CMS_R_NO_DEFAULT_DIGEST 128
+#define CMS_R_NO_DIGEST_SET 129
+#define CMS_R_NO_KEY 130
+#define CMS_R_NO_KEY_OR_CERT 174
+#define CMS_R_NO_MATCHING_DIGEST 131
+#define CMS_R_NO_MATCHING_RECIPIENT 132
+#define CMS_R_NO_MATCHING_SIGNATURE 166
+#define CMS_R_NO_MSGSIGDIGEST 167
+#define CMS_R_NO_PRIVATE_KEY 133
+#define CMS_R_NO_PUBLIC_KEY 134
+#define CMS_R_NO_RECEIPT_REQUEST 168
+#define CMS_R_NO_SIGNERS 135
+#define CMS_R_PRIVATE_KEY_DOES_NOT_MATCH_CERTIFICATE 136
+#define CMS_R_RECEIPT_DECODE_ERROR 169
+#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 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 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 158
+#define CMS_R_WRAP_ERROR 159