1 files changed, 12 insertions, 97 deletions

diff --git a/src/lib/libcrypto/bio/bss_file.c b/src/lib/libcrypto/bio/bss_file.c
index 4df9927c43..58fade9f29 100644
--- a/src/lib/libcrypto/bio/bss_file.c
+++ b/src/lib/libcrypto/bio/bss_file.c
@@ -65,34 +65,12 @@
 #ifndef HEADER_BSS_FILE_C
 #define HEADER_BSS_FILE_C
 
-#if defined(__linux) || defined(__sun) || defined(__hpux)
-/* Following definition aliases fopen to fopen64 on above mentioned
- * platforms. This makes it possible to open and sequentially access
- * files larger than 2GB from 32-bit application. It does not allow to
- * traverse them beyond 2GB with fseek/ftell, but on the other hand *no*
- * 32-bit platform permits that, not with fseek/ftell. Not to mention
- * that breaking 2GB limit for seeking would require surgery to *our*
- * API. But sequential access suffices for practical cases when you
- * can run into large files, such as fingerprinting, so we can let API
- * alone. For reference, the list of 32-bit platforms which allow for
- * sequential access of large files without extra "magic" comprise *BSD,
- * Darwin, IRIX...
- */
-#ifndef _FILE_OFFSET_BITS
-#define _FILE_OFFSET_BITS 64
-#endif
-#endif
-
 #include <stdio.h>
 #include <errno.h>
 #include "cryptlib.h"
-#include "bio_lcl.h"
+#include <openssl/bio.h>
 #include <openssl/err.h>
 
-#if defined(OPENSSL_SYS_NETWARE) && defined(NETWARE_CLIB)
-#include <nwfileio.h>
-#endif
-
 #if !defined(OPENSSL_NO_STDIO)
 
 static int MS_CALLBACK file_write(BIO *h, const char *buf, int num);
@@ -132,12 +110,8 @@ BIO *BIO_new_file(const char *filename, const char *mode)
                 return(NULL);
                 }
         if ((ret=BIO_new(BIO_s_file_internal())) == NULL)
-                {
-                fclose(file);
                 return(NULL);
-                }
 
-        BIO_clear_flags(ret,BIO_FLAGS_UPLINK); /* we did fopen -> we disengage UPLINK */
         BIO_set_fp(ret,file,BIO_CLOSE);
         return(ret);
         }
@@ -149,7 +123,6 @@ BIO *BIO_new_fp(FILE *stream, int close_flag)
         if ((ret=BIO_new(BIO_s_file())) == NULL)
                 return(NULL);
 
-        BIO_set_flags(ret,BIO_FLAGS_UPLINK); /* redundant, left for documentation puposes */
         BIO_set_fp(ret,stream,close_flag);
         return(ret);
         }
@@ -164,7 +137,6 @@ static int MS_CALLBACK file_new(BIO *bi)
         bi->init=0;
         bi->num=0;
         bi->ptr=NULL;
-        bi->flags=BIO_FLAGS_UPLINK; /* default to UPLINK */
         return(1);
         }
 
@@ -175,12 +147,8 @@ static int MS_CALLBACK file_free(BIO *a)
                 {
                 if ((a->init) && (a->ptr != NULL))
                         {
-                        if (a->flags&BIO_FLAGS_UPLINK)
-                                UP_fclose (a->ptr);
-                        else
-                                fclose (a->ptr);
+                        fclose((FILE *)a->ptr);
                         a->ptr=NULL;
-                        a->flags=BIO_FLAGS_UPLINK;
                         }
                 a->init=0;
                 }
