aboutsummaryrefslogtreecommitdiffstats
path: root/src/pbe/pbes1/pbes1.cpp
diff options
context:
space:
mode:
authorlloyd <[email protected]>2012-05-25 23:56:05 +0000
committerlloyd <[email protected]>2012-05-25 23:56:05 +0000
commitd956f632061cb80f3d7a3ee2b6b4f384dcc73145 (patch)
treec045eeabc4f98c1eb9b5e3e20bcb23370087869a /src/pbe/pbes1/pbes1.cpp
parent12090a7148d9ee73572cc1a7268fc489504a8173 (diff)
Some post merge fixups.
Fix some bugs that triggered if DEFAULT_BUFFERSIZE was either too small or an odd size.
Diffstat (limited to 'src/pbe/pbes1/pbes1.cpp')
-rw-r--r--src/pbe/pbes1/pbes1.cpp9
1 files changed, 2 insertions, 7 deletions
diff --git a/src/pbe/pbes1/pbes1.cpp b/src/pbe/pbes1/pbes1.cpp
index 0e5e8284c..41a793a24 100644
--- a/src/pbe/pbes1/pbes1.cpp
+++ b/src/pbe/pbes1/pbes1.cpp
@@ -19,13 +19,8 @@ namespace Botan {
*/
void PBE_PKCS5v15::write(const byte input[], size_t length)
{
- while(length)
- {
- size_t put = std::min(DEFAULT_BUFFERSIZE, length);
- pipe.write(input, length);
- flush_pipe(true);
- length -= put;
- }
+ pipe.write(input, length);
+ flush_pipe(true);
}
/*