diff options
| author | Tobias Nießen <tniessen@tnie.de> | 2018-09-14 21:43:12 +0200 |
|---|---|---|
| committer | Dr. Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com> | 2018-09-18 09:22:10 +0200 |
| commit | 523fcfb4c081ec346f117fd493103ddcd521e431 (patch) | |
| tree | 9a86ab3d80f19156fa904a1e8f34fcabc98d729c /test | |
| parent | d474100af0827d9ba87f3bb25a34867244552df5 (diff) | |
Trivial test improvements
This commit reuses a variable instead of reevaluating the expression
and updates an outdated comment in the EVP test.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
(Merged from https://github.com/openssl/openssl/pull/7242)
Diffstat (limited to 'test')
| -rw-r--r-- | test/evp_test.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/evp_test.c b/test/evp_test.c index 98301e657b..2ac69e11da 100644 --- a/test/evp_test.c +++ b/test/evp_test.c @@ -459,7 +459,7 @@ typedef struct cipher_data_st { size_t plaintext_len; unsigned char *ciphertext; size_t ciphertext_len; - /* GCM, CCM only */ + /* GCM, CCM and OCB only */ unsigned char *aad; size_t aad_len; unsigned char *tag; @@ -487,7 +487,7 @@ static int cipher_test_init(EVP_TEST *t, const char *alg) if (m == EVP_CIPH_GCM_MODE || m == EVP_CIPH_OCB_MODE || m == EVP_CIPH_CCM_MODE) - cdat->aead = EVP_CIPHER_mode(cipher); + cdat->aead = m; else if (EVP_CIPHER_flags(cipher) & EVP_CIPH_FLAG_AEAD_CIPHER) cdat->aead = -1; else |