aboutsummaryrefslogtreecommitdiffstats
path: root/src/pbe/pbes1/pbes1.cpp
diff options
context:
space:
mode:
authorlloyd <[email protected]>2008-10-02 15:30:57 +0000
committerlloyd <[email protected]>2008-10-02 15:30:57 +0000
commit6eaae824eb88873748984ec53f6bf285dd30244c (patch)
treeaac39d26bdae6855cbbe0d50e05abdd08a00c0f8 /src/pbe/pbes1/pbes1.cpp
parent7f7827b694044d9394fb45c18c6fe518a477fc0b (diff)
Revert part of revision b87599ffaee2d8ed2ec7597634413e73e4fb2fd8 that
added a new mandatory parameter of a Library_State& to get_cipher(). Do this so Monotone does not have to special case. Other lookup related functions like retrieve_<type> and add_algorithm() still require a Library_State& however.
Diffstat (limited to 'src/pbe/pbes1/pbes1.cpp')
-rw-r--r--src/pbe/pbes1/pbes1.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/pbe/pbes1/pbes1.cpp b/src/pbe/pbes1/pbes1.cpp
index 8bbd079c4..cdcc78148 100644
--- a/src/pbe/pbes1/pbes1.cpp
+++ b/src/pbe/pbes1/pbes1.cpp
@@ -33,7 +33,7 @@ void PBE_PKCS5v15::write(const byte input[], u32bit length)
*************************************************/
void PBE_PKCS5v15::start_msg()
{
- pipe.append(get_cipher(global_state(), cipher, key, iv, direction));
+ pipe.append(get_cipher(cipher, key, iv, direction));
pipe.start_msg();
if(pipe.message_count() > 1)
pipe.set_default_msg(pipe.default_msg() + 1);