[openssl-commits] [openssl] master update

[kaduk at mit.edu]

The branch master has been updated
       via  354ab3653c0f9a218d91d4e5679c738896253d26 (commit)
      from  52b6e17da4c8eea982a19d1a1f34ba24416fb73e (commit)


- Log -----------------------------------------------------------------
commit 354ab3653c0f9a218d91d4e5679c738896253d26
Author: Benjamin Kaduk <bkaduk at akamai.com>
Date:   Thu Jul 27 10:27:20 2017 -0500

    Define a value for SYS_F_FCNTL
    
    This symbol was added in commit d33b215b331116e50947ca7e75d210e1db39b78d
    but was only used in certain (presumed uncommon) preprocessor conditionals,
    as no build failures have been reported yet.
    
    Reported by Balaji Marisetti.
    
    Closes: #4029
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/4030)

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

Summary of changes:
 crypto/err/err.c      | 1 +
 include/openssl/err.h | 1 +
 2 files changed, 2 insertions(+)

diff --git a/crypto/err/err.c b/crypto/err/err.c
index 8d0ed6f..9db3530 100644
--- a/crypto/err/err.c
+++ b/crypto/err/err.c
@@ -89,6 +89,7 @@ static ERR_STRING_DATA ERR_str_functs[] = {
     {ERR_PACK(0, SYS_F_CLOSE, 0), "close"},
     {ERR_PACK(0, SYS_F_IOCTL, 0), "ioctl"},
     {ERR_PACK(0, SYS_F_STAT, 0), "stat"},
+    {ERR_PACK(0, SYS_F_FCNTL, 0), "fcntl"},
     {0, NULL},
 };
 
diff --git a/include/openssl/err.h b/include/openssl/err.h
index d518d60..8b266f9 100644
--- a/include/openssl/err.h
+++ b/include/openssl/err.h
@@ -165,6 +165,7 @@ typedef struct err_state_st {
 # define SYS_F_CLOSE             20
 # define SYS_F_IOCTL             21
 # define SYS_F_STAT              22
+# define SYS_F_FCNTL             23
 
 /* reasons */
 # define ERR_R_SYS_LIB   ERR_LIB_SYS/* 2 */