# 
# patch "ChangeLog"
#  from [af902adae741bf4378d62cdf48f16c9f1037f534]
#    to [dced28c61307cc4be0f4f1a5049587b9582b6fa3]
# 
# patch "Makefile.am"
#  from [1b56f53608768b31cc88d39bd2ae4cd6a3af201a]
#    to [acaae1ea3c764b2412d2cb206a6aefec9117b307]
# 
# patch "botan/algolist.cpp"
#  from [59b2c8ae247e6e6791f5bf1f17fa447c2f887fc6]
#    to [1290df2bfa89a27a8f35e2ba3aa1e71cfe2a5ad4]
# 
# patch "botan/def_alg.cpp"
#  from [79162d3aecd53ba9f1c78742ff5146b790b91851]
#    to [e78c4875e92b27d1e8edf594653d3d7d1bd543d7]
# 
# patch "file_io.cc"
#  from [339974b74171a06543605abc4883a888be0a7c06]
#    to [d23d71abc9d8347fbeca187af912c290c652476a]
# 
# patch "vocab.cc"
#  from [41fd233b49106424431b40d9b021959b607590f2]
#    to [a45322bfe489d62a675b34bda678bfb3692bc17e]
# 
========================================================================
--- ChangeLog	af902adae741bf4378d62cdf48f16c9f1037f534
+++ ChangeLog	dced28c61307cc4be0f4f1a5049587b9582b6fa3
@@ -1,5 +1,10 @@
 2005-10-07  Timothy Brownawell  <address@hidden>
 
+	* file_io.cc, vocab.cc, Makefile.am: fix merge
+	* botan/algolist.cpp, botan/def_alg.cpp: fix merge
+
+2005-10-07  Timothy Brownawell  <address@hidden>
+
 	* automate.cc: add "automate keys". like "ls keys", except it
 	uses basic_io (since "ls keys" is now slightly irregular and not
 	very well suited to machine interpretation).
========================================================================
--- Makefile.am	1b56f53608768b31cc88d39bd2ae4cd6a3af201a
+++ Makefile.am	acaae1ea3c764b2412d2cb206a6aefec9117b307
@@ -114,8 +114,9 @@
         botan/ui.cpp botan/util.cpp botan/x509_ca.cpp			\
         botan/x509_crl.cpp botan/x509_key.cpp botan/x509_obj.cpp	\
         botan/x509cert.cpp botan/x509find.cpp botan/x509opt.cpp		\
-        botan/x509self.cpp botan/x509stor.cpp \
-        botan/def_alg.cpp botan/def_mode.cpp botan/sha256.cpp \
+        botan/des.cpp botan/des_tab.cpp botan/pkcs5.cpp 		\
+        botan/x509self.cpp botan/x509stor.cpp 				\
+        botan/def_alg.cpp botan/def_mode.cpp botan/sha256.cpp 		\
         \
         botan/aes.h botan/botan.h botan/def_eng.h botan/es_win32.h	\
         botan/lookup.h botan/omac.h botan/randpool.h botan/version.h	\
@@ -147,8 +148,9 @@
         botan/data_src.h botan/es_egd.h botan/look_add.h botan/ofb.h	\
         botan/pk_util.h botan/ui.h botan/blinding.h botan/defalloc.h	\
         botan/es_file.h botan/look_pk.h botan/oids.h botan/pubkey.h	\
-        botan/util.h botan/charset.h botan/hash_id.h \
-		botan/x931_rng.cpp botan/x931_rng.h botan/sha256.h
+        botan/util.h botan/charset.h botan/hash_id.h 			\
+        botan/des.h botan/pkcs5.h					\
+	botan/x931_rng.cpp botan/x931_rng.h botan/sha256.h
 
 
 BOOST_SANDBOX_SOURCES = \
========================================================================
--- botan/algolist.cpp	59b2c8ae247e6e6791f5bf1f17fa447c2f887fc6
+++ botan/algolist.cpp	1290df2bfa89a27a8f35e2ba3aa1e71cfe2a5ad4
@@ -6,7 +6,9 @@
 #include <botan/lookup.h>
 
 #include <botan/mode_pad.h>
+#include <botan/pkcs5.h>
 
+
 namespace Botan {
 
 namespace Algolist {
@@ -26,8 +28,8 @@
 
    // removed in monotone
    //if(algo_name == "OpenPGP-S2K") return new OpenPGP_S2K(name[1]);
-   //if(algo_name == "PBKDF1") return new PKCS5_PBKDF1(name[1]);
-   //if(algo_name == "PBKDF2") return new PKCS5_PBKDF2(name[1]);
+   if(algo_name == "PBKDF1") return new PKCS5_PBKDF1(name[1]);
+   if(algo_name == "PBKDF2") return new PKCS5_PBKDF2(name[1]);
 
    return 0;
    }
========================================================================
--- botan/def_alg.cpp	79162d3aecd53ba9f1c78742ff5146b790b91851
+++ botan/def_alg.cpp	e78c4875e92b27d1e8edf594653d3d7d1bd543d7
@@ -7,6 +7,7 @@
 #include <botan/lookup.h>
 
 #include <botan/aes.h>
+#include <botan/des.h>
 
 #include <botan/arc4.h>
 
@@ -16,6 +17,8 @@
 
 #include <botan/hmac.h>
 
+#include <botan/pkcs5.h>
+
 namespace Botan {
 
 /*************************************************
@@ -74,6 +77,10 @@
    HANDLE_TYPE_NO_ARGS("AES-128", AES_128);
    HANDLE_TYPE_NO_ARGS("AES-192", AES_192);
    HANDLE_TYPE_NO_ARGS("AES-256", AES_256);
+   HANDLE_TYPE_NO_ARGS("DES", DES);
+   HANDLE_TYPE_NO_ARGS("DESX", DESX);
+   HANDLE_TYPE_NO_ARGS("TripleDES", TripleDES);
+
    return 0;
    }
 
@@ -89,7 +96,9 @@
    const std::string algo_name = deref_alias(name[0]);
 
    HANDLE_TYPE_ONE_U32BIT("ARC4", ARC4, 0);
+   HANDLE_TYPE_ONE_U32BIT("RC4_drop", ARC4, 768);
 
+
    return 0;
    }
 
========================================================================
--- file_io.cc	339974b74171a06543605abc4883a888be0a7c06
+++ file_io.cc	d23d71abc9d8347fbeca187af912c290c652476a
@@ -379,7 +379,6 @@
 
   make_dir_for(p);
 
-                                             get_process_id()).str();
   {
     // data.tmp opens
     ofstream file(tmp.as_external().c_str(),
@@ -401,7 +400,8 @@
   // nb: no mucking around with multiple-writer conditions. we're a
   // single-user single-threaded program. you get what you paid for.
   assert_path_is_directory(bookkeeping_root);
-  bookkeeping_path tmp = bookkeeping_root / "data.tmp";
+  bookkeeping_path tmp = bookkeeping_root / (boost::format("data.tmp.%d") %
+                                             get_process_id()).str();
   write_data_impl(p, dat, tmp);
 }
 
========================================================================
--- vocab.cc	41fd233b49106424431b40d9b021959b607590f2
+++ vocab.cc	a45322bfe489d62a675b34bda678bfb3692bc17e
@@ -229,6 +229,9 @@
 template class manifest<cert>;
 
 template
+void dump<rsa_pub_key>(base64<rsa_pub_key> const&, std::string &);
+
+template
 void dump(revision_id const & r, std::string &);
 
 template