diff options
author | Dr. Stephen Henson <steve@openssl.org> | 2015-02-26 19:26:53 +0000 |
---|---|---|
committer | Dr. Stephen Henson <steve@openssl.org> | 2015-02-27 00:18:10 +0000 |
commit | 33a89fa66c9c30113f3129244392dc94ada72d57 (patch) | |
tree | 8bc758647e313b8bd6522a9e911c7a75dd0511d8 | |
parent | 35313768c77191a61bd6e34393d89e7b7cd78465 (diff) |
Skip unsupported ciphers in evp_test.
Reviewed-by: Matt Caswell <matt@openssl.org>
-rw-r--r-- | crypto/evp/evp_test.c | 8 |
1 files changed, 7 insertions, 1 deletions
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; |