
* util.h (_gpgme_malloc, _gpgme_realloc, _gpgme_calloc, _gpgme_strdup, _gpgme_free): Remove prototypes. (xtrymalloc, xtrycalloc, xtryrealloc, xtrystrdup, xfree): Remove macros. * util.c: File removed. * Makefile.am (libgpgme_la_SOURCES): Remove util.h. * conversion.c (_gpgme_decode_c_string): Use malloc instead of xtrymalloc, realloc instead of xtryrealloc, calloc instead of xtrycalloc, free instead of xfree. (_gpgme_data_append_percentstring_for_xml): Likewise. * data.c (_gpgme_data_new, _gpgme_data_release): Likewise. * data-compat.c (gpgme_data_new_from_filepart): Likewise. * data-mem.c (mem_write, mem_release, gpgme_data_new_from_mem, _gpgme_data_get_as_string): Likewise. * debug.c (debug_init): Likewise. * decrypt.c (_gpgme_release_decrypt_result): Likewise. * delete.c (_gpgme_release_delete_result): Likewise. * edit.c (_gpgme_release_edit_result, _gpgme_op_edit_start): Likewise. * encrypt.c (_gpgme_release_encrypt_result): Likewise. * engine.c (_gpgme_engine_get_info, _gpgme_engine_new, _gpgme_engine_release): Likewise. * engine-gpgsm.c (_gpgme_gpgsm_new, _gpgme_gpgsm_release, _gpgme_gpgsm_op_decrypt, _gpgme_gpgsm_op_delete, gpgsm_set_recipients, _gpgme_gpgsm_op_encrypt, _gpgme_gpgsm_op_export, _gpgme_gpgsm_op_genkey, _gpgme_gpgsm_op_import, _gpgme_gpgsm_op_keylist, _gpgme_gpgsm_op_keylist_ext, _gpgme_gpgsm_op_sign, _gpgme_gpgsm_op_verify, gpgsm_status_handler): Likewise. * genkey.c (_gpgme_release_genkey_result): Likewise. * gpgme.c (gpgme_new, gpgme_release): Likewise. * import.c (_gpgme_release_import_result): Likewise. * key.c (_gpgme_key_cache_init, _gpgme_key_cache_add, key_new, add_subkey, gpgme_key_release, _gpgme_key_append_name): Likewise. * keylist.c (_gpgme_release_keylist_result, keylist_colon_handler, _gpgme_op_keylist_event_cb, gpgme_op_keylist_next): Likewise. * ops.h (test_and_allocate_result): Likewise. * passphrase.c (_gpgme_release_passphrase_result, _gpgme_passphrase_status_handler, _gpgme_passphrase_command_handler): Likewise. * progress.c (_gpgme_progress_status_handler): Likewise. * recipient.c (gpgme_recipients_new, gpgme_recipients_release, gpgme_recipients_add_name_with_validity): Likewise. * rungpg.c (_gpgme_gpg_new, _gpgme_gpg_release, _gpgme_gpg_add_arg, _gpgme_gpg_add_data, _gpgme_gpg_set_colon_line_handler, free_argv, free_fd_data_map, build_argv, _gpgme_gpg_spawn, read_status, read_colon_line): Likewise. * sign.c (_gpgme_release_sign_result): Likewise. * signers.c (_gpgme_signers_add): Likewise. * trustlist.c (trust_item_new, trustlist_colon_handler, _gpgme_op_trustlist_event_cb, gpgme_op_trustlist_next, gpgme_trustitem_release): Likewise. * verify.c (_gpgme_release_verify_result, finish_sig): Likewise. * version.c (gpgme_get_engine_info, _gpgme_get_program_version): Likewise. * w32-io.c (create_reader, create_writer, destroy_reader, destroy_writer, build_commandline, _gpgme_io_spawn): Likewise. * w32-sema.c (critsect_init, _gpgme_sema_cs_destroy): Likewise. * w32-util.c (read_w32_registry_string): Likewise. * wait.c (_gpgme_fd_table_deinit, _gpgme_fd_table_put, _gpgme_wait_event_cb, _gpgme_add_io_cb, _gpgme_remove_io_cb) * data-compat.c: Include <stdlib.h>.
260 lines
6.6 KiB
C
260 lines
6.6 KiB
C
/* sign.c - signing functions
|
|
* Copyright (C) 2000 Werner Koch (dd9jn)
|
|
* Copyright (C) 2001, 2002 g10 Code GmbH
|
|
*
|
|
* This file is part of GPGME.
|
|
*
|
|
* GPGME is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* GPGME is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
|
|
*/
|
|
|
|
#include <config.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <assert.h>
|
|
|
|
#include "util.h"
|
|
#include "context.h"
|
|
#include "ops.h"
|
|
|
|
#define SKIP_TOKEN_OR_RETURN(a) do { \
|
|
while (*(a) && *(a) != ' ') (a)++; \
|
|
while (*(a) == ' ') (a)++; \
|
|
if (!*(a)) \
|
|
return; /* oops */ \
|
|
} while (0)
|
|
|
|
struct sign_result_s
|
|
{
|
|
int okay;
|
|
GpgmeData xmlinfo;
|
|
};
|
|
|
|
void
|
|
_gpgme_release_sign_result (SignResult result)
|
|
{
|
|
if (!result)
|
|
return;
|
|
gpgme_data_release (result->xmlinfo);
|
|
free (result);
|
|
}
|
|
|
|
/* Parse the args and save the information
|
|
* <type> <pubkey algo> <hash algo> <class> <timestamp> <key fpr>
|
|
* in an XML structure. With args of NULL the xml structure is closed.
|
|
*/
|
|
static void
|
|
append_xml_siginfo (GpgmeData *rdh, char *args)
|
|
{
|
|
GpgmeData dh;
|
|
char helpbuf[100];
|
|
int i;
|
|
char *s;
|
|
unsigned long ul;
|
|
|
|
if (!*rdh)
|
|
{
|
|
if (gpgme_data_new (rdh))
|
|
{
|
|
return; /* fixme: We are ignoring out-of-core */
|
|
}
|
|
dh = *rdh;
|
|
_gpgme_data_append_string (dh, "<GnupgOperationInfo>\n");
|
|
}
|
|
else
|
|
{
|
|
dh = *rdh;
|
|
_gpgme_data_append_string (dh, " </signature>\n");
|
|
}
|
|
|
|
if (!args)
|
|
{
|
|
/* Just close the XML containter. */
|
|
_gpgme_data_append_string (dh, "</GnupgOperationInfo>\n");
|
|
return;
|
|
}
|
|
|
|
_gpgme_data_append_string (dh, " <signature>\n");
|
|
|
|
_gpgme_data_append_string (dh,
|
|
*args == 'D' ? " <detached/>\n" :
|
|
*args == 'C' ? " <cleartext/>\n" :
|
|
*args == 'S' ? " <standard/>\n" : "");
|
|
SKIP_TOKEN_OR_RETURN (args);
|
|
|
|
sprintf (helpbuf, " <algo>%d</algo>\n", atoi (args));
|
|
_gpgme_data_append_string (dh, helpbuf);
|
|
SKIP_TOKEN_OR_RETURN (args);
|
|
|
|
i = atoi (args);
|
|
sprintf (helpbuf, " <hashalgo>%d</hashalgo>\n", atoi (args));
|
|
_gpgme_data_append_string (dh, helpbuf);
|
|
switch (i)
|
|
{
|
|
case 1: s = "pgp-md5"; break;
|
|
case 2: s = "pgp-sha1"; break;
|
|
case 3: s = "pgp-ripemd160"; break;
|
|
case 5: s = "pgp-md2"; break;
|
|
case 6: s = "pgp-tiger192"; break;
|
|
case 7: s = "pgp-haval-5-160"; break;
|
|
case 8: s = "pgp-sha256"; break;
|
|
case 9: s = "pgp-sha384"; break;
|
|
case 10: s = "pgp-sha512"; break;
|
|
default: s = "pgp-unknown"; break;
|
|
}
|
|
sprintf (helpbuf, " <micalg>%s</micalg>\n", s);
|
|
_gpgme_data_append_string (dh,helpbuf);
|
|
SKIP_TOKEN_OR_RETURN (args);
|
|
|
|
sprintf (helpbuf, " <sigclass>%.2s</sigclass>\n", args);
|
|
_gpgme_data_append_string (dh, helpbuf);
|
|
SKIP_TOKEN_OR_RETURN (args);
|
|
|
|
ul = strtoul (args, NULL, 10);
|
|
sprintf (helpbuf, " <created>%lu</created>\n", ul);
|
|
_gpgme_data_append_string (dh, helpbuf);
|
|
SKIP_TOKEN_OR_RETURN (args);
|
|
|
|
/* Count the length of the finperprint. */
|
|
for (i = 0; args[i] && args[i] != ' '; i++)
|
|
;
|
|
_gpgme_data_append_string (dh, " <fpr>");
|
|
_gpgme_data_append (dh, args, i);
|
|
_gpgme_data_append_string (dh, "</fpr>\n");
|
|
}
|
|
|
|
void
|
|
_gpgme_sign_status_handler (GpgmeCtx ctx, GpgmeStatusCode code, char *args)
|
|
{
|
|
_gpgme_passphrase_status_handler (ctx, code, args);
|
|
|
|
if (ctx->error)
|
|
return;
|
|
test_and_allocate_result (ctx, sign);
|
|
|
|
switch (code)
|
|
{
|
|
case GPGME_STATUS_EOF:
|
|
if (ctx->result.sign->okay)
|
|
{
|
|
append_xml_siginfo (&ctx->result.sign->xmlinfo, NULL);
|
|
_gpgme_set_op_info (ctx, ctx->result.sign->xmlinfo);
|
|
ctx->result.sign->xmlinfo = NULL;
|
|
}
|
|
if (!ctx->error && !ctx->result.sign->okay)
|
|
ctx->error = mk_error (No_Data); /* Hmmm: choose a better error? */
|
|
break;
|
|
|
|
case GPGME_STATUS_SIG_CREATED:
|
|
/* FIXME: We have no error return for multiple signatures. */
|
|
append_xml_siginfo (&ctx->result.sign->xmlinfo, args);
|
|
ctx->result.sign->okay = 1;
|
|
break;
|
|
|
|
default:
|
|
break;
|
|
}
|
|
}
|
|
|
|
static GpgmeError
|
|
_gpgme_op_sign_start (GpgmeCtx ctx, int synchronous,
|
|
GpgmeData in, GpgmeData out,
|
|
GpgmeSigMode mode)
|
|
{
|
|
GpgmeError err = 0;
|
|
|
|
if (mode != GPGME_SIG_MODE_NORMAL
|
|
&& mode != GPGME_SIG_MODE_DETACH
|
|
&& mode != GPGME_SIG_MODE_CLEAR)
|
|
return mk_error (Invalid_Value);
|
|
|
|
err = _gpgme_op_reset (ctx, synchronous);
|
|
if (err)
|
|
goto leave;
|
|
|
|
/* Check the supplied data. */
|
|
if (!in)
|
|
{
|
|
err = mk_error (No_Data);
|
|
goto leave;
|
|
}
|
|
if (!out)
|
|
{
|
|
err = mk_error (Invalid_Value);
|
|
goto leave;
|
|
}
|
|
|
|
err = _gpgme_passphrase_start (ctx);
|
|
if (err)
|
|
goto leave;
|
|
|
|
_gpgme_engine_set_status_handler (ctx->engine, _gpgme_sign_status_handler,
|
|
ctx);
|
|
_gpgme_engine_set_verbosity (ctx->engine, ctx->verbosity);
|
|
|
|
_gpgme_engine_op_sign (ctx->engine, in, out, mode, ctx->use_armor,
|
|
ctx->use_textmode, ctx->include_certs,
|
|
ctx /* FIXME */);
|
|
|
|
/* And kick off the process. */
|
|
err = _gpgme_engine_start (ctx->engine, ctx);
|
|
|
|
leave:
|
|
if (err)
|
|
{
|
|
ctx->pending = 0;
|
|
_gpgme_engine_release (ctx->engine);
|
|
ctx->engine = NULL;
|
|
}
|
|
return err;
|
|
}
|
|
|
|
GpgmeError
|
|
gpgme_op_sign_start (GpgmeCtx ctx, GpgmeData in, GpgmeData out,
|
|
GpgmeSigMode mode)
|
|
{
|
|
return _gpgme_op_sign_start (ctx, 0, in, out, mode);
|
|
}
|
|
|
|
/**
|
|
* gpgme_op_sign:
|
|
* @ctx: The context
|
|
* @in: Data to be signed
|
|
* @out: Detached signature
|
|
* @mode: Signature creation mode
|
|
*
|
|
* Create a detached signature for @in and write it to @out.
|
|
* The data will be signed using either the default key or the ones
|
|
* defined through @ctx.
|
|
* The defined modes for signature create are:
|
|
* <literal>
|
|
* GPGME_SIG_MODE_NORMAL (or 0)
|
|
* GPGME_SIG_MODE_DETACH
|
|
* GPGME_SIG_MODE_CLEAR
|
|
* </literal>
|
|
* Note that the settings done by gpgme_set_armor() and gpgme_set_textmode()
|
|
* are ignore for @mode GPGME_SIG_MODE_CLEAR.
|
|
*
|
|
* Return value: 0 on success or an error code.
|
|
**/
|
|
GpgmeError
|
|
gpgme_op_sign (GpgmeCtx ctx, GpgmeData in, GpgmeData out, GpgmeSigMode mode)
|
|
{
|
|
GpgmeError err = _gpgme_op_sign_start (ctx, 1, in, out, mode);
|
|
if (!err)
|
|
err = _gpgme_wait_one (ctx);
|
|
return err;
|
|
}
|