2003-04-27 Marcus Brinkmann <marcus@g10code.de>
* gpg/t-encrypt-sign.c (check_result): Rewritten.
This commit is contained in:
parent
588c16d324
commit
e30568b240
@ -1,5 +1,7 @@
|
|||||||
2003-04-27 Marcus Brinkmann <marcus@g10code.de>
|
2003-04-27 Marcus Brinkmann <marcus@g10code.de>
|
||||||
|
|
||||||
|
* gpg/t-encrypt-sign.c (check_result): Rewritten.
|
||||||
|
|
||||||
* gpg/t-sign.c: Rewritten.
|
* gpg/t-sign.c: Rewritten.
|
||||||
* gpgsm/t-sign.c: Rewritten.
|
* gpgsm/t-sign.c: Rewritten.
|
||||||
* gpg/t-encrypt.c: Check for invalid recipients.
|
* gpg/t-encrypt.c: Check for invalid recipients.
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
/* t-encrypt-sign.c - regression test
|
/* t-encrypt.c - Regression test.
|
||||||
Copyright (C) 2000 Werner Koch (dd9jn)
|
Copyright (C) 2000 Werner Koch (dd9jn)
|
||||||
Copyright (C) 2001, 2002, 2003 g10 Code GmbH
|
Copyright (C) 2001, 2002, 2003 g10 Code GmbH
|
||||||
|
|
||||||
@ -18,44 +18,36 @@
|
|||||||
along with GPGME; if not, write to the Free Software Foundation,
|
along with GPGME; if not, write to the Free Software Foundation,
|
||||||
Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
|
Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
|
||||||
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
#include <stdio.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <assert.h>
|
|
||||||
|
|
||||||
#include <gpgme.h>
|
#include <gpgme.h>
|
||||||
|
|
||||||
#define fail_if_err(a) do { if(a) { \
|
#define fail_if_err(err) \
|
||||||
fprintf (stderr, "%s:%d: GpgmeError %s\n", \
|
do \
|
||||||
__FILE__, __LINE__, gpgme_strerror(a)); \
|
{ \
|
||||||
exit (1); } \
|
if (err) \
|
||||||
} while(0)
|
{ \
|
||||||
|
fprintf (stderr, "%s:%d: GpgmeError %s\n", \
|
||||||
static void
|
__FILE__, __LINE__, gpgme_strerror (err)); \
|
||||||
print_op_info (GpgmeCtx ctx)
|
exit (1); \
|
||||||
{
|
} \
|
||||||
char *str = gpgme_get_op_info (ctx, 0);
|
} \
|
||||||
|
while (0)
|
||||||
if (!str)
|
|
||||||
puts ("<!-- no operation info available -->");
|
|
||||||
else
|
|
||||||
{
|
|
||||||
puts (str);
|
|
||||||
free (str);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
static void
|
static void
|
||||||
print_data (GpgmeData dh)
|
print_data (GpgmeData dh)
|
||||||
{
|
{
|
||||||
char buf[100];
|
#define BUF_SIZE 512
|
||||||
|
char buf[BUF_SIZE + 1];
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
ret = gpgme_data_seek (dh, 0, SEEK_SET);
|
ret = gpgme_data_seek (dh, 0, SEEK_SET);
|
||||||
if (ret)
|
if (ret)
|
||||||
fail_if_err (GPGME_File_Error);
|
fail_if_err (GPGME_File_Error);
|
||||||
while ((ret = gpgme_data_read (dh, buf, 100)) > 0)
|
while ((ret = gpgme_data_read (dh, buf, BUF_SIZE)) > 0)
|
||||||
fwrite (buf, ret, 1, stdout);
|
fwrite (buf, ret, 1, stdout);
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
fail_if_err (GPGME_File_Error);
|
fail_if_err (GPGME_File_Error);
|
||||||
@ -63,74 +55,120 @@ print_data (GpgmeData dh)
|
|||||||
|
|
||||||
|
|
||||||
static GpgmeError
|
static GpgmeError
|
||||||
passphrase_cb (void *opaque, const char *desc,
|
passphrase_cb (void *opaque, const char *desc, void **hd, const char **result)
|
||||||
void **r_hd, const char **result)
|
|
||||||
{
|
{
|
||||||
|
/* Cleanup by looking at *hd. */
|
||||||
if (!desc)
|
if (!desc)
|
||||||
/* Cleanup by looking at *r_hd. */
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
*result = "abc";
|
*result = "abc";
|
||||||
fprintf (stderr, "%% requesting passphrase for `%s': ", desc);
|
|
||||||
fprintf (stderr, "sending `%s'\n", *result);
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
int
|
static void
|
||||||
main (int argc, char **argv )
|
check_result (GpgmeSignResult result, GpgmeSigMode type)
|
||||||
{
|
{
|
||||||
GpgmeCtx ctx;
|
if (result->invalid_signers)
|
||||||
GpgmeError err;
|
{
|
||||||
GpgmeData in, out;
|
fprintf (stderr, "Invalid signer found: %s\n",
|
||||||
GpgmeRecipients rset;
|
result->invalid_signers->id);
|
||||||
char *p;
|
exit (1);
|
||||||
|
}
|
||||||
err = gpgme_engine_check_version (GPGME_PROTOCOL_OpenPGP);
|
if (!result->signatures || result->signatures->next)
|
||||||
fail_if_err (err);
|
{
|
||||||
|
fprintf (stderr, "Unexpected number of signatures created\n");
|
||||||
do {
|
exit (1);
|
||||||
err = gpgme_new (&ctx);
|
}
|
||||||
fail_if_err (err);
|
if (result->signatures->type != type)
|
||||||
gpgme_set_armor (ctx, 1);
|
{
|
||||||
|
fprintf (stderr, "Wrong type of signature created\n");
|
||||||
p = getenv("GPG_AGENT_INFO");
|
exit (1);
|
||||||
if (!(p && strchr (p, ':')))
|
}
|
||||||
gpgme_set_passphrase_cb (ctx, passphrase_cb, NULL);
|
if (result->signatures->pubkey_algo != GPGME_PK_DSA)
|
||||||
|
{
|
||||||
err = gpgme_data_new_from_mem ( &in, "Hallo Leute\n", 12, 0 );
|
fprintf (stderr, "Wrong pubkey algorithm reported: %i\n",
|
||||||
fail_if_err (err);
|
result->signatures->pubkey_algo);
|
||||||
|
exit (1);
|
||||||
err = gpgme_data_new ( &out );
|
}
|
||||||
fail_if_err (err);
|
if (result->signatures->hash_algo != GPGME_MD_SHA1)
|
||||||
|
{
|
||||||
err = gpgme_recipients_new (&rset);
|
fprintf (stderr, "Wrong hash algorithm reported: %i\n",
|
||||||
fail_if_err (err);
|
result->signatures->hash_algo);
|
||||||
err = gpgme_recipients_add_name_with_validity (rset, "Bob",
|
exit (1);
|
||||||
GPGME_VALIDITY_FULL);
|
}
|
||||||
fail_if_err (err);
|
if (result->signatures->class != 0)
|
||||||
err = gpgme_recipients_add_name_with_validity (rset, "Alpha",
|
{
|
||||||
GPGME_VALIDITY_FULL);
|
fprintf (stderr, "Wrong signature class reported: %lu\n",
|
||||||
fail_if_err (err);
|
result->signatures->class);
|
||||||
|
exit (1);
|
||||||
|
}
|
||||||
err = gpgme_op_encrypt_sign (ctx, rset, in, out);
|
if (strcmp ("A0FF4590BB6122EDEF6E3C542D727CC768697734",
|
||||||
print_op_info (ctx);
|
result->signatures->fpr))
|
||||||
fail_if_err (err);
|
{
|
||||||
|
fprintf (stderr, "Wrong fingerprint reported: %s\n",
|
||||||
fflush (NULL);
|
result->signatures->fpr);
|
||||||
fputs ("Begin Result:\n", stdout );
|
exit (1);
|
||||||
print_data (out);
|
}
|
||||||
fputs ("End Result.\n", stdout );
|
}
|
||||||
|
|
||||||
gpgme_recipients_release (rset);
|
|
||||||
gpgme_data_release (in);
|
int
|
||||||
gpgme_data_release (out);
|
main (int argc, char **argv)
|
||||||
gpgme_release (ctx);
|
{
|
||||||
} while ( argc > 1 && !strcmp( argv[1], "--loop" ) );
|
GpgmeCtx ctx;
|
||||||
|
GpgmeError err;
|
||||||
return 0;
|
GpgmeData in, out;
|
||||||
|
GpgmeRecipients rset;
|
||||||
|
GpgmeEncryptResult result;
|
||||||
|
GpgmeSignResult sign_result;
|
||||||
|
char *agent_info;
|
||||||
|
|
||||||
|
err = gpgme_engine_check_version (GPGME_PROTOCOL_OpenPGP);
|
||||||
|
fail_if_err (err);
|
||||||
|
|
||||||
|
err = gpgme_new (&ctx);
|
||||||
|
fail_if_err (err);
|
||||||
|
gpgme_set_textmode (ctx, 1);
|
||||||
|
gpgme_set_armor (ctx, 1);
|
||||||
|
|
||||||
|
agent_info = getenv("GPG_AGENT_INFO");
|
||||||
|
if (!(agent_info && strchr (agent_info, ':')))
|
||||||
|
gpgme_set_passphrase_cb (ctx, passphrase_cb, NULL);
|
||||||
|
|
||||||
|
err = gpgme_data_new_from_mem (&in, "Hallo Leute\n", 12, 0);
|
||||||
|
fail_if_err (err);
|
||||||
|
|
||||||
|
err = gpgme_data_new (&out);
|
||||||
|
fail_if_err (err);
|
||||||
|
|
||||||
|
err = gpgme_recipients_new (&rset);
|
||||||
|
fail_if_err (err);
|
||||||
|
err = gpgme_recipients_add_name_with_validity (rset, "Bob",
|
||||||
|
GPGME_VALIDITY_FULL);
|
||||||
|
fail_if_err (err);
|
||||||
|
err = gpgme_recipients_add_name_with_validity (rset, "Alpha",
|
||||||
|
GPGME_VALIDITY_FULL);
|
||||||
|
fail_if_err (err);
|
||||||
|
|
||||||
|
err = gpgme_op_encrypt_sign (ctx, rset, in, out);
|
||||||
|
fail_if_err (err);
|
||||||
|
result = gpgme_op_encrypt_result (ctx);
|
||||||
|
if (result->invalid_recipients)
|
||||||
|
{
|
||||||
|
fprintf (stderr, "Invalid recipient encountered: %s\n",
|
||||||
|
result->invalid_recipients->id);
|
||||||
|
exit (1);
|
||||||
|
}
|
||||||
|
sign_result = gpgme_op_sign_result (ctx);
|
||||||
|
check_result (sign_result, GPGME_SIG_MODE_NORMAL);
|
||||||
|
print_data (out);
|
||||||
|
|
||||||
|
gpgme_recipients_release (rset);
|
||||||
|
gpgme_data_release (in);
|
||||||
|
gpgme_data_release (out);
|
||||||
|
gpgme_release (ctx);
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user