GpgFrontend/gpgme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prepare for a new protocol.

Browse Source 
Comment clarification.
This commit is contained in:
Werner Koch 2009-11-03 20:27:35 +00:00
parent 97932b102a
commit fc0fd88d7f
7 changed files with 35 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
doc/gpgme.texi
View File

@ -766,6 +766,15 @@ This specifies the OpenPGP protocol.
@item GPGME_PROTOCOL_CMS
This specifies the Cryptographic Message Syntax.
@item GPGME_PROTOCOL_ASSUAN
Under development. Please ask on @email{gnupg-devel@@gnupg.org} for help.
@item GPGME_PROTOCOL_G13
Under development. Please ask on @email{gnupg-devel@@gnupg.org} for help.
@item GPGME_PROTOCOL_UISERVER
Under development. Please ask on @email{gnupg-devel@@gnupg.org} for help.
@item GPGME_PROTOCOL_UNKNOWN
Reserved for future extension. You may use this to indicate that the
used protocol is not known to the application. Currently,

4
src/ChangeLog
View File

@ -1,3 +1,7 @@
2009-11-03 Werner Koch <wk@g10code.com>
* gpgme.h.in (GPGME_PROTOCOL_UISERVER): New.
2009-11-03 Marcus Brinkmann <marcus@g10code.de>
* Makefile.am (main_sources): Change g13.c to vfs-mount.c. Add

1
src/gpgme.h.in
View File

@ -325,6 +325,7 @@ typedef enum
GPGME_PROTOCOL_GPGCONF = 2, /* Special code for gpgconf. */
GPGME_PROTOCOL_ASSUAN = 3, /* Low-level access to an Assuan server. */
GPGME_PROTOCOL_G13 = 4,
GPGME_PROTOCOL_UISERVER= 5,
GPGME_PROTOCOL_UNKNOWN = 255
}
gpgme_protocol_t;

2
src/verify.c
View File

@ -201,7 +201,7 @@ calc_sig_summary (gpgme_signature_t sig)
sum |= GPGME_SIGSUM_BAD_POLICY;
/* Set the valid flag when the signature is unquestionable
valid. */
valid. (The test is identical to if(sum == GPGME_SIGSUM_GREEN)). */
if ((sum & GPGME_SIGSUM_GREEN) && !(sum & ~GPGME_SIGSUM_GREEN))
sum |= GPGME_SIGSUM_VALID;

6
tests/ChangeLog
View File

@ -1,3 +1,9 @@
2009-11-03 Werner Koch <wk@g10code.com>
* run-support.h (fail_if_err): Include program name.
* run-sign.c (main): Add option --uiserver.
2009-10-26 Marcus Brinkmann <marcus@g10code.de>
* opassuan/t-command.c: Update to new interface.

16
tests/run-sign.c
View File

@ -69,6 +69,7 @@ show_usage (int ex)
" --verbose run in verbose mode\n"
" --openpgp use the OpenPGP protocol (default)\n"
" --cms use the CMS protocol\n"
" --uiserver use the UI server\n"
" --key NAME use key NAME for signing\n"
, stderr);
exit (ex);
@ -115,6 +116,11 @@ main (int argc, char **argv)
protocol = GPGME_PROTOCOL_CMS;
argc--; argv++;
}
else if (!strcmp (*argv, "--uiserver"))
{
protocol = GPGME_PROTOCOL_UISERVER;
argc--; argv++;
}
else if (!strcmp (*argv, "--key"))
{
argc--; argv++;
@ -131,6 +137,12 @@ main (int argc, char **argv)
if (argc != 1)
show_usage (1);
if (key_string && protocol == GPGME_PROTOCOL_UISERVER)
{
fprintf (stderr, PGM ": ignoring --key in UI-server mode\n");
key_string = NULL;
}
init_gpgme (protocol);
err = gpgme_new (&ctx);
@ -141,12 +153,10 @@ main (int argc, char **argv)
if (key_string)
{
gpgme_key_t akey;
err = gpgme_get_key (ctx, key_string, &akey, 1);
if (err)
{
fprintf (stderr, PGM ": error getting key `%s': %s\n",
key_string, gpg_strerror (err));
exit (1);
}
err = gpgme_signers_add (ctx, akey);

2
tests/run-support.h
View File

@ -38,7 +38,7 @@
{ \
if (err) \
{ \
fprintf (stderr, "%s:%d: %s: %s\n", \
fprintf (stderr, PGM": file %s line %d: <%s> %s\n", \
__FILE__, __LINE__, gpgme_strsource (err), \
gpgme_strerror (err)); \
exit (1); \