[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  8bfa99f04f9763a6a8d72a6d5c1f0a962f8a084b (commit)
      from  1307af228343c5fc414353011ee3fecf45bac90a (commit)


- Log -----------------------------------------------------------------
commit 8bfa99f04f9763a6a8d72a6d5c1f0a962f8a084b
Author: Todd Short <tshort at akamai.com>
Date:   Thu Dec 22 09:06:59 2016 -0500

    Fix EVP_MD_meth_get_flags
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/2134)

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

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

diff --git a/crypto/evp/evp_lib.c b/crypto/evp/evp_lib.c
index 4333fb9..0c76db5 100644
--- a/crypto/evp/evp_lib.c
+++ b/crypto/evp/evp_lib.c
@@ -404,7 +404,7 @@ int EVP_MD_meth_get_app_datasize(const EVP_MD *md)
 }
 unsigned long EVP_MD_meth_get_flags(const EVP_MD *md)
 {
-    return md->block_size;
+    return md->flags;
 }
 int (*EVP_MD_meth_get_init(const EVP_MD *md))(EVP_MD_CTX *ctx)
 {