[openssl] master update

[Richard Levitte]

The branch master has been updated
       via  e321ba28e89d40ab750e353d5bd7fc405e9c2761 (commit)
      from  b8472b4e67ec7ad49254821f2da578ce588df4e6 (commit)


- Log -----------------------------------------------------------------
commit e321ba28e89d40ab750e353d5bd7fc405e9c2761
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Apr 3 22:54:00 2019 +0200

    Correct EVP_F_EVP_MD_BLOCK_SIZE number
    
    The number that was used was already taken
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/8656)

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

Summary of changes:
 crypto/err/openssl.txt   | 2 +-
 include/openssl/evperr.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/crypto/err/openssl.txt b/crypto/err/openssl.txt
index f15fc9c..6782966 100644
--- a/crypto/err/openssl.txt
+++ b/crypto/err/openssl.txt
@@ -800,7 +800,7 @@ EVP_F_EVP_MAC_CTRL_STR:210:EVP_MAC_ctrl_str
 EVP_F_EVP_MAC_CTX_COPY:211:EVP_MAC_CTX_copy
 EVP_F_EVP_MAC_CTX_NEW:213:EVP_MAC_CTX_new
 EVP_F_EVP_MAC_INIT:212:EVP_MAC_init
-EVP_F_EVP_MD_BLOCK_SIZE:229:EVP_MD_block_size
+EVP_F_EVP_MD_BLOCK_SIZE:232:EVP_MD_block_size
 EVP_F_EVP_MD_CTX_COPY_EX:110:EVP_MD_CTX_copy_ex
 EVP_F_EVP_MD_SIZE:162:EVP_MD_size
 EVP_F_EVP_OPENINIT:102:EVP_OpenInit
diff --git a/include/openssl/evperr.h b/include/openssl/evperr.h
index 317be14..34d5e60 100644
--- a/include/openssl/evperr.h
+++ b/include/openssl/evperr.h
@@ -70,7 +70,7 @@ int ERR_load_EVP_strings(void);
 # define EVP_F_EVP_MAC_CTX_COPY                           211
 # define EVP_F_EVP_MAC_CTX_NEW                            213
 # define EVP_F_EVP_MAC_INIT                               212
-# define EVP_F_EVP_MD_BLOCK_SIZE                          229
+# define EVP_F_EVP_MD_BLOCK_SIZE                          232
 # define EVP_F_EVP_MD_CTX_COPY_EX                         110
 # define EVP_F_EVP_MD_SIZE                                162
 # define EVP_F_EVP_OPENINIT                               102