[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  e82e2186e93e9a678dd8c0c5ba084d21d27d4d62 (commit)
      from  047a5da2494abf565f5fb76f5cd92a05cd7fadd4 (commit)


- Log -----------------------------------------------------------------
commit e82e2186e93e9a678dd8c0c5ba084d21d27d4d62
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Sep 8 23:39:26 2016 +0200

    If errno is ENXIO in BSS_new_file(), set BIO_R_NO_SUCH_FILE
    
    VMS sets that errno when the device part of a file spec is malformed
    or a logical name that doesn't exist.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

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

Summary of changes:
 crypto/bio/bss_file.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/crypto/bio/bss_file.c b/crypto/bio/bss_file.c
index 4f79c32..6af2d9c 100644
--- a/crypto/bio/bss_file.c
+++ b/crypto/bio/bss_file.c
@@ -73,7 +73,11 @@ BIO *BIO_new_file(const char *filename, const char *mode)
     if (file == NULL) {
         SYSerr(SYS_F_FOPEN, get_last_sys_error());
         ERR_add_error_data(5, "fopen('", filename, "','", mode, "')");
-        if (errno == ENOENT)
+        if (errno == ENOENT
+# ifdef ENXIO
+            || errno == ENXIO
+# endif
+            )
             BIOerr(BIO_F_BIO_NEW_FILE, BIO_R_NO_SUCH_FILE);
         else
             BIOerr(BIO_F_BIO_NEW_FILE, ERR_R_SYS_LIB);