@@ -193,11 +161,8 @@ static int MS_CALLBACK file_read(BIO *b, char *out, int outl)
 
         if (b->init && (out != NULL))
                 {
-                if (b->flags&BIO_FLAGS_UPLINK)
-                        ret=UP_fread(out,1,(int)outl,b->ptr);
-                else
-                        ret=fread(out,1,(int)outl,(FILE *)b->ptr);
-                if(ret == 0 && (b->flags&BIO_FLAGS_UPLINK)?UP_ferror((FILE *)b->ptr):ferror((FILE *)b->ptr))
+                ret=fread(out,1,(int)outl,(FILE *)b->ptr);
+                if(ret == 0 && ferror((FILE *)b->ptr))
                         {
                         SYSerr(SYS_F_FREAD,get_last_sys_error());
                         BIOerr(BIO_F_FILE_READ,ERR_R_SYS_LIB);
@@ -213,11 +178,7 @@ static int MS_CALLBACK file_write(BIO *b, const char *in, int inl)
 
         if (b->init && (in != NULL))
                 {
-                if (b->flags&BIO_FLAGS_UPLINK)
-                        ret=UP_fwrite(in,(int)inl,1,b->ptr);
-                else
-                        ret=fwrite(in,(int)inl,1,(FILE *)b->ptr);
-                if (ret)
+                if (fwrite(in,(int)inl,1,(FILE *)b->ptr))
                         ret=inl;
                 /* ret=fwrite(in,1,(int)inl,(FILE *)b->ptr); */
                 /* according to Tim Hudson <tjh@cryptsoft.com>, the commented
@@ -238,45 +199,20 @@ static long MS_CALLBACK file_ctrl(BIO *b, int cmd, long num, void *ptr)
                 {
         case BIO_C_FILE_SEEK:
         case BIO_CTRL_RESET:
-                if (b->flags&BIO_FLAGS_UPLINK)
-                        ret=(long)UP_fseek(b->ptr,num,0);
-                else
-                        ret=(long)fseek(fp,num,0);
+                ret=(long)fseek(fp,num,SEEK_SET);
                 break;
         case BIO_CTRL_EOF:
-                if (b->flags&BIO_FLAGS_UPLINK)
-                        ret=(long)UP_feof(fp);
-                else
-                        ret=(long)feof(fp);
+                ret=(long)feof(fp);
                 break;
         case BIO_C_FILE_TELL:
         case BIO_CTRL_INFO:
-                if (b->flags&BIO_FLAGS_UPLINK)
-                        ret=UP_ftell(b->ptr);
-                else
-                        ret=ftell(fp);
+                ret=ftell(fp);
                 break;
         case BIO_C_SET_FILE_PTR:
                 file_free(b);
                 b->shutdown=(int)num&BIO_CLOSE;
-                b->ptr=ptr;
+                b->ptr=(char *)ptr;
                 b->init=1;
-#if BIO_FLAGS_UPLINK!=0
-#if defined(__MINGW32__) && defined(__MSVCRT__) && !defined(_IOB_ENTRIES)
-#define _IOB_ENTRIES 20
-#endif
-#if defined(_IOB_ENTRIES)
-                /* Safety net to catch purely internal BIO_set_fp calls */
-                if ((size_t)ptr >= (size_t)stdin &&
-                    (size_t)ptr <  (size_t)(stdin+_IOB_ENTRIES))
-                        BIO_clear_flags(b,BIO_FLAGS_UPLINK);
-#endif
-#endif
-#ifdef UP_fsetmode
-                if (b->flags&BIO_FLAGS_UPLINK)
-                        UP_fsetmode(b->ptr,num&BIO_FP_TEXT?'t':'b');
-                else
-#endif
                 {
 #if defined(OPENSSL_SYS_WINDOWS)
                 int fd = fileno((FILE*)ptr);
@@ -284,14 +220,6 @@ static long MS_CALLBACK file_ctrl(BIO *b, int cmd, long num, void *ptr)
                         _setmode(fd,_O_TEXT);
                 else
                         _setmode(fd,_O_BINARY);
-#elif defined(OPENSSL_SYS_NETWARE) && defined(NETWARE_CLIB)
-                int fd = fileno((FILE*)ptr);
-         /* Under CLib there are differences in file modes
-         */
-                if (num & BIO_FP_TEXT)
-                        setmode(fd,O_TEXT);
-                else
-                        setmode(fd,O_BINARY);
 #elif defined(OPENSSL_SYS_MSDOS)
                 int fd = fileno((FILE*)ptr);
                 /* Set correct text/binary mode */
@@ -344,12 +272,6 @@ static long MS_CALLBACK file_ctrl(BIO *b, int cmd, long num, void *ptr)
                 else
                         strcat(p,"t");
 #endif
-#if defined(OPENSSL_SYS_NETWARE)
-                if (!(num & BIO_FP_TEXT))
-                        strcat(p,"b");
-                else
-                        strcat(p,"t");
-#endif
                 fp=fopen(ptr,p);
                 if (fp == NULL)
                         {
@@ -359,9 +281,8 @@ static long MS_CALLBACK file_ctrl(BIO *b, int cmd, long num, void *ptr)
                         ret=0;
                         break;
                         }
-                b->ptr=fp;
+                b->ptr=(char *)fp;
                 b->init=1;
-                BIO_clear_flags(b,BIO_FLAGS_UPLINK); /* we did fopen -> we disengage UPLINK */
                 break;
         case BIO_C_GET_FILE_PTR:
                 /* the ptr parameter is actually a FILE ** in this case. */
@@ -378,10 +299,7 @@ static long MS_CALLBACK file_ctrl(BIO *b, int cmd, long num, void *ptr)
                 b->shutdown=(int)num;
                 break;
         case BIO_CTRL_FLUSH:
-                if (b->flags&BIO_FLAGS_UPLINK)
-                        UP_fflush(b->ptr);
-                else
-                        fflush((FILE *)b->ptr);
+                fflush((FILE *)b->ptr);
                 break;
         case BIO_CTRL_DUP:
                 ret=1;
@@ -403,10 +321,7 @@ static int MS_CALLBACK file_gets(BIO *bp, char *buf, int size)
         int ret=0;
 
         buf[0]='\0';
-        if (bp->flags&BIO_FLAGS_UPLINK)
-                UP_fgets(buf,size,bp->ptr);
-        else
-                fgets(buf,size,(FILE *)bp->ptr);
+        fgets(buf,size,(FILE *)bp->ptr);
         if (buf[0] != '\0')
                 ret=strlen(buf);
         return(ret);