[openssl] master update

[patrick.steuer at de.ibm.com]

The branch master has been updated
       via  887e22dd8b6f054e39b2d20fc8870eaba7fc61a8 (commit)
      from  da89ac0b25c5198bb0d707d7545bea7bc1c5a01e (commit)


- Log -----------------------------------------------------------------
commit 887e22dd8b6f054e39b2d20fc8870eaba7fc61a8
Author: Patrick Steuer <patrick.steuer at de.ibm.com>
Date:   Tue May 21 19:10:28 2019 +0200

    s390x assembly pack: allow specifying the tag after aad in aes-ccm
    
    67c81ec311 forgot about s390x
    
    Signed-off-by: Patrick Steuer <patrick.steuer at de.ibm.com>
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    Reviewed-by: Shane Lontis <shane.lontis at oracle.com>
    (Merged from https://github.com/openssl/openssl/pull/8971)

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

Summary of changes:
 crypto/evp/e_aes.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/crypto/evp/e_aes.c b/crypto/evp/e_aes.c
index 6d8d437..c9dbca9 100644
--- a/crypto/evp/e_aes.c
+++ b/crypto/evp/e_aes.c
@@ -2264,9 +2264,6 @@ static int s390x_aes_ccm_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
     if (!cctx->aes.ccm.iv_set)
         return -1;
 
-    if (!enc && !cctx->aes.ccm.tag_set)
-        return -1;
-
     if (out == NULL) {
         /* Update(): Pass message length. */
         if (in == NULL) {
@@ -2285,6 +2282,10 @@ static int s390x_aes_ccm_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
         return len;
     }
 
+    /* The tag must be set before actually decrypting data */
+    if (!enc && !cctx->aes.ccm.tag_set)
+        return -1;
+
     /* Update(): Process message. */
 
     if (!cctx->aes.ccm.len_set) {