#
#
# patch "keys.cc"
#  from [af15a184ec33c8df05cfb54b3db515d66ba47479]
#    to [bd54a676a32aba4cc8777d28564e96df33774398]
# 
# patch "keys.hh"
#  from [e7f029d3a36546869d0a6c20b1f8cb80bddfa0d7]
#    to [aa40aff6d0dd20cacd009c0fa02d2e326d3bebf6]
# 
# patch "packet.cc"
#  from [13668d0da99fa09560050e8d7e43994f7229c5a9]
#    to [80cc020335599c6250e070a8a7553bbded3c240e]
# 
# patch "schema_migration.cc"
#  from [54c4a069756b8609e44b7e374dc9d04dbc3f91b1]
#    to [1206b6e5c43f5485004ad487a77407524a0747e4]
# 
# patch "vocab_terms.hh"
#  from [527e998b8096895a5702e2322fb7235d2a27613b]
#    to [80283d95bc08f3a9f8c1c503ebeebb51b03c384e]
#
============================================================
--- keys.cc	af15a184ec33c8df05cfb54b3db515d66ba47479
+++ keys.cc	bd54a676a32aba4cc8777d28564e96df33774398
@@ -277,10 +277,10 @@ migrate_private_key(key_store & keys,
 void
 migrate_private_key(key_store & keys,
                     rsa_keypair_id const & id,
-                    base64< arc4<rsa_priv_key> > const & old_priv,
+                    base64< old_arc4_rsa_priv_key > const & old_priv,
                     keypair & new_kp)
 {
-  arc4<rsa_priv_key> decoded_key;
+  old_arc4_rsa_priv_key decoded_key;
   SecureVector<Botan::byte> decrypted_key;
   utf8 phrase;
 
============================================================
--- keys.hh	e7f029d3a36546869d0a6c20b1f8cb80bddfa0d7
+++ keys.hh	aa40aff6d0dd20cacd009c0fa02d2e326d3bebf6
@@ -37,7 +37,7 @@ void migrate_private_key(key_store & key
 
 void migrate_private_key(key_store & keys,
                          rsa_keypair_id const & id,
-                         base64< arc4<rsa_priv_key> > const & old_priv,
+                         base64< old_arc4_rsa_priv_key > const & old_priv,
                          keypair & kp);
 
 void make_signature(key_store & keys,          // to hook for phrase
============================================================
--- packet.cc	13668d0da99fa09560050e8d7e43994f7229c5a9
+++ packet.cc	80cc020335599c6250e070a8a7553bbded3c240e
@@ -247,7 +247,7 @@ feed_packet_consumer
     keypair kp;
     migrate_private_key(keys,
                         rsa_keypair_id(args),
-                        base64<arc4<rsa_priv_key> >(body),
+                        base64<old_arc4_rsa_priv_key>(body),
                         kp);
     cons.consume_key_pair(rsa_keypair_id(args), kp);
   }
============================================================
--- schema_migration.cc	54c4a069756b8609e44b7e374dc9d04dbc3f91b1
+++ schema_migration.cc	1206b6e5c43f5485004ad487a77407524a0747e4
@@ -498,7 +498,7 @@ migrate_to_external_privkeys(sqlite3 * d
     while (stmt.step())
       {
         rsa_keypair_id ident(stmt.column_string(0));
-        base64< arc4<rsa_priv_key> > old_priv(stmt.column_string(1));
+        base64< old_arc4_rsa_priv_key > old_priv(stmt.column_string(1));
 
         keypair kp;
         migrate_private_key(keys, ident, old_priv, kp);
============================================================
--- vocab_terms.hh	527e998b8096895a5702e2322fb7235d2a27613b
+++ vocab_terms.hh	80283d95bc08f3a9f8c1c503ebeebb51b03c384e
@@ -36,6 +36,7 @@ ATOMIC_NOVERIFY(rsa_priv_key);       // 
 ATOMIC(rsa_keypair_id);              // address@hidden
 ATOMIC_NOVERIFY(rsa_pub_key);        // some nice numbers
 ATOMIC_NOVERIFY(rsa_priv_key);       // some nice numbers
+ATOMIC_NOVERIFY(old_arc4_rsa_priv_key); // ... in the old storage format
 ATOMIC_NOVERIFY(rsa_sha1_signature); // some other nice numbers
 ATOMIC_NOVERIFY(rsa_oaep_sha_data);
 
@@ -55,7 +56,6 @@ ENCODING(base64);             // thing w
 ENCODING(gzip);               // thing which is gzipped
 ENCODING(hexenc);             // thing which is hex-encoded
 ENCODING(base64);             // thing which is base64-encoded
-ENCODING(arc4);               // thing which is arc4-encrypted
 
 ATOMIC_NOVERIFY(prefix);      // raw encoding of a merkle tree prefix
 ATOMIC_NOVERIFY(merkle);      // raw encoding of a merkle tree node
@@ -90,10 +90,9 @@ EXTERN template class     file< delta >;
 EXTERN template class manifest< delta >;
 EXTERN template class     file< delta >;
 
-EXTERN template class         arc4<rsa_priv_key>;
-EXTERN template class base64< arc4<rsa_priv_key> >;
 EXTERN template class base64< rsa_pub_key >;
 EXTERN template class base64< rsa_priv_key >;
+EXTERN template class base64< old_arc4_rsa_priv_key >;
 EXTERN template class base64< rsa_sha1_signature >;
 EXTERN template class hexenc< rsa_sha1_signature >;
 EXTERN template class base64< cert_value >;
@@ -134,8 +133,8 @@ EXTERN template std::ostream & operator<
 EXTERN template std::ostream & operator<< <>(std::ostream &, manifest< base64< gzip<delta> > > const &);
 EXTERN template std::ostream & operator<< <>(std::ostream &,     file< base64< gzip<delta> > > const &);
 
-EXTERN template std::ostream & operator<< <>(std::ostream &,         arc4<rsa_priv_key>     const &);
-EXTERN template std::ostream & operator<< <>(std::ostream &, base64< arc4<rsa_priv_key> >   const &);
+EXTERN template std::ostream & operator<< <>(std::ostream &, base64< old_arc4_rsa_priv_key >   const &);
+EXTERN template std::ostream & operator<< <>(std::ostream &, base64< rsa_priv_key >   const &);
 EXTERN template std::ostream & operator<< <>(std::ostream &, base64< rsa_pub_key > const &);
 EXTERN template std::ostream & operator<< <>(std::ostream &, base64< rsa_sha1_signature > const &);
 EXTERN template std::ostream & operator<< <>(std::ostream &, hexenc< rsa_sha1_signature > const &);