diff options
| author | Jack Lloyd <[email protected]> | 2017-04-15 11:39:19 -0400 |
|---|---|---|
| committer | Jack Lloyd <[email protected]> | 2017-04-15 11:39:19 -0400 |
| commit | df7da4a60d486038410f85b9979fd01e9a37213f (patch) | |
| tree | a5b12c02870696894a3e66ef79d1133a4da1002e /src/lib | |
| parent | f55d16ce41e9d56fd134bc957e094d6ff67e3e63 (diff) | |
| parent | fc3e4672f7056411066068d73f21badf9f84bf0b (diff) | |
Merge GH #1006 Fix FFI cipher interface (see also GH #1003)
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/ffi/ffi.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/lib/ffi/ffi.cpp b/src/lib/ffi/ffi.cpp index b888cc0d6..2662f7852 100644 --- a/src/lib/ffi/ffi.cpp +++ b/src/lib/ffi/ffi.cpp @@ -939,6 +939,7 @@ int botan_cipher_update(botan_cipher_t cipher_obj, cipher.update(mbuf); input_size -= ud; + copy_mem(output, mbuf.data(), ud); input += ud; taken += ud; @@ -950,6 +951,7 @@ int botan_cipher_update(botan_cipher_t cipher_obj, *output_written = written; *input_consumed = taken; + return 0; } catch(std::exception& e) { |