[openssl] master update

[Matt Caswell]

The branch master has been updated
       via  a70535f84902b8d86c16ef3fe9d570b96fa5cfce (commit)
      from  fd03868b34faaa711403d9ac0843d33811fbf961 (commit)


- Log -----------------------------------------------------------------
commit a70535f84902b8d86c16ef3fe9d570b96fa5cfce
Author: Matt Caswell <matt at openssl.org>
Date:   Fri Mar 27 17:16:59 2020 +0000

    Give a better error if we can't find a sig alg
    
    Some scenarios where we could not find a suitable sig alg just
    gave "internal error" as the reason - which isn't very helpful. A
    more suitable reason code already exists - so we use that.
    
    Reviewed-by: Paul Dale <paul.dale at oracle.com>
    Reviewed-by: Tomas Mraz <tmraz at fedoraproject.org>
    (Merged from https://github.com/openssl/openssl/pull/11425)

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

Summary of changes:
 ssl/t1_lib.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
index 4ab046b7b3..624add64a8 100644
--- a/ssl/t1_lib.c
+++ b/ssl/t1_lib.c
@@ -2964,7 +2964,7 @@ int tls_choose_sigalg(SSL *s, int fatalerrs)
                     if (!fatalerrs)
                         return 1;
                     SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_TLS_CHOOSE_SIGALG,
-                             ERR_R_INTERNAL_ERROR);
+                             SSL_R_NO_SUITABLE_SIGNATURE_ALGORITHM);
                     return 0;
                 }
 
@@ -2989,7 +2989,7 @@ int tls_choose_sigalg(SSL *s, int fatalerrs)
                 if (!fatalerrs)
                     return 1;
                 SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_TLS_CHOOSE_SIGALG,
-                         ERR_R_INTERNAL_ERROR);
+                         SSL_R_NO_SUITABLE_SIGNATURE_ALGORITHM);
                 return 0;
             }
         }