diff options
| author | lloyd <[email protected]> | 2008-10-02 15:30:57 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2008-10-02 15:30:57 +0000 |
| commit | 6eaae824eb88873748984ec53f6bf285dd30244c (patch) | |
| tree | aac39d26bdae6855cbbe0d50e05abdd08a00c0f8 /src/cms/cms_algo.cpp | |
| parent | 7f7827b694044d9394fb45c18c6fe518a477fc0b (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/cms/cms_algo.cpp')
| -rw-r--r-- | src/cms/cms_algo.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/cms/cms_algo.cpp b/src/cms/cms_algo.cpp index 13b794352..cc675936a 100644 --- a/src/cms/cms_algo.cpp +++ b/src/cms/cms_algo.cpp @@ -52,11 +52,9 @@ SecureVector<byte> do_rfc3217_wrap(RandomNumberGenerator& rng, InitializationVector iv(rng, 8); InitializationVector fixed("4ADDA22C79E82105"); - Pipe pipe(get_cipher(global_state(), - cipher + "/CBC/NoPadding", kek, iv, ENCRYPTION), + Pipe pipe(get_cipher(cipher + "/CBC/NoPadding", kek, iv, ENCRYPTION), new Flip_Bytes(iv.bits_of()), - get_cipher(global_state(), - cipher + "/CBC/NoPadding", kek, fixed, ENCRYPTION)); + get_cipher(cipher + "/CBC/NoPadding", kek, fixed, ENCRYPTION)); pipe.start_msg(); pipe.write(input); pipe.write(icv.read_all()); |