ci = ASN1_item_d2i_bio_ex(ASN1_ITEM_rptr(CMS_ContentInfo), bp, cms,
ossl_cms_ctx_get0_libctx(ctx),
ossl_cms_ctx_get0_propq(ctx));
- if (ci != NULL)
+ if (ci != NULL) {
+ ERR_set_mark();
ossl_cms_resolve_libctx(ci);
+ ERR_pop_to_mark();
+ }
return ci;
}
(ASN1_VALUE **)cms,
ossl_cms_ctx_get0_libctx(ctx),
ossl_cms_ctx_get0_propq(ctx));
- if (ci != NULL)
+ if (ci != NULL) {
+ ERR_set_mark();
ossl_cms_resolve_libctx(ci);
+ ERR_pop_to_mark();
+ }
return ci;
}
static X509 *cert = NULL;
static EVP_PKEY *privkey = NULL;
+static char *derin = NULL;
static int test_encrypt_decrypt(const EVP_CIPHER *cipher)
{
return ret;
}
-OPT_TEST_DECLARE_USAGE("certfile privkeyfile\n")
+static int test_d2i_CMS_bio_file_encrypted_data(void)
+{
+ BIO *bio = NULL;
+ CMS_ContentInfo *cms = NULL;
+ int ret = 0;
+
+ ERR_clear_error();
+
+ if (!TEST_ptr(bio = BIO_new_file(derin, "r"))
+ || !TEST_ptr(cms = d2i_CMS_bio(bio, NULL)))
+ goto end;
+
+ if (!TEST_int_eq(ERR_peek_error(), 0))
+ goto end;
+
+ ret = 1;
+end:
+ CMS_ContentInfo_free(cms);
+ BIO_free(bio);
+
+ return ret;
+}
+
+OPT_TEST_DECLARE_USAGE("certfile privkeyfile derfile\n")
int setup_tests(void)
{
}
if (!TEST_ptr(certin = test_get_argument(0))
- || !TEST_ptr(privkeyin = test_get_argument(1)))
+ || !TEST_ptr(privkeyin = test_get_argument(1))
+ || !TEST_ptr(derin = test_get_argument(2)))
return 0;
certbio = BIO_new_file(certin, "r");
ADD_TEST(test_encrypt_decrypt_aes_192_gcm);
ADD_TEST(test_encrypt_decrypt_aes_256_gcm);
ADD_TEST(test_d2i_CMS_bio_NULL);
+ ADD_TEST(test_d2i_CMS_bio_file_encrypted_data);
return 1;
}
plan tests => 1;
ok(run(test(["cmsapitest", srctop_file("test", "certs", "servercert.pem"),
- srctop_file("test", "certs", "serverkey.pem")])),
+ srctop_file("test", "certs", "serverkey.pem"),
+ srctop_file("test", "recipes", "80-test_cmsapi_data", "encryptedData.der")])),
"running cmsapitest");