Merge lp:~daniele-athome/pygpgme/pygpgme into lp:pygpgme

[daniele_athome]

Support for key export mode

[daniele_athome (daniele-athome)]

I deleted the previous merge request and created this one which includes the previously added ECDSA constants.

[Muelli (ubuntu-bugs-auftrags-killer)]

I'd like to see this patch being merged to be able to do a minimal export of keys.

[AndreiM (andrei-macavei89)]

I would also like this patch to be merged. It can also be updated with the newest release of GPGME where there is an option to export secret key now:
http://lists.gnupg.org/pipermail/gnupg-devel/2015-August/030236.html

Unmerged revisions

94. By Daniele <email address hidden> on 2013-07-06

Support for key export mode

93. By Daniele <email address hidden> on 2013-06-20

Add PK_ECDSA/PK_ECDH constants

=== modified file 'src/pygpgme-constants.c'
--- src/pygpgme-constants.c	2013-02-13 02:17:54 +0000
+++ src/pygpgme-constants.c	2013-07-06 21:48:26 +0000
@@ -40,6 +40,8 @@
   CONST(PK_ELG_E),
   CONST(PK_DSA),
   CONST(PK_ELG),
+  CONST(PK_ECDSA),
+  CONST(PK_ECDH),
 
   /* gpgme_hash_algo_t */
   CONST(MD_NONE),
@@ -87,6 +89,10 @@
   CONST(PINENTRY_MODE_ERROR),
   CONST(PINENTRY_MODE_LOOPBACK),
 
+  /* gpgme_export_mode_t */
+  CONST(EXPORT_MODE_EXTERN),
+  CONST(EXPORT_MODE_MINIMAL),
+
   /* gpgme_status_code_t */
   CONST(STATUS_EOF),
   CONST(STATUS_ENTER),

=== modified file 'src/pygpgme-context.c'
--- src/pygpgme-context.c	2013-02-13 02:18:22 +0000
+++ src/pygpgme-context.c	2013-07-06 21:48:26 +0000
@@ -1184,10 +1184,11 @@
 {
     PyObject *py_pattern, *py_keydata;
     char **patterns = NULL;
+    int export_mode = 0;
     gpgme_data_t keydata;
     gpgme_error_t err;
 
-    if (!PyArg_ParseTuple(args, "OO", &py_pattern, &py_keydata))
+    if (!PyArg_ParseTuple(args, "OO|i", &py_pattern, &py_keydata, &export_mode))
         return NULL;
 
     if (parse_key_patterns(py_pattern, &patterns) < 0)
@@ -1200,7 +1201,7 @@
     }
 
     Py_BEGIN_ALLOW_THREADS;
-    err = gpgme_op_export_ext(self->ctx, (const char **)patterns, 0, keydata);
+    err = gpgme_op_export_ext(self->ctx, (const char **)patterns, export_mode, keydata);
     Py_END_ALLOW_THREADS;
 
     if (patterns)