diff options
| author | Maximilian Krambach <[email protected]> | 2018-04-20 13:23:57 +0000 |
|---|---|---|
| committer | Maximilian Krambach <[email protected]> | 2018-04-20 13:23:57 +0000 |
| commit | 94f21d9f6bc1cf94e068e26eae53e593189dcec6 (patch) | |
| tree | b176a836c504cbd71a5ca17ca025b23285d1505a /src/util.h | |
| parent | js: Initial commit for JavaScript Native Messaging API (diff) | |
| parent | core: Do not modify args for ignored failures (diff) | |
| download | gpgme-94f21d9f6bc1cf94e068e26eae53e593189dcec6.tar.gz gpgme-94f21d9f6bc1cf94e068e26eae53e593189dcec6.zip | |
Merge branch 'master' into javascript-binding
Diffstat (limited to 'src/util.h')
| -rw-r--r-- | src/util.h | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -165,10 +165,11 @@ time_t _gpgme_parse_timestamp (const char *timestamp, char **endp); * on error or missing timestamp. */ unsigned long _gpgme_parse_timestamp_ul (const char *timestamp); -gpgme_error_t _gpgme_map_gnupg_error (char *err); - int _gpgme_map_pk_algo (int algo, gpgme_protocol_t protocol); +const char *_gpgme_cipher_algo_name (int algo, gpgme_protocol_t protocol); +const char *_gpgme_cipher_mode_name (int algo, gpgme_protocol_t protocol); + /*-- b64dec.c --*/ |