96cf17b159
* configure.ac: Activate UIServer if FD passing is enabled and Assuan is available. m4/ 2009-11-10 Marcus Brinkmann <marcus@g10code.de> * libassuan.m4: Fix LIBASSUAN_VERSION. src/ 2009-11-10 Marcus Brinkmann <marcus@g10code.de> * Makefile.am (uiserver_components): New variable. (main_sources): Add it. * ops.h, key.c (_gpgme_key_append_name): Take CONVERT argument, implement it. Adjust callers. (gpgme_key_from_uid): New function. * gpgme.h.in (gpgme_protocol_t): Add GPGME_PROTOCOL_DEFAULT. (gpgme_encrypt_flags_t): Add GPGME_ENCRYPT_PREPARE, GPGME_ENCRYPT_EXPECT_SIGN. (gpgme_set_sub_protocol, gpgme_key_from_uid): New functions. * libgpgme.vers, gpgme.def: Add new functions. * gpgme.c (gpgme_set_protocol): Add UIServer protocol. (gpgme_set_sub_protocol): New function. (gpgme_get_protocol_name): Add UIServer and default protocol. * assuan-support.c: Return correct error values, implement socketpair for POSIX. * priv-io.h, posix-io.c, w32-io.c, w32-glib-io.c, w32-qt-io.cpp (_gpgme_io_spawn): Add ATFORK and ATFORKVALUE arguments. Implement it for POSIX. Adjust all callers. * engine.h, engine-backend.h (_gpgme_engine_set_protocol) (_gpgme_engine_op_decrypt_verify): New prototypes. Adjust all users. * engine.c (engine_ops, gpgme_get_engine_info): Add UIServer engine. (_gpgme_engine_set_protocol, _gpgme_engine_op_decrypt_verify): New function. * decrypt-verify.c (decrypt_verify_start): Call _gpgme_engine_op_decrypt_verify. * util.h, posix-util.c, w32-util.c (_gpgme_get_uiserver_socket_path): New function. * engine-gpgsm.c (gpgsm_set_fd): Fix _gpgme_io_pipe invocation. * gpgme-tool.c: Some support for UIServer protocol. * engine-uiserver.c: New file.
144 lines
4.6 KiB
C
144 lines
4.6 KiB
C
/* util.h
|
||
Copyright (C) 2000 Werner Koch (dd9jn)
|
||
Copyright (C) 2001, 2002, 2003, 2004, 2005 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 Lesser General Public License as
|
||
published by the Free Software Foundation; either version 2.1 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
|
||
Lesser General Public License for more details.
|
||
|
||
You should have received a copy of the GNU Lesser 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. */
|
||
|
||
#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);
|
||
const char *_gpgme_get_gpgconf_path (void);
|
||
const char *_gpgme_get_g13_path (void);
|
||
const char *_gpgme_get_uiserver_socket_path (void);
|
||
|
||
int _gpgme_get_conf_int (const char *key, int *value);
|
||
void _gpgme_allow_set_foreground_window (pid_t pid);
|
||
|
||
/*-- dirinfo.c --*/
|
||
const char *_gpgme_get_default_homedir (void);
|
||
const char *_gpgme_get_default_agent_socket (void);
|
||
|
||
|
||
|
||
/*-- replacement functions in <funcname>.c --*/
|
||
#ifdef HAVE_CONFIG_H
|
||
|
||
#ifndef HAVE_STPCPY
|
||
static _GPGME_INLINE char *
|
||
_gpgme_stpcpy (char *a, const char *b)
|
||
{
|
||
while (*b)
|
||
*a++ = *b++;
|
||
*a = 0;
|
||
return a;
|
||
}
|
||
#define stpcpy(a,b) _gpgme_stpcpy ((a), (b))
|
||
#endif /*!HAVE_STPCPY*/
|
||
|
||
#if !HAVE_VASPRINTF
|
||
#include <stdarg.h>
|
||
int vasprintf (char **result, const char *format, va_list args);
|
||
int asprintf (char **result, const char *format, ...);
|
||
#endif
|
||
|
||
#ifndef HAVE_TTYNAME_R
|
||
int ttyname_r (int fd, char *buf, size_t buflen);
|
||
#endif
|
||
#endif
|
||
|
||
|
||
/*-- 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 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. */
|
||
gpgme_error_t _gpgme_decode_c_string (const char *src, char **destp,
|
||
size_t 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. If BINARY is 1, then '\0'
|
||
characters are allowed in the output. */
|
||
gpgme_error_t _gpgme_decode_percent_string (const char *src, char **destp,
|
||
size_t len, int binary);
|
||
|
||
gpgme_error_t _gpgme_encode_percent_string (const char *src, char **destp,
|
||
size_t len);
|
||
|
||
|
||
/* Parse the string TIMESTAMP into a time_t. The string may either be
|
||
seconds since Epoch or in the ISO 8601 format like
|
||
"20390815T143012". Returns 0 for an empty string or seconds since
|
||
Epoch. Leading spaces are skipped. If ENDP is not NULL, it will
|
||
point to the next non-parsed character in TIMESTRING. */
|
||
time_t _gpgme_parse_timestamp (const char *timestamp, char **endp);
|
||
|
||
|
||
gpgme_error_t _gpgme_map_gnupg_error (char *err);
|
||
|
||
|
||
/* Retrieve the environment variable NAME and return a copy of it in a
|
||
malloc()'ed buffer in *VALUE. If the environment variable is not
|
||
set, return NULL in *VALUE. */
|
||
gpgme_error_t _gpgme_getenv (const char *name, char **value);
|
||
|
||
|
||
#ifdef HAVE_W32_SYSTEM
|
||
int _gpgme_mkstemp (int *fd, char **name);
|
||
const char *_gpgme_get_w32spawn_path (void);
|
||
#endif
|
||
|
||
/*-- Error codes not yet available in current gpg-error.h. --*/
|
||
#ifndef GPG_ERR_UNFINISHED
|
||
#define GPG_ERR_UNFINISHED 199
|
||
#endif
|
||
#ifndef GPG_ERR_NOT_OPERATIONAL
|
||
#define GPG_ERR_NOT_OPERATIONAL 176
|
||
#endif
|
||
|
||
|
||
#ifdef ENABLE_ASSUAN
|
||
#include <assuan.h>
|
||
/* System hooks for assuan integration. */
|
||
extern struct assuan_system_hooks _gpgme_assuan_system_hooks;
|
||
extern struct assuan_malloc_hooks _gpgme_assuan_malloc_hooks;
|
||
int _gpgme_assuan_log_cb (assuan_context_t ctx, void *hook,
|
||
unsigned int cat, const char *msg);
|
||
#endif
|
||
|
||
#endif /* UTIL_H */
|