[git] GPGME - branch, master, updated. gpgme-1.9.0-72-g6745eb6
by Werner Koch
cvs at cvs.gnupg.org
Thu Aug 24 16:27:08 CEST 2017
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG Made Easy".
The branch, master has been updated
via 6745eb69e27bc73fece88c5e4e0b0bca13fa8b11 (commit)
via 9bde9144f0c2d0087799511e9b041dc945a4cfa8 (commit)
from 91e47d71652bd0f83b51089c343c3c4836bdfa8a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 6745eb69e27bc73fece88c5e4e0b0bca13fa8b11
Author: Werner Koch <wk at gnupg.org>
Date: Thu Aug 24 16:19:54 2017 +0200
Set next version to 1.10.0
--
diff --git a/NEWS b/NEWS
index f3394a2..25552ad 100644
--- a/NEWS
+++ b/NEWS
@@ -1,21 +1,22 @@
-Noteworthy changes in version 1.9.1 (unreleased)
-------------------------------------------------
+Noteworthy changes in version 1.10.0 (unreleased)
+-------------------------------------------------
* Interface changes relative to the 1.9.0 release:
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
- gpgme_decrypt_result_t EXTENDED: New field 'is_de_vs'.
- gpgme_signature_t EXTENDED: New field 'is_de_vs'.
- gpgme_op_delete_ext NEW
- gpgme_op_delete_ext_start NEW
- GPGME_DELETE_ALLOW_SECRET NEW
- GPGME_DELETE_FORCE NEW
- gpgme_op_conf_dir NEW
+ gpgme_decrypt_result_t EXTENDED: New field 'is_de_vs'.
+ gpgme_signature_t EXTENDED: New field 'is_de_vs'.
+ gpgme_keyorg_t NEW.
+ gpgme_op_delete_ext NEW.
+ gpgme_op_delete_ext_start NEW.
+ GPGME_DELETE_ALLOW_SECRET NEW.
+ GPGME_DELETE_FORCE NEW.
+ gpgme_op_conf_dir NEW.
cpp: DecryptionResult::isDeVs NEW.
cpp: Signature::isDeVs NEW.
- py: DecryptResult EXTENDED: New boolean field 'is_de_vs'.
- py: Signature EXTENDED: New boolean field 'is_de_vs'.
- py: GpgError EXTENDED: Partial results in 'results'.
+ py: DecryptResult EXTENDED: New boolean field 'is_de_vs'.
+ py: Signature EXTENDED: New boolean field 'is_de_vs'.
+ py: GpgError EXTENDED: Partial results in 'results'.
+
Noteworthy changes in version 1.9.0 (2017-03-28)
------------------------------------------------
@@ -44,7 +45,6 @@ Noteworthy changes in version 1.9.0 (2017-03-28)
* Many smaller bug fixes.
-
* Interface changes relative to the 1.8.0 release:
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
gpgme_op_createkey CHANGED: Meaning of 'expire' parameter.
diff --git a/configure.ac b/configure.ac
index b4878cc..1284317 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,8 +28,8 @@ min_automake_version="1.14"
# commit and push so that the git magic is able to work. See below
# for the LT versions.
m4_define(mym4_version_major, [1])
-m4_define(mym4_version_minor, [9])
-m4_define(mym4_version_micro, [1])
+m4_define(mym4_version_minor, [10])
+m4_define(mym4_version_micro, [0])
# Below is m4 magic to extract and compute the revision number, the
# decimalized short revision number, a beta version string, and a flag
diff --git a/src/engine-gpg.c b/src/engine-gpg.c
index bc60d82..9c0d7f7 100644
--- a/src/engine-gpg.c
+++ b/src/engine-gpg.c
@@ -1874,7 +1874,7 @@ gpg_encrypt (void *engine, gpgme_key_t recp[], gpgme_encrypt_flags_t flags,
if (!err && (flags & GPGME_ENCRYPT_WRAP))
{
- /* gpg is current not abale to detect already compressed
+ /* gpg is current not able to detect already compressed
* packets. Thus when using
* gpg --unwrap -d | gpg --no-literal -e
* the encryption would add an additional compression layer.
commit 9bde9144f0c2d0087799511e9b041dc945a4cfa8
Author: Werner Koch <wk at gnupg.org>
Date: Thu Aug 24 14:21:15 2017 +0200
core: New public enum gpgme_keyorg_t.
* src/gpgme.h.in (gpgme_keyorg_t): New.
* src/keylist.c (parse_keyorg): New.
(keylist_colon_handler): Set key->ORIGIN.
--
This finally set the key origin value form data supplied by recent gpg
versions.
Signed-off-by: Werner Koch <wk at gnupg.org>
diff --git a/src/gpgme.h.in b/src/gpgme.h.in
index 8afc276..31a9060 100644
--- a/src/gpgme.h.in
+++ b/src/gpgme.h.in
@@ -330,6 +330,21 @@ typedef enum
gpgme_tofu_policy_t;
+/* The key origin values. */
+typedef enum
+ {
+ GPGME_KEYORG_UNKNOWN = 0,
+ GPGME_KEYORG_KS = 1,
+ GPGME_KEYORG_DANE = 3,
+ GPGME_KEYORG_WKD = 4,
+ GPGME_KEYORG_URL = 5,
+ GPGME_KEYORG_FILE = 6,
+ GPGME_KEYORG_SELF = 7,
+ GPGME_KEYORG_OTHER = 31
+ }
+gpgme_keyorg_t;
+
+
/* The available protocols. */
typedef enum
{
@@ -697,7 +712,7 @@ struct _gpgme_user_id
/* The malloced TOFU information or NULL. */
gpgme_tofu_info_t tofu;
- /* Time of the last refresh of thsi user id. 0 if unknown. */
+ /* Time of the last refresh of this user id. 0 if unknown. */
unsigned long last_update;
};
typedef struct _gpgme_user_id *gpgme_user_id_t;
diff --git a/src/keylist.c b/src/keylist.c
index 5e1c61e..24a9b0b 100644
--- a/src/keylist.c
+++ b/src/keylist.c
@@ -376,6 +376,25 @@ set_ownertrust (gpgme_key_t key, const char *src)
}
+static gpgme_keyorg_t
+parse_keyorg (const char *string)
+{
+ switch (atoi (string))
+ {
+ case 0: return GPGME_KEYORG_UNKNOWN;
+ case 1:
+ case 2:
+ return GPGME_KEYORG_KS;
+ case 3: return GPGME_KEYORG_DANE;
+ case 4: return GPGME_KEYORG_WKD;
+ case 5: return GPGME_KEYORG_URL;
+ case 6: return GPGME_KEYORG_FILE;
+ case 7: return GPGME_KEYORG_SELF;
+ default: return GPGME_KEYORG_OTHER;
+ }
+}
+
+
/* Parse field 15 of a secret key or subkey. This fields holds a
reference to smartcards. FIELD is the content of the field and we
are allowed to modify it. */
@@ -719,7 +738,7 @@ keylist_colon_handler (void *priv, char *line)
if (fields >= 20)
{
key->last_update = _gpgme_parse_timestamp_ul (field[18]);
- key->origin = 0; /* Fixme: Not yet defined in gpg. */
+ key->origin = parse_keyorg (field[19]);
}
break;
@@ -814,7 +833,7 @@ keylist_colon_handler (void *priv, char *line)
if (fields >= 20)
{
opd->tmp_uid->last_update = _gpgme_parse_timestamp_ul (field[18]);
- opd->tmp_uid->origin = 0; /* Fixme: Not yet defined in gpg. */
+ opd->tmp_uid->origin = parse_keyorg (field[19]);
}
}
break;
-----------------------------------------------------------------------
Summary of changes:
NEWS | 28 ++++++++++++++--------------
configure.ac | 4 ++--
src/engine-gpg.c | 2 +-
src/gpgme.h.in | 17 ++++++++++++++++-
src/keylist.c | 23 +++++++++++++++++++++--
5 files changed, 54 insertions(+), 20 deletions(-)
hooks/post-receive
--
GnuPG Made Easy
http://git.gnupg.org
More information about the Gnupg-commits
mailing list