1 files changed, 203 insertions, 215 deletions

diff --git a/src/lib/libcrypto/bio/bss_file.c b/src/lib/libcrypto/bio/bss_file.c
index 638572ab7f..794f503a69 100644
--- a/src/lib/libcrypto/bio/bss_file.c
+++ b/src/lib/libcrypto/bio/bss_file.c
@@ -102,8 +102,8 @@ static int file_gets(BIO *h, char *str, int size);
 static long file_ctrl(BIO *h, int cmd, long arg1, void *arg2);
 static int file_new(BIO *h);
 static int file_free(BIO *data);
-static BIO_METHOD methods_filep=
-        {
+
+static BIO_METHOD methods_filep = {
         BIO_TYPE_FILE,
         "FILE pointer",
         file_write,
@@ -114,15 +114,16 @@ static BIO_METHOD methods_filep=
         file_new,
         file_free,
         NULL,
-        };
+};
 
-BIO *BIO_new_file(const char *filename, const char *mode)
-        {
+BIO
+*BIO_new_file(const char *filename, const char *mode)
+{
         BIO  *ret;
-        FILE *file=NULL;
+        FILE *file = NULL;
 
 #if defined(_WIN32) && defined(CP_UTF8)
-        int sz, len_0 = (int)strlen(filename)+1;
+        int sz, len_0 = (int)strlen(filename) + 1;
         DWORD flags;
 
         /*
@@ -137,173 +138,171 @@ BIO *BIO_new_file(const char *filename, const char *mode)
          * ERROR_NO_UNICODE_TRANSLATION, in which case we fall
          * back to fopen...
          */
-        if ((sz=MultiByteToWideChar(CP_UTF8,(flags=MB_ERR_INVALID_CHARS),
-                                        filename,len_0,NULL,0))>0 ||
-            (GetLastError()==ERROR_INVALID_FLAGS &&
-             (sz=MultiByteToWideChar(CP_UTF8,(flags=0),
-                                        filename,len_0,NULL,0))>0)
-           )
-                {
+        if ((sz = MultiByteToWideChar(CP_UTF8,(flags = MB_ERR_INVALID_CHARS),
+            filename, len_0, NULL, 0)) > 0 ||
+            (GetLastError() == ERROR_INVALID_FLAGS &&
+            (sz = MultiByteToWideChar(CP_UTF8,(flags = 0),
+            filename, len_0, NULL, 0)) > 0)) {
                 WCHAR  wmode[8];
                 WCHAR *wfilename = _alloca(sz*sizeof(WCHAR));
 
-                if (MultiByteToWideChar(CP_UTF8,flags,
-                                        filename,len_0,wfilename,sz) &&
-                    MultiByteToWideChar(CP_UTF8,0,mode,strlen(mode)+1,
-                                        wmode,sizeof(wmode)/sizeof(wmode[0])) &&
-                    (file=_wfopen(wfilename,wmode))==NULL &&
-                    (errno==ENOENT || errno==EBADF)
-                   )    /* UTF-8 decode succeeded, but no file, filename
+                if (MultiByteToWideChar(CP_UTF8, flags, filename, len_0,
+                    wfilename, sz) && MultiByteToWideChar(CP_UTF8, 0, mode,
+                    strlen(mode) + 1, wmode,
+                    sizeof(wmode) / sizeof(wmode[0])) &&
+                    (file = _wfopen(wfilename, wmode)) == NULL &&
+                    (errno == ENOENT || errno == EBADF)
+                )       /* UTF - 8 decode succeeded, but no file, filename
                          * could still have been locale-ized... */
-                        file = fopen(filename,mode);
-                }
-        else if (GetLastError()==ERROR_NO_UNICODE_TRANSLATION)
-                {
-                file = fopen(filename,mode);
-                }
+                        file = fopen(filename, mode);
+        } else if (GetLastError() == ERROR_NO_UNICODE_TRANSLATION) {
+                file = fopen(filename, mode);
+        }
 #else
-        file=fopen(filename,mode);      
+        file = fopen(filename, mode);
+
 #endif
-        if (file == NULL)
-                {
+        if (file == NULL) {
                 SYSerr(SYS_F_FOPEN, errno);
-                ERR_add_error_data(5,"fopen('",filename,"','",mode,"')");
+                ERR_add_error_data(5, "fopen('", filename, "', '", mode, "')");
                 if (errno == ENOENT)
-                        BIOerr(BIO_F_BIO_NEW_FILE,BIO_R_NO_SUCH_FILE);
+                        BIOerr(BIO_F_BIO_NEW_FILE, BIO_R_NO_SUCH_FILE);
                 else
-                        BIOerr(BIO_F_BIO_NEW_FILE,ERR_R_SYS_LIB);
-                return(NULL);
-                }
-        if ((ret=BIO_new(BIO_s_file())) == NULL)
-                {
+                        BIOerr(BIO_F_BIO_NEW_FILE, ERR_R_SYS_LIB);
+                return (NULL);
+        }
+        if ((ret = BIO_new(BIO_s_file())) == 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);
+                return (NULL);
         }
 
-BIO *BIO_new_fp(FILE *stream, int close_flag)
-        {
-        BIO *ret;
-
-        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);
-        }
+        BIO_clear_flags(ret, BIO_FLAGS_UPLINK); /* we did fopen -> we disengage UPLINK */
+        BIO_set_fp(ret, file, BIO_CLOSE);
+        return (ret);
+}
 
