diff options
| author | Werner Koch <[email protected]> | 2017-09-26 10:00:03 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2017-09-26 10:00:03 +0000 |
| commit | cd2d758f3f9e0007ecd6bae9d2ee0d631773e237 (patch) | |
| tree | 0e1b9c898d0527969fa953e0f1fc418e610c8da4 /tools/mime-maker.h | |
| parent | g10: Select a secret key by checking availability under gpg-agent. (diff) | |
| parent | po: Remove trailing colon from a German pinentry string. (diff) | |
| download | gnupg-cd2d758f3f9e0007ecd6bae9d2ee0d631773e237.tar.gz gnupg-cd2d758f3f9e0007ecd6bae9d2ee0d631773e237.zip | |
Merge branch 'STABLE-BRANCH-2-2' into master
--
Signed-off-by: Werner Koch <[email protected]>
Conflicts:
NEWS - include release info from 2.2.1
configure.ac - keep master.
Diffstat (limited to 'tools/mime-maker.h')
| -rw-r--r-- | tools/mime-maker.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/mime-maker.h b/tools/mime-maker.h index f2a76cdb8..c0ddaeaa5 100644 --- a/tools/mime-maker.h +++ b/tools/mime-maker.h @@ -34,6 +34,8 @@ void mime_maker_dump_tree (mime_maker_t ctx); gpg_error_t mime_maker_add_header (mime_maker_t ctx, const char *name, const char *value); gpg_error_t mime_maker_add_body (mime_maker_t ctx, const char *string); +gpg_error_t mime_maker_add_body_data (mime_maker_t ctx, + const void *data, size_t datalen); gpg_error_t mime_maker_add_stream (mime_maker_t ctx, estream_t *stream_addr); gpg_error_t mime_maker_add_container (mime_maker_t ctx); gpg_error_t mime_maker_end_container (mime_maker_t ctx); |