# 
# patch "ChangeLog"
#  from [bb4775a567a491f567b19e86f2e4804de18b3d53]
#    to [9fe2d45790d4f9b1c612ef5ddddddc02f08e8f8d]
# 
# patch "botan/data_snk.cpp"
#  from [df4b2c5670fe2467986a49ff6a40e8fe836e9ae7]
#    to [4c1f45222a6f41b3b1777f757dbc3687edc5806a]
# 
# patch "botan/es_file.cpp"
#  from [b9c1a6b289f2e79494d77df5fae3f4242d75c1d3]
#    to [5772d21d1ff18c7d2a091c89f19351e84232611c]
# 
===============================================
--- ChangeLog	bb4775a567a491f567b19e86f2e4804de18b3d53
+++ ChangeLog	9fe2d45790d4f9b1c612ef5ddddddc02f08e8f8d
@@ -1,3 +1,9 @@
+2005-08-07  Matthew Gregan  <address@hidden>
+
+	* botan/{data_snk,es_file}.cpp: Open fstreams in binary mode.
+	These changes, plus the same change for data_src.cpp and
+	es_ftw.cpp, have been sent upstream.
+
 2005-08-05  Nathaniel Smith  <address@hidden>
 
 	* commands.cc (commit): Write out the log message to MT/log
===============================================
--- botan/data_snk.cpp	df4b2c5670fe2467986a49ff6a40e8fe836e9ae7
+++ botan/data_snk.cpp	4c1f45222a6f41b3b1777f757dbc3687edc5806a
@@ -32,7 +32,7 @@
 *************************************************/
 DataSink_Stream::DataSink_Stream(const std::string& file) : fsname(file)
    {
-   sink = new std::ofstream(fsname.c_str());
+   sink = new std::ofstream(fsname.c_str(), std::ios::binary);
    if(!sink->good())
       throw Stream_IO_Error("DataSink_Stream: Failure opening " + fsname);
    owns = true;
===============================================
--- botan/es_file.cpp	b9c1a6b289f2e79494d77df5fae3f4242d75c1d3
+++ botan/es_file.cpp	5772d21d1ff18c7d2a091c89f19351e84232611c
@@ -39,7 +39,7 @@
    u32bit read = 0;
    for(u32bit j = 0; j != sources.size(); j++)
       {
-      std::ifstream random_source(sources[j].c_str());
+      std::ifstream random_source(sources[j].c_str(), std::ios::binary);
       if(!random_source) continue;
       random_source.read((char*)output + read, length);
       read += random_source.gcount();