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/engine.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/engine.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/engine.c b/src/engine.c index c8ff012b..b1d815ac 100644 --- a/src/engine.c +++ b/src/engine.c @@ -55,8 +55,13 @@ static struct engine_ops *engine_ops[] = #else NULL, #endif -#ifdef ENABLE_GPGSM /* This indicates that we have assuan support. */ - &_gpgme_engine_ops_assuan /* Low-Level Assuan. */ +#ifdef ENABLE_ASSUAN + &_gpgme_engine_ops_assuan, /* Low-Level Assuan. */ +#else + NULL +#endif +#ifdef ENABLE_G13 + &_gpgme_engine_ops_g13 /* Crypto VFS. */ #else NULL #endif @@ -194,7 +199,8 @@ gpgme_get_engine_info (gpgme_engine_info_t *info) gpgme_protocol_t proto_list[] = { GPGME_PROTOCOL_OpenPGP, GPGME_PROTOCOL_CMS, GPGME_PROTOCOL_GPGCONF, - GPGME_PROTOCOL_ASSUAN }; + GPGME_PROTOCOL_ASSUAN, + GPGME_PROTOCOL_G13 }; unsigned int proto; for (proto = 0; proto < DIM (proto_list); proto++) |