diff options
| author | Marcus Brinkmann <[email protected]> | 2009-10-22 16:44:07 +0000 |
|---|---|---|
| committer | Marcus Brinkmann <[email protected]> | 2009-10-22 16:44:07 +0000 |
| commit | a6f3857128220cc413434d5fb56cdd7f9a890c4c (patch) | |
| tree | 50478606bd9a1f87a61e8df224f8c4260ad2e5a2 /src/gpgme.c | |
| parent | Really add file. (diff) | |
| download | gpgme-a6f3857128220cc413434d5fb56cdd7f9a890c4c.tar.gz gpgme-a6f3857128220cc413434d5fb56cdd7f9a890c4c.zip | |
2009-10-22 Marcus Brinkmann <[email protected]>
* configure.ac: Add support for G13.
src/
2009-10-22 Marcus Brinkmann <[email protected]>
* Makefile.am: Remove @NETLIBS@ from LIBADDs.
(g13_components): New variable.
(main_sources): Add $(g13_components).
* g13.c, engine-g13.c: New files.
* engine.c (engine_ops): Check for assuan for assuan engine, add
g13 engine.
* util.h (_gpgme_get_g13_path, _gpgme_encode_percent_string): New
prototypes.
* conversion.c (_gpgme_encode_percent_string): New function.
* gpgme.h.in (gpgme_protocol_t): Add GPGME_PROTOCOL_G13.
(struct _gpgme_op_g13_result, gpgme_g13_result_t): New types.
(gpgme_op_g13_mount): New function.
* gpgme.def, libgpgme.vers: Add gpgme_op_g13_mount.
* gpgme.c (gpgme_set_protocol): Allow GPGME_PROTOCOL_G13.
(gpgme_get_protocol_name): Add GPGME_PROTOCOL_G13.
* posix-util.c (_gpgme_get_g13_path): New function.
* w32-util.c (_gpgme_get_g13_path): New function.
* engine-backend.h (_gpgme_engine_ops_g13): New declaration.
Diffstat (limited to '')
| -rw-r--r-- | src/gpgme.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/gpgme.c b/src/gpgme.c index 56caf59c..071b394c 100644 --- a/src/gpgme.c +++ b/src/gpgme.c @@ -248,7 +248,8 @@ gpgme_set_protocol (gpgme_ctx_t ctx, gpgme_protocol_t protocol) if (protocol != GPGME_PROTOCOL_OpenPGP && protocol != GPGME_PROTOCOL_CMS - && protocol != GPGME_PROTOCOL_ASSUAN) + && protocol != GPGME_PROTOCOL_ASSUAN + && protocol != GPGME_PROTOCOL_G13) return TRACE_ERR (gpg_error (GPG_ERR_INV_VALUE)); if (ctx->protocol != protocol) @@ -292,6 +293,9 @@ gpgme_get_protocol_name (gpgme_protocol_t protocol) case GPGME_PROTOCOL_ASSUAN: return "Assuan"; + case GPGME_PROTOCOL_G13: + return "G13"; + case GPGME_PROTOCOL_UNKNOWN: return "unknown"; |