[openssl-commits] [openssl] OpenSSL_1_1_0-stable update

[Richard Levitte]

The branch OpenSSL_1_1_0-stable has been updated
       via  e00fa4ee53e05fac63b5a25f8e9ea71a1ec59c33 (commit)
      from  096adcf28ab75ec0bd83ce2cb7f0ba197ba4268f (commit)


- Log -----------------------------------------------------------------
commit e00fa4ee53e05fac63b5a25f8e9ea71a1ec59c33
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Apr 26 09:59:22 2018 +0200

    Use  get_last_sys_error() instead of get_last_rtl_error()
    
    get_last_sys_error() already exists, so there's no need for yet
    another macro that fulfills the same purpose.
    
    Fixes #4120
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/6088)
    
    (cherry picked from commit b4c35656441929ce6f6be112648d637cba51dc91)

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

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

diff --git a/crypto/bio/b_sock.c b/crypto/bio/b_sock.c
index 97dcc70..99c13a0 100644
--- a/crypto/bio/b_sock.c
+++ b/crypto/bio/b_sock.c
@@ -317,7 +317,7 @@ int BIO_socket_nbio(int s, int mode)
 
     l = fcntl(s, F_GETFL, 0);
     if (l == -1) {
-        SYSerr(SYS_F_FCNTL, get_last_rtl_error());
+        SYSerr(SYS_F_FCNTL, get_last_sys_error());
         ret = -1;
     } else {
 #  if defined(O_NONBLOCK)
@@ -335,7 +335,7 @@ int BIO_socket_nbio(int s, int mode)
         ret = fcntl(s, F_SETFL, l);
 
         if (ret < 0) {
-            SYSerr(SYS_F_FCNTL, get_last_rtl_error());
+            SYSerr(SYS_F_FCNTL, get_last_sys_error());
         }
     }
 # else