30cdf13284
2003-04-28 Marcus Brinkmann <marcus@g10code.de> * gpgme.texi (Verify): Rewritten to take into account new and deprecated functions and data types. gpgme/ 2003-04-28 Marcus Brinkmann <marcus@g10code.de> * gpgme.h (struct _gpgme_sig_notation): New structure. (GpgmeSigNotation): New type. (struct _gpgme_signature): New structure. (GpgmeSignature): New type. (struct _gpgme_op_verify_result): New structure. (GpgmeVerifyResult): New type. (gpgme_op_verify_result): New prototype. (gpgme_get_notation): Remove prototype. * ops.h (_gpgme_op_verify_init_result): New prototype. (_gpgme_verify_status_handler): Change first argument to void *. * util.h (_gpgme_decode_percent_string, _gpgme_map_gnupg_error): New prototypes. * conversion.c (_gpgme_decode_percent_string): New function. (gnupg_errors): New static global. (_gpgme_map_gnupg_error): New function. * gpgme.c (gpgme_release): Don't release CTX->notation. (gpgme_get_notation): Remove function. * decrypt-verify.c (_gpgme_op_decrypt_verify_start): Call _gpgme_op_verify_init_result. * verify.c: Do not include <stdio.h>, <assert.h> and "key.h", but do include "gpgme.h". (struct verify_result): Replace with ... (op_data_t): ... this type. (release_verify_result): Remove function. (release_op_data): New function. (is_token): Remove function. (skip_token): Remove function. (copy_token): Remove function. (gpgme_op_verify_result): New function. (calc_sig_summary): Rewritten. (finish_sig): Remove function. (parse_new_sig): New function. (parse_valid_sig): New function. (parse_notation): New function. (parse_trust): New function. (parse_error): New function. (_gpgme_verify_status_handler): Rewritten. Change first argument to void *. (_gpgme_op_verify_start): Rework error handling. Call _gpgme_op_verify_init_result. (gpgme_op_verify): Do not release or clear CTX->notation. (gpgme_get_sig_status): Rewritten. (gpgme_get_sig_string_attr): Likewise. (gpgme_get_sig_ulong_attr): Likewise. (gpgme_get_sig_key): Likewise.
89 lines
3.0 KiB
C
89 lines
3.0 KiB
C
/* util.h
|
||
Copyright (C) 2000 Werner Koch (dd9jn)
|
||
Copyright (C) 2001, 2002, 2003 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 GPGME; if not, write to the Free Software Foundation,
|
||
Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
|
||
|
||
#ifndef UTIL_H
|
||
#define UTIL_H
|
||
|
||
#include "gpgme.h"
|
||
|
||
|
||
#define DIM(v) (sizeof(v)/sizeof((v)[0]))
|
||
|
||
|
||
/*-- {posix,w32}-util.c --*/
|
||
const char *_gpgme_get_gpg_path (void);
|
||
const char *_gpgme_get_gpgsm_path (void);
|
||
|
||
|
||
/*-- replacement functions in <funcname>.c --*/
|
||
#ifdef HAVE_CONFIG_H
|
||
#ifndef HAVE_STPCPY
|
||
char *stpcpy (char *a, const char *b);
|
||
#endif
|
||
|
||
#if !HAVE_VASPRINTF
|
||
#include <stdarg.h>
|
||
int vasprintf (char **result, const char *format, va_list args);
|
||
int asprintf (char **result, const char *format, ...);
|
||
#endif
|
||
|
||
#if !HAVE_FOPENCOOKIE
|
||
#include <fcntl.h> /* make sure that ssize_t and off_t are defined */
|
||
typedef struct
|
||
{
|
||
ssize_t (*read)(void*,char*,size_t);
|
||
ssize_t (*write)(void*,const char*,size_t);
|
||
int (*seek)(void*,off_t*,int);
|
||
int (*close)(void*);
|
||
} _IO_cookie_io_functions_t;
|
||
typedef _IO_cookie_io_functions_t cookie_io_functions_t;
|
||
FILE *fopencookie (void *cookie, const char *opentype,
|
||
cookie_io_functions_t funclist);
|
||
#endif /*!HAVE_FOPENCOOKIE*/
|
||
#endif /*HAVE_CONFIG_H*/
|
||
|
||
|
||
/*-- conversion.c --*/
|
||
/* Convert two hexadecimal digits from STR to the value they
|
||
represent. Returns -1 if one of the characters is not a
|
||
hexadecimal digit. */
|
||
int _gpgme_hextobyte (const unsigned char *str);
|
||
|
||
/* Decode the C formatted string SRC and store the result in the
|
||
buffer *DESTP which is LEN bytes long. If LEN is zero, then a
|
||
large enough buffer is allocated with malloc and *DESTP is set to
|
||
the result. Currently, LEN is only used to specify if allocation
|
||
is desired or not, the caller is expected to make sure that *DESTP
|
||
is large enough if LEN is not zero. */
|
||
GpgmeError _gpgme_decode_c_string (const char *src, char **destp, int len);
|
||
|
||
/* Decode the percent escaped string SRC and store the result in the
|
||
buffer *DESTP which is LEN bytes long. If LEN is zero, then a
|
||
large enough buffer is allocated with malloc and *DESTP is set to
|
||
the result. Currently, LEN is only used to specify if allocation
|
||
is desired or not, the caller is expected to make sure that *DESTP
|
||
is large enough if LEN is not zero. */
|
||
GpgmeError _gpgme_decode_percent_string (const char *src, char **destp,
|
||
int len);
|
||
|
||
GpgmeError _gpgme_map_gnupg_error (char *err);
|
||
|
||
#endif /* UTIL_H */
|