[openssl] master update

[Dr. Paul Dale]

The branch master has been updated
       via  067a3057c3aab0cdd9a3cdb13c2e0000f69a4170 (commit)
      from  4bb73d5409c056a878f526280f86cc3c01f8cd68 (commit)


- Log -----------------------------------------------------------------
commit 067a3057c3aab0cdd9a3cdb13c2e0000f69a4170
Author: jwalch <jeremy.walch at gmail.com>
Date:   Thu Sep 10 12:14:40 2020 -0400

    Annotate potential -Wunused-function violations in err.h
    
    Fixes #12792
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Paul Dale <paul.dale at oracle.com>
    (Merged from https://github.com/openssl/openssl/pull/12851)

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

Summary of changes:
 include/openssl/err.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/openssl/err.h b/include/openssl/err.h
index 3e3b64b158..8e76b812df 100644
--- a/include/openssl/err.h
+++ b/include/openssl/err.h
@@ -214,33 +214,33 @@ struct err_state_st {
 
 # define ERR_SYSTEM_ERROR(errcode)      (((errcode) & ERR_SYSTEM_FLAG) != 0)
 
-static ossl_inline int ERR_GET_LIB(unsigned long errcode)
+static ossl_unused ossl_inline int ERR_GET_LIB(unsigned long errcode)
 {
     if (ERR_SYSTEM_ERROR(errcode))
         return ERR_LIB_SYS;
     return (errcode >> ERR_LIB_OFFSET) & ERR_LIB_MASK;
 }
 
-static ossl_inline int ERR_GET_FUNC(unsigned long errcode ossl_unused)
+static ossl_unused ossl_inline int ERR_GET_FUNC(unsigned long errcode ossl_unused)
 {
     return 0;
 }
 
-static ossl_inline int ERR_GET_RFLAGS(unsigned long errcode)
+static ossl_unused ossl_inline int ERR_GET_RFLAGS(unsigned long errcode)
 {
     if (ERR_SYSTEM_ERROR(errcode))
         return 0;
     return errcode & (ERR_RFLAGS_MASK << ERR_RFLAGS_OFFSET);
 }
 
-static ossl_inline int ERR_GET_REASON(unsigned long errcode)
+static ossl_unused ossl_inline int ERR_GET_REASON(unsigned long errcode)
 {
     if (ERR_SYSTEM_ERROR(errcode))
         return errcode & ERR_SYSTEM_MASK;
     return errcode & ERR_REASON_MASK;
 }
 
-static ossl_inline int ERR_FATAL_ERROR(unsigned long errcode)
+static ossl_unused ossl_inline int ERR_FATAL_ERROR(unsigned long errcode)
 {
     return (ERR_GET_RFLAGS(errcode) & ERR_RFLAG_FATAL) != 0;
 }