2002-09-02 Marcus Brinkmann <marcus@g10code.de>
* gpg/t-keylist.c (main): Test PATTERN for NULL before printing. Reported by Dr. Stefan Dalibor <Dr.Stefan.Dalibor@bfa.de>.
This commit is contained in:
parent
442f2fe541
commit
05c75f41a5
@ -1,3 +1,8 @@
|
|||||||
|
2002-09-02 Marcus Brinkmann <marcus@g10code.de>
|
||||||
|
|
||||||
|
* gpg/t-keylist.c (main): Test PATTERN for NULL before printing.
|
||||||
|
Reported by Dr. Stefan Dalibor <Dr.Stefan.Dalibor@bfa.de>.
|
||||||
|
|
||||||
2002-08-01 Marcus Brinkmann <marcus@g10code.de>
|
2002-08-01 Marcus Brinkmann <marcus@g10code.de>
|
||||||
|
|
||||||
* gpg/t-edit.c: Also add a test for the expire command (testing
|
* gpg/t-edit.c: Also add a test for the expire command (testing
|
||||||
|
@ -33,64 +33,67 @@
|
|||||||
} while(0)
|
} while(0)
|
||||||
|
|
||||||
static void
|
static void
|
||||||
doit ( GpgmeCtx ctx, const char *pattern )
|
doit (GpgmeCtx ctx, const char *pattern)
|
||||||
{
|
{
|
||||||
GpgmeError err;
|
GpgmeError err;
|
||||||
GpgmeKey key;
|
GpgmeKey key;
|
||||||
|
|
||||||
err = gpgme_op_keylist_start (ctx, pattern, 0 );
|
err = gpgme_op_keylist_start (ctx, pattern, 0);
|
||||||
fail_if_err (err);
|
fail_if_err (err);
|
||||||
|
|
||||||
while ( !(err = gpgme_op_keylist_next ( ctx, &key )) ) {
|
while (!(err = gpgme_op_keylist_next (ctx, &key)))
|
||||||
char *p;
|
{
|
||||||
const char *s;
|
char *p;
|
||||||
int i;
|
const char *s;
|
||||||
|
int i;
|
||||||
|
|
||||||
printf ("<!-- Begin key object (%p) -->\n", key );
|
printf ("<!-- Begin key object (%p) -->\n", key);
|
||||||
p = gpgme_key_get_as_xml ( key );
|
p = gpgme_key_get_as_xml (key);
|
||||||
if ( p ) {
|
if (p)
|
||||||
fputs ( p, stdout );
|
{
|
||||||
free (p);
|
fputs (p, stdout);
|
||||||
|
free (p);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
fputs("<!-- Ooops: gpgme_key_get_as_xml failed -->\n", stdout );
|
fputs("<!-- Ooops: gpgme_key_get_as_xml failed -->\n", stdout);
|
||||||
|
|
||||||
|
for (i = 0; ; i++)
|
||||||
for (i=0; ; i++ ) {
|
{
|
||||||
s = gpgme_key_get_string_attr (key, GPGME_ATTR_KEYID, NULL, i );
|
s = gpgme_key_get_string_attr (key, GPGME_ATTR_KEYID, NULL, i);
|
||||||
if (!s)
|
if (!s)
|
||||||
break;
|
break;
|
||||||
printf ("<!-- keyid.%d=%s -->\n", i, s );
|
printf ("<!-- keyid.%d=%s -->\n", i, s);
|
||||||
s = gpgme_key_get_string_attr (key, GPGME_ATTR_ALGO, NULL, i );
|
s = gpgme_key_get_string_attr (key, GPGME_ATTR_ALGO, NULL, i);
|
||||||
printf ("<!-- algo.%d=%s -->\n", i, s );
|
printf ("<!-- algo.%d=%s -->\n", i, s);
|
||||||
s = gpgme_key_get_string_attr (key, GPGME_ATTR_KEY_CAPS, NULL, i );
|
s = gpgme_key_get_string_attr (key, GPGME_ATTR_KEY_CAPS, NULL, i);
|
||||||
printf ("<!-- caps.%d=%s -->\n", i, s );
|
printf ("<!-- caps.%d=%s -->\n", i, s);
|
||||||
}
|
}
|
||||||
for (i=0; ; i++ ) {
|
for (i = 0; ; i++)
|
||||||
s = gpgme_key_get_string_attr (key, GPGME_ATTR_NAME, NULL, i );
|
{
|
||||||
if (!s)
|
s = gpgme_key_get_string_attr (key, GPGME_ATTR_NAME, NULL, i);
|
||||||
break;
|
if (!s)
|
||||||
printf ("<!-- name.%d=%s -->\n", i, s );
|
break;
|
||||||
s = gpgme_key_get_string_attr (key, GPGME_ATTR_EMAIL, NULL, i );
|
printf ("<!-- name.%d=%s -->\n", i, s);
|
||||||
printf ("<!-- email.%d=%s -->\n", i, s );
|
s = gpgme_key_get_string_attr (key, GPGME_ATTR_EMAIL, NULL, i);
|
||||||
s = gpgme_key_get_string_attr (key, GPGME_ATTR_COMMENT, NULL, i );
|
printf ("<!-- email.%d=%s -->\n", i, s);
|
||||||
printf ("<!-- comment.%d=%s -->\n", i, s );
|
s = gpgme_key_get_string_attr (key, GPGME_ATTR_COMMENT, NULL, i);
|
||||||
|
printf ("<!-- comment.%d=%s -->\n", i, s);
|
||||||
}
|
}
|
||||||
|
|
||||||
fputs ("<!-- usable for:", stdout );
|
fputs ("<!-- usable for:", stdout);
|
||||||
if ( gpgme_key_get_ulong_attr (key, GPGME_ATTR_CAN_ENCRYPT, NULL, 0 ))
|
if ( gpgme_key_get_ulong_attr (key, GPGME_ATTR_CAN_ENCRYPT, NULL, 0))
|
||||||
fputs (" encryption", stdout);
|
fputs (" encryption", stdout);
|
||||||
if ( gpgme_key_get_ulong_attr (key, GPGME_ATTR_CAN_SIGN, NULL, 0 ))
|
if ( gpgme_key_get_ulong_attr (key, GPGME_ATTR_CAN_SIGN, NULL, 0))
|
||||||
fputs (" signing", stdout);
|
fputs (" signing", stdout);
|
||||||
if ( gpgme_key_get_ulong_attr (key, GPGME_ATTR_CAN_CERTIFY, NULL, 0 ))
|
if ( gpgme_key_get_ulong_attr (key, GPGME_ATTR_CAN_CERTIFY, NULL, 0))
|
||||||
fputs (" certification", stdout);
|
fputs (" certification", stdout);
|
||||||
fputs (" -->\n", stdout );
|
fputs (" -->\n", stdout );
|
||||||
|
|
||||||
printf ("<!-- End key object (%p) -->\n", key );
|
printf ("<!-- End key object (%p) -->\n", key);
|
||||||
gpgme_key_release (key);
|
gpgme_key_release (key);
|
||||||
}
|
}
|
||||||
if ( err != GPGME_EOF )
|
if (err != GPGME_EOF)
|
||||||
fail_if_err (err);
|
fail_if_err (err);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -101,58 +104,67 @@ doit ( GpgmeCtx ctx, const char *pattern )
|
|||||||
static void
|
static void
|
||||||
check_two_contexts (void)
|
check_two_contexts (void)
|
||||||
{
|
{
|
||||||
GpgmeError err;
|
GpgmeError err;
|
||||||
GpgmeCtx ctx1, ctx2;
|
GpgmeCtx ctx1, ctx2;
|
||||||
GpgmeKey key;
|
GpgmeKey key;
|
||||||
|
|
||||||
err = gpgme_new(&ctx1); fail_if_err (err);
|
err = gpgme_new(&ctx1); fail_if_err (err);
|
||||||
err = gpgme_op_keylist_start(ctx1, "", 1); fail_if_err (err);
|
err = gpgme_op_keylist_start(ctx1, "", 1);
|
||||||
err = gpgme_new(&ctx2); fail_if_err (err);
|
fail_if_err (err);
|
||||||
err = gpgme_op_keylist_start(ctx2, "", 1); fail_if_err (err);
|
err = gpgme_new(&ctx2); fail_if_err (err);
|
||||||
|
err = gpgme_op_keylist_start(ctx2, "", 1);
|
||||||
|
fail_if_err (err);
|
||||||
|
|
||||||
while ( (err=gpgme_op_keylist_next(ctx2, &key)) != GPGME_EOF) {
|
while ((err = gpgme_op_keylist_next (ctx2, &key)) != GPGME_EOF)
|
||||||
gpgme_key_release (key);
|
gpgme_key_release (key);
|
||||||
}
|
|
||||||
if (err != GPGME_EOF)
|
if (err != GPGME_EOF)
|
||||||
fail_if_err (err);
|
fail_if_err (err);
|
||||||
while ( (err=gpgme_op_keylist_next(ctx1, &key)) != GPGME_EOF) {
|
while ((err=gpgme_op_keylist_next(ctx1, &key)) != GPGME_EOF)
|
||||||
gpgme_key_release (key);
|
gpgme_key_release (key);
|
||||||
}
|
|
||||||
if (err != GPGME_EOF)
|
if (err != GPGME_EOF)
|
||||||
fail_if_err (err);
|
fail_if_err (err);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
int
|
int
|
||||||
main (int argc, char **argv )
|
main (int argc, char **argv)
|
||||||
{
|
{
|
||||||
GpgmeCtx ctx;
|
GpgmeCtx ctx;
|
||||||
GpgmeError err;
|
GpgmeError err;
|
||||||
int loop = 0;
|
int loop = 0;
|
||||||
const char *pattern;
|
const char *pattern;
|
||||||
|
|
||||||
if( argc ) {
|
if (argc)
|
||||||
argc--; argv++;
|
{
|
||||||
|
argc--;
|
||||||
|
argv++;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (argc && !strcmp( *argv, "--loop" ) ) {
|
if (argc && !strcmp( *argv, "--loop"))
|
||||||
loop = 1;
|
{
|
||||||
argc--; argv++;
|
loop = 1;
|
||||||
|
argc--; argv++;
|
||||||
}
|
}
|
||||||
pattern = argc? *argv : NULL;
|
pattern = argc? *argv : NULL;
|
||||||
|
|
||||||
err = gpgme_check_engine();
|
err = gpgme_check_engine();
|
||||||
fail_if_err (err);
|
fail_if_err (err);
|
||||||
|
|
||||||
err = gpgme_new (&ctx);
|
err = gpgme_new (&ctx);
|
||||||
fail_if_err (err);
|
fail_if_err (err);
|
||||||
gpgme_set_keylist_mode (ctx, 1); /* no validity calculation */
|
/* No validity calculation. */
|
||||||
do {
|
gpgme_set_keylist_mode (ctx, 1);
|
||||||
fprintf (stderr, "** pattern=`%s'\n", pattern );
|
do
|
||||||
doit ( ctx, pattern );
|
{
|
||||||
} while ( loop );
|
fprintf (stderr, "** pattern=`%s'\n", pattern ? pattern : "(null)");
|
||||||
gpgme_release (ctx);
|
doit (ctx, pattern);
|
||||||
|
}
|
||||||
|
while (loop);
|
||||||
|
gpgme_release (ctx);
|
||||||
|
|
||||||
check_two_contexts ();
|
check_two_contexts ();
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user