[openssl] master update

[Matt Caswell]

The branch master has been updated
       via  c50fd0f959de5b256d8eefb8ad2a82fcdcb899c3 (commit)
      from  f305ecdac0b7048e7ef38a7196f4393fa7ceff38 (commit)


- Log -----------------------------------------------------------------
commit c50fd0f959de5b256d8eefb8ad2a82fcdcb899c3
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Aug 6 13:39:00 2019 +0100

    Fix BN error reporting
    
    Commit ed57f7f935 implemented the macro ERR_raise and updated err.h to use
    it. A typo in err.h means that errors in the BN library are mistakenly
    attributed to the RSA library.
    
    This was found due to the following error appearing in a travis log:
    
    00:07:CB:13:05:7F:00:00:error:0400006C:rsa routines::data greater than mod
    len:crypto/bn/bn_gcd.c:613:
    00:07:CB:13:05:7F:00:00:error:04000003:rsa routines::BN
    lib:crypto/rsa/rsa_gen.c:393:
    /home/travis/build/openssl/openssl/util/shlib_wrap.sh
    /home/travis/build/openssl/openssl/apps/openssl genrsa -out rsamptest.pem
    -primes 5 8192 => 1
    not ok 12 - genrsa 8192p5
    
    The line in question (crypto/bn/bn_gcd.c:613) actually looks like this:
    
            BNerr(BN_F_BN_MOD_INVERSE_NO_BRANCH, BN_R_NO_INVERSE);
    
    The test was checking for that error being raised, but was instead seeing
    a different error and thus failing.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Paul Yang <kaishen.yy at antfin.com>
    (Merged from https://github.com/openssl/openssl/pull/9539)

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

Summary of changes:
 include/openssl/err.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/openssl/err.h b/include/openssl/err.h
index ad5ed5a292..e5a1a0dc1e 100644
--- a/include/openssl/err.h
+++ b/include/openssl/err.h
@@ -110,7 +110,7 @@ typedef struct err_state_st {
 # if ! OPENSSL_API_3
 #  define SYSerr(f,r)  ERR_raise(ERR_LIB_SYS,(r))
 # endif
-# define BNerr(f,r)   ERR_raise(ERR_LIB_RSA,(r))
+# define BNerr(f,r)   ERR_raise(ERR_LIB_BN,(r))
 # define RSAerr(f,r)  ERR_raise(ERR_LIB_RSA,(r))
 # define DHerr(f,r)   ERR_raise(ERR_LIB_DH,(r))
 # define EVPerr(f,r)  ERR_raise(ERR_LIB_EVP,(r))