[openssl] master update

[Matt Caswell]

The branch master has been updated
       via  514c9da48b860153079748b0d588cd42191f0b6a (commit)
      from  87930507ff1c020d4ba1ca895ef3ef08e17253b3 (commit)


- Log -----------------------------------------------------------------
commit 514c9da48b860153079748b0d588cd42191f0b6a
Author: Guido Vranken <guidovran...@gmail.com>
Date:   Mon Apr 22 14:11:12 2019 +0200

    Enforce a strict output length check in CRYPTO_ccm128_tag
    
    Return error if the output tag buffer size doesn't match
    the tag size exactly. This prevents the caller from
    using that portion of the tag buffer that remains
    uninitialized after an otherwise succesfull call to
    CRYPTO_ccm128_tag.
    
    Bug found by OSS-Fuzz.
    
    Fix suggested by Kurt Roeckx.
    
    Signed-off-by: Guido Vranken <guidovran...@gmail.com>
    
    Reviewed-by: Matthias St. Pierre <matthias.st.pie...@ncp-e.com>
    Reviewed-by: Paul Dale <paul.d...@oracle.com>
    Reviewed-by: Matt Caswell <m...@openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/8810)

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

Summary of changes:
 crypto/modes/ccm128.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto/modes/ccm128.c b/crypto/modes/ccm128.c
index 9edf027..bfa2d46 100644
--- a/crypto/modes/ccm128.c
+++ b/crypto/modes/ccm128.c
@@ -425,7 +425,7 @@ size_t CRYPTO_ccm128_tag(CCM128_CONTEXT *ctx, unsigned char 
*tag, size_t len)
 
     M *= 2;
     M += 2;
-    if (len < M)
+    if (len != M)
         return 0;
     memcpy(tag, ctx->cmac.c, M);
     return M;