From 33a89fa66c9c30113f3129244392dc94ada72d57 Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Thu, 26 Feb 2015 19:26:53 +0000 Subject: Skip unsupported ciphers in evp_test. Reviewed-by: Matt Caswell --- crypto/evp/evp_test.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/crypto/evp/evp_test.c b/crypto/evp/evp_test.c index 7d15332a28..9726993163 100644 --- a/crypto/evp/evp_test.c +++ b/crypto/evp/evp_test.c @@ -638,8 +638,14 @@ static int cipher_test_init(struct evp_test *t, const char *alg) const EVP_CIPHER *cipher; struct cipher_data *cdat = t->data; cipher = EVP_get_cipherbyname(alg); - if (!cipher) + if (!cipher) { + /* If alg has an OID assume disabled algorithm */ + if (OBJ_sn2nid(alg) != NID_undef || OBJ_ln2nid(alg) != NID_undef) { + t->skip = 1; + return 1; + } return 0; + } cdat = OPENSSL_malloc(sizeof(struct cipher_data)); cdat->cipher = cipher; cdat->enc = -1; -- cgit v1.2.3