-BIO_METHOD *BIO_s_file(void)
-        {
-        return(&methods_filep);
-        }
+BIO
+*BIO_new_fp(FILE *stream, int close_flag)
+{
+        BIO *ret;
 
-static int file_new(BIO *bi)
-        {
-        bi->init=0;
-        bi->num=0;
-        bi->ptr=NULL;
+        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);
+}
+
+BIO_METHOD
+*BIO_s_file(void)
+{
+        return (&methods_filep);
+}
+
+static int
+file_new(BIO *bi)
+{
+        bi->init = 0;
+        bi->num = 0;
+        bi->ptr = NULL;
         bi->flags=BIO_FLAGS_UPLINK; /* default to UPLINK */
-        return(1);
-        }
-
-static int file_free(BIO *a)
-        {
-        if (a == NULL) return(0);
-        if (a->shutdown)
-                {
-                if ((a->init) && (a->ptr != NULL))
-                        {
+        return (1);
+}
+
+static int
+file_free(BIO *a)
+{
+        if (a == NULL)
+                return (0);
+        if (a->shutdown) {
+                if ((a->init) && (a->ptr != NULL)) {
                         if (a->flags&BIO_FLAGS_UPLINK)
                                 UP_fclose (a->ptr);
                         else
                                 fclose (a->ptr);
-                        a->ptr=NULL;
-                        a->flags=BIO_FLAGS_UPLINK;
-                        }
-                a->init=0;
+                        a->ptr = NULL;
+                        a->flags = BIO_FLAGS_UPLINK;
                 }
-        return(1);
+                a->init = 0;
         }
-        
-static int file_read(BIO *b, char *out, int outl)
-        {
-        int ret=0;
+        return (1);
+}
 
-        if (b->init && (out != NULL))
-                {
+static int
+file_read(BIO *b, char *out, int outl)
+{
+        int ret = 0;
+
+        if (b->init && (out != NULL)) {
                 if (b->flags&BIO_FLAGS_UPLINK)
-                        ret=UP_fread(out,1,(int)outl,b->ptr);
+                        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 && (b->flags & BIO_FLAGS_UPLINK) ?
+                    UP_ferror((FILE *)b->ptr) : ferror((FILE *)b->ptr)) {
                         SYSerr(SYS_F_FREAD, errno);
-                        BIOerr(BIO_F_FILE_READ,ERR_R_SYS_LIB);
-                        ret=-1;
-                        }
+                        BIOerr(BIO_F_FILE_READ, ERR_R_SYS_LIB);
+                        ret = -1;
                 }
-        return(ret);
         }
+        return (ret);
+}
 
-static int file_write(BIO *b, const char *in, int inl)
-        {
-        int ret=0;
+static int
+file_write(BIO *b, const char *in, int inl)
+{
+        int ret = 0;
 
-        if (b->init && (in != NULL))
-                {
+        if (b->init && (in != NULL)) {
                 if (b->flags&BIO_FLAGS_UPLINK)
-                        ret=UP_fwrite(in,(int)inl,1,b->ptr);
+                        ret = UP_fwrite(in,(int)inl, 1, b->ptr);
                 else
-                        ret=fwrite(in,(int)inl,1,(FILE *)b->ptr);
+                        ret = fwrite(in,(int)inl, 1,(FILE *)b->ptr);
                 if (ret)
-                        ret=inl;
+                        ret = inl;
                 /* ret=fwrite(in,1,(int)inl,(FILE *)b->ptr); */
                 /* according to Tim Hudson <tjh@cryptsoft.com>, the commented
                  * out version above can cause 'inl' write calls under
                  * some stupid stdio implementations (VMS) */
-                }
-        return(ret);
         }
-
-static long file_ctrl(BIO *b, int cmd, long num, void *ptr)
-        {
-        long ret=1;
-        FILE *fp=(FILE *)b->ptr;
+        return (ret);
+}
+
+static long
+file_ctrl(BIO *b, int cmd, long num, void *ptr)
+{
+        long ret = 1;
+        FILE *fp = (FILE *)b->ptr;
         FILE **fpp;
         char p[4];
 
-        switch (cmd)
-                {
+        switch (cmd) {
         case BIO_C_FILE_SEEK:
         case BIO_CTRL_RESET:
                 if (b->flags&BIO_FLAGS_UPLINK)
-                        ret=(long)UP_fseek(b->ptr,num,0);
+                        ret = (long)UP_fseek(b->ptr, num, 0);
                 else
-                        ret=(long)fseek(fp,num,0);
+                        ret = (long)fseek(fp, num, 0);
                 break;
         case BIO_CTRL_EOF:
                 if (b->flags&BIO_FLAGS_UPLINK)
-                        ret=(long)UP_feof(fp);
+                        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);
+                        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->init=1;
+                b->shutdown = (int)num&BIO_CLOSE;
+                b->ptr = ptr;
+                b->init = 1;
 #if BIO_FLAGS_UPLINK!=0
 #if defined(__MINGW32__) && defined(__MSVCRT__) && !defined(_IOB_ENTRIES)
 #define _IOB_ENTRIES 20
@@ -311,8 +310,8 @@ static long file_ctrl(BIO *b, int cmd, long num, void *ptr)
 #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);
+                        (size_t)ptr <  (size_t)(stdin + _IOB_ENTRIES))
+                BIO_clear_flags(b, BIO_FLAGS_UPLINK);
 #endif
 #endif
 #ifdef UP_fsetmod
@@ -322,102 +321,94 @@ static long file_ctrl(BIO *b, int cmd, long num, void *ptr)
 #endif
                 {
 #if defined(OPENSSL_SYS_WINDOWS)
-                int fd = _fileno((FILE*)ptr);
-                if (num & BIO_FP_TEXT)
-                        _setmode(fd,_O_TEXT);
-                else
-                        _setmode(fd,_O_BINARY);
+                        int fd = _fileno((FILE*)ptr);
+                        if (num & BIO_FP_TEXT)
+                                _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 */
-                if (num & BIO_FP_TEXT)
-                        _setmode(fd,_O_TEXT);
-                /* Dangerous to set stdin/stdout to raw (unless redirected) */
-                else
-                        {
-                        if (fd == STDIN_FILENO || fd == STDOUT_FILENO)
-                                {
-                                if (isatty(fd) <= 0)
-                                        _setmode(fd,_O_BINARY);
-                                }
+                        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);
+                                setmode(fd, O_BINARY);
+#elif defined(OPENSSL_SYS_MSDOS)
+                        int fd = fileno((FILE*)ptr);
+                        /* Set correct text/binary mode */
+                        if (num & BIO_FP_TEXT)
+                                _setmode(fd, _O_TEXT);
+                        /* Dangerous to set stdin/stdout to raw (unless redirected) */
+                        else {
+                                if (fd == STDIN_FILENO || fd == STDOUT_FILENO) {
+                                        if (isatty(fd) <= 0)
+                                                _setmode(fd, _O_BINARY);
+                                } else
+                                        _setmode(fd, _O_BINARY);
                         }
 #elif defined(OPENSSL_SYS_OS2) || defined(OPENSSL_SYS_WIN32_CYGWIN)
-                int fd = fileno((FILE*)ptr);
-                if (num & BIO_FP_TEXT)
-                        setmode(fd, O_TEXT);
-                else
-                        setmode(fd, O_BINARY);
+                        int fd = fileno((FILE*)ptr);
+                        if (num & BIO_FP_TEXT)
+                                setmode(fd, O_TEXT);
+                        else
+                                setmode(fd, O_BINARY);
 #endif
                 }
                 break;
         case BIO_C_SET_FILENAME:
                 file_free(b);
-                b->shutdown=(int)num&BIO_CLOSE;
-                if (num & BIO_FP_APPEND)
-                        {
+                b->shutdown = (int)num&BIO_CLOSE;
+                if (num & BIO_FP_APPEND) {
                         if (num & BIO_FP_READ)
-                                BUF_strlcpy(p,"a+",sizeof p);
-                        else    BUF_strlcpy(p,"a",sizeof p);
-                        }
-                else if ((num & BIO_FP_READ) && (num & BIO_FP_WRITE))
-                        BUF_strlcpy(p,"r+",sizeof p);
+                                BUF_strlcpy(p, "a+", sizeof p);
+                        else    BUF_strlcpy(p, "a", sizeof p);
+                } else if ((num & BIO_FP_READ) && (num & BIO_FP_WRITE))
+                        BUF_strlcpy(p, "r+", sizeof p);
                 else if (num & BIO_FP_WRITE)
-                        BUF_strlcpy(p,"w",sizeof p);
+                        BUF_strlcpy(p, "w", sizeof p);
                 else if (num & BIO_FP_READ)
-                        BUF_strlcpy(p,"r",sizeof p);
-                else
-                        {
-                        BIOerr(BIO_F_FILE_CTRL,BIO_R_BAD_FOPEN_MODE);
-                        ret=0;
+                        BUF_strlcpy(p, "r", sizeof p);
+                else {
+                        BIOerr(BIO_F_FILE_CTRL, BIO_R_BAD_FOPEN_MODE);
+                        ret = 0;
                         break;
-                        }
+                }
 #if defined(OPENSSL_SYS_MSDOS) || defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_OS2) || defined(OPENSSL_SYS_WIN32_CYGWIN)
                 if (!(num & BIO_FP_TEXT))
-                        strcat(p,"b");
+                        strcat(p, "b");
                 else
-                        strcat(p,"t");
+                        strcat(p, "t");
 #endif
 #if defined(OPENSSL_SYS_NETWARE)
                 if (!(num & BIO_FP_TEXT))
-                        strcat(p,"b");
+                        strcat(p, "b");
                 else
-                        strcat(p,"t");
+                        strcat(p, "t");
 #endif
-                fp=fopen(ptr,p);
-                if (fp == NULL)
-                        {
+                fp = fopen(ptr, p);
+                if (fp == NULL) {
                         SYSerr(SYS_F_FOPEN, errno);
-                        ERR_add_error_data(5,"fopen('",ptr,"','",p,"')");
-                        BIOerr(BIO_F_FILE_CTRL,ERR_R_SYS_LIB);
-                        ret=0;
+                        ERR_add_error_data(5, "fopen('", ptr, "', '", p, "')");
+                        BIOerr(BIO_F_FILE_CTRL, ERR_R_SYS_LIB);
+                        ret = 0;
                         break;
-                        }
-                b->ptr=fp;
-                b->init=1;
-                BIO_clear_flags(b,BIO_FLAGS_UPLINK); /* we did fopen -> we disengage UPLINK */
+                }
+                b->ptr = 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. */
-                if (ptr != NULL)
-                        {
-                        fpp=(FILE **)ptr;
-                        *fpp=(FILE *)b->ptr;
-                        }
+                if (ptr != NULL) {
+                        fpp = (FILE **)ptr;
+                        *fpp = (FILE *)b->ptr;
+                }
                 break;
         case BIO_CTRL_GET_CLOSE:
-                ret=(long)b->shutdown;
+                ret = (long)b->shutdown;
                 break;
         case BIO_CTRL_SET_CLOSE:
-                b->shutdown=(int)num;
+                b->shutdown = (int)num;
                 break;
         case BIO_CTRL_FLUSH:
                 if (b->flags&BIO_FLAGS_UPLINK)
@@ -426,7 +417,7 @@ static long file_ctrl(BIO *b, int cmd, long num, void *ptr)
                         fflush((FILE *)b->ptr);
                 break;
         case BIO_CTRL_DUP:
-                ret=1;
+                ret = 1;
                 break;
 
         case BIO_CTRL_WPENDING:
@@ -434,44 +425,41 @@ static long file_ctrl(BIO *b, int cmd, long num, void *ptr)
         case BIO_CTRL_PUSH:
         case BIO_CTRL_POP:
         default:
-                ret=0;
+                ret = 0;
                 break;
-                }
-        return(ret);
         }
+        return (ret);
+}
 
-static int file_gets(BIO *bp, char *buf, int size)
-        {
-        int ret=0;
+static int
+file_gets(BIO *bp, char *buf, int size)
+{
+        int ret = 0;
 
-        buf[0]='\0';
-        if (bp->flags&BIO_FLAGS_UPLINK)
-                {
-                if (!UP_fgets(buf,size,bp->ptr))
+        buf[0] = '\0';
+        if (bp->flags&BIO_FLAGS_UPLINK) {
+                if (!UP_fgets(buf, size, bp->ptr))
                         goto err;
-                }
-        else
-                {
-                if (!fgets(buf,size,(FILE *)bp->ptr))
+        } else {
+                if (!fgets(buf, size,(FILE *)bp->ptr))
                         goto err;
-                }
-        if (buf[0] != '\0')
-                ret=strlen(buf);
-        err:
-        return(ret);
         }
+        if (buf[0] != '\0')
+                ret = strlen(buf);
+err:
+        return (ret);
+}
 
-static int file_puts(BIO *bp, const char *str)
-        {
-        int n,ret;
+static int
+file_puts(BIO *bp, const char *str)
+{
+        int n, ret;
 
-        n=strlen(str);
-        ret=file_write(bp,str,n);
-        return(ret);
-        }
+        n = strlen(str);
+        ret = file_write(bp, str, n);
+        return (ret);
+}
 
 #endif /* OPENSSL_NO_STDIO */
 
 #endif /* HEADER_BSS_FILE_C */
-
-