import of openssl-0.9.7g; tested on platforms from alpha to zaurus, ok deraadt@

3 files changed, 11 insertions, 8 deletions

diff --git a/src/lib/libcrypto/bio/b_print.c b/src/lib/libcrypto/bio/b_print.c
index fbff331796..c2bb357b4c 100644
--- a/src/lib/libcrypto/bio/b_print.c
+++ b/src/lib/libcrypto/bio/b_print.c
@@ -641,7 +641,7 @@ fmtfp(
        multiplying by a factor of 10 */
     fracpart = roundv((pow10(max)) * (ufvalue - intpart));
 
-    if (fracpart >= pow10(max)) {
+    if (fracpart >= (long)pow10(max)) {
         intpart++;
         fracpart -= (long)pow10(max);
     }
diff --git a/src/lib/libcrypto/bio/bio.h b/src/lib/libcrypto/bio/bio.h
index fbbc16d00c..2eb703830f 100644
--- a/src/lib/libcrypto/bio/bio.h
+++ b/src/lib/libcrypto/bio/bio.h
@@ -347,6 +347,7 @@ typedef struct bio_f_buffer_ctx_struct
 #define BIO_C_NWRITE0                           145
 #define BIO_C_NWRITE                            146
 #define BIO_C_RESET_READ_REQUEST                147
+#define BIO_C_SET_MD_CTX                        148
 
 
 #define BIO_set_app_data(s,arg)         BIO_set_ex_data(s,0,arg)
diff --git a/src/lib/libcrypto/bio/bss_file.c b/src/lib/libcrypto/bio/bss_file.c
index 9cdf159f82..8034ac93f9 100644
--- a/src/lib/libcrypto/bio/bss_file.c
+++ b/src/lib/libcrypto/bio/bss_file.c
@@ -213,13 +213,14 @@ static long MS_CALLBACK file_ctrl(BIO *b, int cmd, long num, void *ptr)
                 b->shutdown=(int)num&BIO_CLOSE;
                 b->ptr=(char *)ptr;
                 b->init=1;
+                {
 #if defined(OPENSSL_SYS_WINDOWS)
+                int fd = fileno((FILE*)ptr);
                 if (num & BIO_FP_TEXT)
-                        _setmode(fileno((FILE *)ptr),_O_TEXT);
+                        _setmode(fd,_O_TEXT);
                 else
-                        _setmode(fileno((FILE *)ptr),_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)
@@ -235,13 +236,14 @@ static long MS_CALLBACK file_ctrl(BIO *b, int cmd, long num, void *ptr)
                         else
                                 _setmode(fd,_O_BINARY);
                         }
-                }
 #elif defined(OPENSSL_SYS_OS2)
+                int fd = fileno((FILE*)ptr);
                 if (num & BIO_FP_TEXT)
-                        setmode(fileno((FILE *)ptr), O_TEXT);
+                        setmode(fd, O_TEXT);
                 else
-                        setmode(fileno((FILE *)ptr), O_BINARY);
+                        setmode(fd, O_BINARY);
 #endif
+                }
                 break;
         case BIO_C_SET_FILENAME:
                 file_free(b);
@@ -264,7 +266,7 @@ static long MS_CALLBACK file_ctrl(BIO *b, int cmd, long num, void *ptr)
                         ret=0;
                         break;
                         }
-#if defined(OPENSSL_SYS_MSDOS) || defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_OS2)
+#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");
                 else