[Monotone-commits-diffs] net.venge.monotone: 8861f8555ef90a04a99404e9f8d5510b2ddb10e6

[code]

revision:            8861f8555ef90a04a99404e9f8d5510b2ddb10e6
date:                2013-09-21T06:52:02
author:              address@hidden
branch:              net.venge.monotone
changelog:
* src/database.cc: fix build against botan-1.8 by assigning
  the PK_Encryptor vs PK_Encryptor_EME change in botan to its
  version 1.9.5, rather than 1.7.7.

manifest:
format_version "1"

new_manifest [cff995984510f645ccfb021c690b1230a2b354a8]

old_revision [f79d8215061cd57a97ecfe3bd02a7748ff605cf5]

patch "src/database.cc"
 from [a2f65339e0beb0740c9338b149b47e70c9ae0bfd]
   to [dfaec9618beca0cf9e36d4e7caf36bce23d02cf2]
============================================================
--- src/database.cc	a2f65339e0beb0740c9338b149b47e70c9ae0bfd
+++ src/database.cc	dfaec9618beca0cf9e36d4e7caf36bce23d02cf2
@@ -98,7 +98,7 @@ using boost::lexical_cast;
 using boost::tuple;
 using boost::lexical_cast;
 
-#if BOTAN_VERSION_CODE >= BOTAN_VERSION_CODE_FOR(1,7,7)
+#if BOTAN_VERSION_CODE >= BOTAN_VERSION_CODE_FOR(1,9,5)
 using Botan::PK_Encryptor_EME;
 #else
 using Botan::PK_Encryptor;
@@ -3440,11 +3440,18 @@ database::encrypt_rsa(key_id const & pub
 
   SecureVector<Botan::byte> ct;
 
-#if BOTAN_VERSION_CODE >= BOTAN_VERSION_CODE_FOR(1,7,7)
+#if BOTAN_VERSION_CODE >= BOTAN_VERSION_CODE_FOR(1,9,5)
   PK_Encryptor_EME encryptor(*pub_key, "EME1(SHA-1)");
   ct = encryptor.encrypt(
           reinterpret_cast<Botan::byte const *>(plaintext.data()),
           plaintext.size(), lazy_rng::get());
+#elif BOTAN_VERSION_CODE >= BOTAN_VERSION_CODE_FOR(1,7,7)
+  shared_ptr<PK_Encryptor>
+    encryptor(get_pk_encryptor(*pub_key, "EME1(SHA-1)"));
+
+  ct = encryptor->encrypt(
+          reinterpret_cast<Botan::byte const *>(plaintext.data()),
+          plaintext.size(), lazy_rng::get());
 #else
   shared_ptr<PK_Encryptor>
     encryptor(Botan::get_pk_encryptor(*pub_key, "EME1(SHA-1)"));