[openssl-commits] [openssl] OpenSSL_1_1_1-stable update

[matthias.st.pierre at ncp-e.com]

The branch OpenSSL_1_1_1-stable has been updated
       via  cfacc73a055620d9d151fd083d7a23999b0dcbdb (commit)
      from  66228d53c91440e3b5e8bc96ebdf272d48ce34c8 (commit)


- Log -----------------------------------------------------------------
commit cfacc73a055620d9d151fd083d7a23999b0dcbdb
Author: Tobias Nießen <tniessen at tnie.de>
Date:   Fri Sep 14 21:43:12 2018 +0200

    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 at openssl.org>
    Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre at ncp-e.com>
    (Merged from https://github.com/openssl/openssl/pull/7242)
    
    (cherry picked from commit 523fcfb4c081ec346f117fd493103ddcd521e431)

-----------------------------------------------------------------------

Summary of changes:
 test/evp_test.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/evp_test.c b/test/evp_test.c
index 98301e6..2ac69e1 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