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

2002-02-09 Marcus Brinkmann <marcus@g10code.de>

Browse Source 
* genkey.c (gpgme_op_genkey_start): Fix logic in validity check.
	(gpgme_op_genkey_start): Skip newlines after opening tag.

	* engine-gpgsm.c (_gpgme_gpgsm_start): Remove cruft.
This commit is contained in:
Marcus Brinkmann 2002-02-09 00:06:32 +00:00
parent f0a45d0c20
commit 82b7dc1d29
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gpgme/ChangeLog
View File

@ -1,3 +1,10 @@
2002-02-09 Marcus Brinkmann <marcus@g10code.de>
* genkey.c (gpgme_op_genkey_start): Fix logic in validity check.
(gpgme_op_genkey_start): Skip newlines after opening tag.
* engine-gpgsm.c (_gpgme_gpgsm_start): Remove cruft.
2002-02-08 Marcus Brinkmann <marcus@g10code.de> 2002-02-08 Marcus Brinkmann <marcus@g10code.de>
* genkey.c (gpgme_op_genkey_start): Allow PUBKEY and SECKEY to be * genkey.c (gpgme_op_genkey_start): Allow PUBKEY and SECKEY to be

2
gpgme/engine-gpgsm.c
View File

@ -1006,7 +1006,7 @@ _gpgme_gpgsm_set_colon_line_handler (GpgsmObject gpgsm,
GpgmeError GpgmeError
_gpgme_gpgsm_start (GpgsmObject gpgsm, void *opaque, GpgmeError *errorp) _gpgme_gpgsm_start (GpgsmObject gpgsm, void *opaque)
{ {
return mk_error (Invalid_Engine); return mk_error (Invalid_Engine);
} }

9
gpgme/genkey.c
View File

@ -140,12 +140,12 @@ gpgme_op_genkey_start (GpgmeCtx ctx, const char *parms,
if (!pubkey && !seckey) if (!pubkey && !seckey)
; /* okay: Add key to the keyrings */ ; /* okay: Add key to the keyrings */
else if (!pubkey || gpgme_data_get_type (pubkey) != GPGME_DATA_TYPE_NONE) else if (pubkey && gpgme_data_get_type (pubkey) != GPGME_DATA_TYPE_NONE)
{ {
err = mk_error (Invalid_Value); err = mk_error (Invalid_Value);
goto leave; goto leave;
} }
else if (!seckey || gpgme_data_get_type (seckey) != GPGME_DATA_TYPE_NONE) else if (seckey && gpgme_data_get_type (seckey) != GPGME_DATA_TYPE_NONE)
{ {
err = mk_error (Invalid_Value); err = mk_error (Invalid_Value);
goto leave; goto leave;
@ -166,7 +166,10 @@ gpgme_op_genkey_start (GpgmeCtx ctx, const char *parms,
&& (s2 = strstr (s+1, "</GnupgKeyParms>"))) && (s2 = strstr (s+1, "</GnupgKeyParms>")))
{ {
/* FIXME: Check that there are no control statements inside. */ /* FIXME: Check that there are no control statements inside. */
err = gpgme_data_new_from_mem (&ctx->help_data_1, s+1, s2-s-1, 1); s++; /* Skip '>'. */
while (*s == '\n')
s++;
err = gpgme_data_new_from_mem (&ctx->help_data_1, s, s2-s, 1);
} }
else else
err = mk_error (Invalid_Value); err = mk_error (Invalid_Value);