diff options
| author | Matt Caswell <matt@openssl.org> | 2016-03-18 13:49:25 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2016-03-18 17:07:11 +0000 |
| commit | b4a3aeebd9f9280aa7e69a343f5c824e68466d90 (patch) | |
| tree | 83d9d751359bcb4429477afc236660b03dc57bfe /test | |
| parent | ef33d131850440da8556f08996f63898e849d267 (diff) | |
Fix no-cmac
There were a couple of CMAC references without OPENSSL_NO_CMAC guards.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'test')
| -rw-r--r-- | test/evp_test.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/test/evp_test.c b/test/evp_test.c index bda7f694a3..759ec3be4a 100644 --- a/test/evp_test.c +++ b/test/evp_test.c @@ -1022,11 +1022,16 @@ static int mac_test_init(struct evp_test *t, const char *alg) { int type; struct mac_data *mdat; - if (strcmp(alg, "HMAC") == 0) + if (strcmp(alg, "HMAC") == 0) { type = EVP_PKEY_HMAC; - else if (strcmp(alg, "CMAC") == 0) + } else if (strcmp(alg, "CMAC") == 0) { +#ifndef OPENSSL_NO_CMAC type = EVP_PKEY_CMAC; - else +#else + t->skip = 1; + return 1; +#endif + } else return 0; mdat = OPENSSL_malloc(sizeof(*mdat)); |