#include "cmp_testlib.h"
#include <openssl/rsa.h> /* needed in case config no-deprecated */
-DEFINE_STACK_OF(X509)
-
-EVP_PKEY *load_pem_key(const char *file)
+EVP_PKEY *load_pem_key(const char *file, OPENSSL_CTX *libctx)
{
EVP_PKEY *key = NULL;
BIO *bio = NULL;
if (!TEST_ptr(bio = BIO_new(BIO_s_file())))
return NULL;
if (TEST_int_gt(BIO_read_filename(bio, file), 0))
- (void)TEST_ptr(key = PEM_read_bio_PrivateKey(bio, NULL, NULL, NULL));
+ (void)TEST_ptr(key = PEM_read_bio_PrivateKey_ex(bio, NULL, NULL, NULL,
+ libctx, NULL));
BIO_free(bio);
return key;
}
-X509 *load_pem_cert(const char *file)
+X509 *load_pem_cert(const char *file, OPENSSL_CTX *libctx)
{
X509 *cert = NULL;
BIO *bio = NULL;
if (!TEST_ptr(bio = BIO_new(BIO_s_file())))
return NULL;
- if (TEST_int_gt(BIO_read_filename(bio, file), 0))
- (void)TEST_ptr(cert = PEM_read_bio_X509(bio, NULL, NULL, NULL));
+ if (TEST_int_gt(BIO_read_filename(bio, file), 0)
+ && TEST_ptr(cert = X509_new_ex(libctx, NULL)))
+ (void)TEST_ptr(cert = PEM_read_bio_X509(bio, &cert, NULL, NULL));
BIO_free(bio);
return cert;
{
OSSL_CMP_MSG *msg;
- (void)TEST_ptr((msg = ossl_cmp_msg_load(file)));
+ (void)TEST_ptr((msg = OSSL_CMP_MSG_read(file)));
return msg;
}
return csr;
}
-EVP_PKEY *gen_rsa(void)
-{
- EVP_PKEY_CTX *ctx = NULL;
- EVP_PKEY *pkey = NULL;
-
- (void)(TEST_ptr(ctx = EVP_PKEY_CTX_new_id(EVP_PKEY_RSA, NULL))
- && TEST_int_gt(EVP_PKEY_keygen_init(ctx), 0)
- && TEST_int_gt(EVP_PKEY_CTX_set_rsa_keygen_bits(ctx, 2048), 0)
- && TEST_int_gt(EVP_PKEY_keygen(ctx, &pkey), 0));
- EVP_PKEY_CTX_free(ctx);
- return pkey;
-}
-
/*
* Checks whether the syntax of msg conforms to ASN.1
*/