[git] GPGME - branch, master, updated. gpgme-1.4.3-30-gde6caee
by Werner Koch
cvs at cvs.gnupg.org
Tue May 13 16:10:17 CEST 2014
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 de6caeed6d6432101c673c35717f152d5facf823 (commit)
from 88f15336ec0eadde68ff2618349efb9006b8e801 (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 de6caeed6d6432101c673c35717f152d5facf823
Author: Werner Koch <wk at gnupg.org>
Date: Tue May 13 15:44:52 2014 +0200
Add 6 new GPGME_STATUS_ codes.
* src/status-table.c: Also add missing DECRYPTION_INFO entry.
diff --git a/NEWS b/NEWS
index 9433356..3eaca19 100644
--- a/NEWS
+++ b/NEWS
@@ -26,6 +26,12 @@ Noteworthy changes in version 1.5.0 (unreleased)
GPGME_PK_ECC NEW.
GPGME_MD_SHA224 NEW.
gpgme_subkey_t EXTENDED: New field curve.
+ GPGME_STATUS_PLAINTEXT_LENGTH NEW.
+ GPGME_STATUS_MOUNTPOINT NEW.
+ GPGME_STATUS_PINENTRY_LAUNCHED NEW.
+ GPGME_STATUS_ATTRIBUTE NEW.
+ GPGME_STATUS_BEGIN_SIGNING NEW.
+ GPGME_STATUS_KEY_NOT_CREATED NEW.
Noteworthy changes in version 1.4.3 (2013-08-12)
diff --git a/src/gpgme.h.in b/src/gpgme.h.in
index 170d7dd..d47f4ba 100644
--- a/src/gpgme.h.in
+++ b/src/gpgme.h.in
@@ -455,7 +455,7 @@ typedef enum
GPGME_STATUS_BADARMOR = 7,
- GPGME_STATUS_RSA_OR_IDEA = 8,
+ GPGME_STATUS_RSA_OR_IDEA = 8, /* (legacy) */
GPGME_STATUS_KEYEXPIRED = 9,
GPGME_STATUS_KEYREVOKED = 10,
@@ -465,10 +465,10 @@ typedef enum
GPGME_STATUS_TRUST_FULLY = 14,
GPGME_STATUS_TRUST_ULTIMATE = 15,
- GPGME_STATUS_SHM_INFO = 16,
- GPGME_STATUS_SHM_GET = 17,
- GPGME_STATUS_SHM_GET_BOOL = 18,
- GPGME_STATUS_SHM_GET_HIDDEN = 19,
+ GPGME_STATUS_SHM_INFO = 16, /* (legacy) */
+ GPGME_STATUS_SHM_GET = 17, /* (legacy) */
+ GPGME_STATUS_SHM_GET_BOOL = 18, /* (legacy) */
+ GPGME_STATUS_SHM_GET_HIDDEN = 19, /* (legacy) */
GPGME_STATUS_NEED_PASSPHRASE = 20,
GPGME_STATUS_VALIDSIG = 21,
@@ -510,15 +510,15 @@ typedef enum
GPGME_STATUS_NOTATION_NAME = 55,
GPGME_STATUS_NOTATION_DATA = 56,
GPGME_STATUS_POLICY_URL = 57,
- GPGME_STATUS_BEGIN_STREAM = 58,
- GPGME_STATUS_END_STREAM = 59,
+ GPGME_STATUS_BEGIN_STREAM = 58, /* (legacy) */
+ GPGME_STATUS_END_STREAM = 59, /* (legacy) */
GPGME_STATUS_KEY_CREATED = 60,
GPGME_STATUS_USERID_HINT = 61,
GPGME_STATUS_UNEXPECTED = 62,
GPGME_STATUS_INV_RECP = 63,
GPGME_STATUS_NO_RECP = 64,
GPGME_STATUS_ALREADY_SIGNED = 65,
- GPGME_STATUS_SIGEXPIRED = 66,
+ GPGME_STATUS_SIGEXPIRED = 66, /* (legacy) */
GPGME_STATUS_EXPSIG = 67,
GPGME_STATUS_EXPKEYSIG = 68,
GPGME_STATUS_TRUNCATED = 69,
@@ -537,7 +537,13 @@ typedef enum
GPGME_STATUS_INV_SGNR = 82,
GPGME_STATUS_NO_SGNR = 83,
GPGME_STATUS_SUCCESS = 84,
- GPGME_STATUS_DECRYPTION_INFO = 85
+ GPGME_STATUS_DECRYPTION_INFO = 85,
+ GPGME_STATUS_PLAINTEXT_LENGTH = 86,
+ GPGME_STATUS_MOUNTPOINT = 87,
+ GPGME_STATUS_PINENTRY_LAUNCHED = 88,
+ GPGME_STATUS_ATTRIBUTE = 89,
+ GPGME_STATUS_BEGIN_SIGNING = 90,
+ GPGME_STATUS_KEY_NOT_CREATED = 91
}
gpgme_status_code_t;
diff --git a/src/status-table.c b/src/status-table.c
index 8060bdb..b936997 100644
--- a/src/status-table.c
+++ b/src/status-table.c
@@ -39,17 +39,21 @@ struct status_table_s {
sorted at start up, too. */
static struct status_table_s status_table[] =
{
+ { "ABORT", GPGME_STATUS_ABORT },
{ "ALREADY_SIGNED", GPGME_STATUS_ALREADY_SIGNED },
+ { "ATTRIBUTE", GPGME_STATUS_ATTRIBUTE },
{ "BACKUP_KEY_CREATED", GPGME_STATUS_BACKUP_KEY_CREATED },
+ { "BAD_PASSPHRASE", GPGME_STATUS_BAD_PASSPHRASE },
{ "BADARMOR", GPGME_STATUS_BADARMOR },
{ "BADMDC", GPGME_STATUS_BADMDC },
{ "BADSIG", GPGME_STATUS_BADSIG },
- { "BAD_PASSPHRASE", GPGME_STATUS_BAD_PASSPHRASE },
{ "BEGIN_DECRYPTION", GPGME_STATUS_BEGIN_DECRYPTION },
{ "BEGIN_ENCRYPTION", GPGME_STATUS_BEGIN_ENCRYPTION },
+ { "BEGIN_SIGNING", GPGME_STATUS_BEGIN_SIGNING },
{ "BEGIN_STREAM", GPGME_STATUS_BEGIN_STREAM },
{ "CARDCTRL", GPGME_STATUS_CARDCTRL },
{ "DECRYPTION_FAILED", GPGME_STATUS_DECRYPTION_FAILED },
+ { "DECRYPTION_INFO", GPGME_STATUS_DECRYPTION_INFO },
{ "DECRYPTION_OKAY", GPGME_STATUS_DECRYPTION_OKAY },
{ "DELETE_PROBLEM", GPGME_STATUS_DELETE_PROBLEM },
{ "ENC_TO", GPGME_STATUS_ENC_TO },
@@ -68,35 +72,39 @@ static struct status_table_s status_table[] =
{ "GET_BOOL", GPGME_STATUS_GET_BOOL },
{ "GET_HIDDEN", GPGME_STATUS_GET_HIDDEN },
{ "GET_LINE", GPGME_STATUS_GET_LINE },
+ { "GOOD_PASSPHRASE", GPGME_STATUS_GOOD_PASSPHRASE },
{ "GOODMDC", GPGME_STATUS_GOODMDC },
{ "GOODSIG", GPGME_STATUS_GOODSIG },
- { "GOOD_PASSPHRASE", GPGME_STATUS_GOOD_PASSPHRASE },
{ "GOT_IT", GPGME_STATUS_GOT_IT },
- { "IMPORTED", GPGME_STATUS_IMPORTED },
{ "IMPORT_OK", GPGME_STATUS_IMPORT_OK },
{ "IMPORT_PROBLEM", GPGME_STATUS_IMPORT_PROBLEM },
{ "IMPORT_RES", GPGME_STATUS_IMPORT_RES },
+ { "IMPORTED", GPGME_STATUS_IMPORTED },
{ "INV_RECP", GPGME_STATUS_INV_RECP },
{ "INV_SGNR", GPGME_STATUS_INV_SGNR },
+ { "KEY_CREATED", GPGME_STATUS_KEY_CREATED },
+ { "KEY_NOT_CREATED", GPGME_STATUS_KEY_NOT_CREATED },
{ "KEYEXPIRED", GPGME_STATUS_KEYEXPIRED },
{ "KEYREVOKED", GPGME_STATUS_KEYREVOKED },
- { "KEY_CREATED", GPGME_STATUS_KEY_CREATED },
{ "LEAVE", GPGME_STATUS_LEAVE },
{ "MISSING_PASSPHRASE", GPGME_STATUS_MISSING_PASSPHRASE },
+ { "MOUNTPOINT", GPGME_STATUS_MOUNTPOINT },
{ "NEED_PASSPHRASE", GPGME_STATUS_NEED_PASSPHRASE },
{ "NEED_PASSPHRASE_PIN", GPGME_STATUS_NEED_PASSPHRASE_PIN },
{ "NEED_PASSPHRASE_SYM", GPGME_STATUS_NEED_PASSPHRASE_SYM },
{ "NEWSIG", GPGME_STATUS_NEWSIG },
- { "NODATA", GPGME_STATUS_NODATA },
- { "NOTATION_DATA", GPGME_STATUS_NOTATION_DATA },
- { "NOTATION_NAME", GPGME_STATUS_NOTATION_NAME },
{ "NO_PUBKEY", GPGME_STATUS_NO_PUBKEY },
{ "NO_RECP", GPGME_STATUS_NO_RECP },
{ "NO_SECKEY", GPGME_STATUS_NO_SECKEY },
{ "NO_SGNR", GPGME_STATUS_NO_SGNR },
+ { "NODATA", GPGME_STATUS_NODATA },
+ { "NOTATION_DATA", GPGME_STATUS_NOTATION_DATA },
+ { "NOTATION_NAME", GPGME_STATUS_NOTATION_NAME },
+ { "PINENTRY_LAUNCHED", GPGME_STATUS_PINENTRY_LAUNCHED},
{ "PKA_TRUST_BAD", GPGME_STATUS_PKA_TRUST_BAD },
{ "PKA_TRUST_GOOD", GPGME_STATUS_PKA_TRUST_GOOD },
{ "PLAINTEXT", GPGME_STATUS_PLAINTEXT },
+ { "PLAINTEXT_LENGTH", GPGME_STATUS_PLAINTEXT_LENGTH },
{ "POLICY_URL", GPGME_STATUS_POLICY_URL },
{ "PROGRESS", GPGME_STATUS_PROGRESS },
{ "REVKEYSIG", GPGME_STATUS_REVKEYSIG },
@@ -108,10 +116,10 @@ static struct status_table_s status_table[] =
{ "SHM_GET_BOOL", GPGME_STATUS_SHM_GET_BOOL },
{ "SHM_GET_HIDDEN", GPGME_STATUS_SHM_GET_HIDDEN },
{ "SHM_INFO", GPGME_STATUS_SHM_INFO },
- { "SIGEXPIRED", GPGME_STATUS_SIGEXPIRED },
{ "SIG_CREATED", GPGME_STATUS_SIG_CREATED },
{ "SIG_ID", GPGME_STATUS_SIG_ID },
{ "SIG_SUBPACKET", GPGME_STATUS_SIG_SUBPACKET },
+ { "SIGEXPIRED", GPGME_STATUS_SIGEXPIRED },
{ "SUCCESS", GPGME_STATUS_SUCCESS },
{ "TRUNCATED", GPGME_STATUS_TRUNCATED },
{ "TRUST_FULLY", GPGME_STATUS_TRUST_FULLY },
@@ -122,7 +130,6 @@ static struct status_table_s status_table[] =
{ "UNEXPECTED", GPGME_STATUS_UNEXPECTED },
{ "USERID_HINT", GPGME_STATUS_USERID_HINT },
{ "VALIDSIG", GPGME_STATUS_VALIDSIG },
- { "ABORT", GPGME_STATUS_ABORT },
{NULL, 0}
};
-----------------------------------------------------------------------
Summary of changes:
NEWS | 6 ++++++
src/gpgme.h.in | 24 +++++++++++++++---------
src/status-table.c | 25 ++++++++++++++++---------
3 files changed, 37 insertions(+), 18 deletions(-)
hooks/post-receive
--
GnuPG Made Easy
http://git.gnupg.org
More information about the Gnupg-commits
mailing list