2004-02-10 19:27:54 +00:00
|
|
|
/* util.h - Utility functions for GnuPG
|
2009-03-06 17:31:27 +00:00
|
|
|
* Copyright (C) 2001, 2002, 2003, 2004, 2009 Free Software Foundation, Inc.
|
2003-08-05 17:11:04 +00:00
|
|
|
*
|
2011-09-30 12:52:11 +02:00
|
|
|
* This file is part of JNLIB, which is a subsystem of GnuPG.
|
2003-08-05 17:11:04 +00:00
|
|
|
*
|
2011-09-30 12:52:11 +02:00
|
|
|
* JNLIB is free software; you can redistribute it and/or modify it
|
|
|
|
* under the terms of either
|
2003-08-05 17:11:04 +00:00
|
|
|
*
|
2011-09-30 12:52:11 +02:00
|
|
|
* - the GNU Lesser General Public License as published by the Free
|
|
|
|
* Software Foundation; either version 3 of the License, or (at
|
|
|
|
* your option) any later version.
|
2003-08-05 17:11:04 +00:00
|
|
|
*
|
2011-09-30 12:52:11 +02:00
|
|
|
* or
|
|
|
|
*
|
|
|
|
* - 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.
|
|
|
|
*
|
|
|
|
* or both in parallel, as here.
|
|
|
|
*
|
|
|
|
* JNLIB 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 copies of the GNU General Public License
|
|
|
|
* and the GNU Lesser General Public License along with this program;
|
|
|
|
* if not, see <http://www.gnu.org/licenses/>.
|
2003-08-05 17:11:04 +00:00
|
|
|
*/
|
|
|
|
|
|
|
|
#ifndef GNUPG_COMMON_UTIL_H
|
|
|
|
#define GNUPG_COMMON_UTIL_H
|
|
|
|
|
|
|
|
#include <gcrypt.h> /* We need this for the memory function protos. */
|
2006-09-06 16:35:52 +00:00
|
|
|
#include <errno.h> /* We need errno. */
|
|
|
|
#include <gpg-error.h> /* We need gpg_error_t. */
|
2010-09-02 10:46:23 +00:00
|
|
|
|
2003-08-05 17:11:04 +00:00
|
|
|
|
* configure.ac (gl_INIT): Add gnulib stuff.
(fseeko, ftello, ttyname, isascii): Replaced the AC_REPLACE_FUNCS
by a simple check.
(putc_unlocked): Removed check. Not used.
(strsep, mkdtemp, asprintf): Replaced checks by gnulib checks.
(xsize): Added will probably come handy soon.
(CFLAGS): Use -Wformat-security instead of
-Wformat-nonliteral. Add --Wno-format-y2k.
* gl/, gl/m4/: New.
* gpg-agent.c: Include setenv.h.
* Makefile.am (AM_CPPFLAGS): Added.
* util.h: Add some includes for gnulib.
(ttyname, isascii): Define them inline.
* fseeko.c, ftello.c: Removed.
* strsep.c, mkdtemp.c: Removed.
* ttyname.c, isascii.c: Removed.
* mkdtemp.c: Removed.
* exec.c: Include mkdtemp.h
* keybox-file.c (ftello) [!HAVE_FSEEKO]: New replacement
function. Copied from ../common/ftello.c.
* keybox-update.c (fseeko) [!HAVE_FSEEKO]: New replacement
function. Copied from ../common/iobuf.c.
* scdaemon.c: Include mkdtemp.h.
* misc.c: Include setenv.h.
* symcryptrun.c: Include mkdtemp.h.
2005-06-01 15:46:01 +00:00
|
|
|
/* Hash function used with libksba. */
|
2003-08-05 17:11:04 +00:00
|
|
|
#define HASH_FNC ((void (*)(void *, const void*,size_t))gcry_md_write)
|
|
|
|
|
2010-03-10 12:24:58 +00:00
|
|
|
/* Estream replaces most uses of stdio. */
|
|
|
|
#include "../common/estream.h"
|
|
|
|
#include "../common/estream-printf.h"
|
|
|
|
|
2006-11-28 16:36:02 +00:00
|
|
|
/* Get all the stuff from jnlib. */
|
2010-03-10 12:24:58 +00:00
|
|
|
#include "../common/logging.h"
|
|
|
|
#include "../common/argparse.h"
|
|
|
|
#include "../common/stringhelp.h"
|
|
|
|
#include "../common/mischelp.h"
|
|
|
|
#include "../common/strlist.h"
|
|
|
|
#include "../common/dotlock.h"
|
|
|
|
#include "../common/utf8conv.h"
|
|
|
|
#include "../common/dynload.h"
|
2003-08-05 17:11:04 +00:00
|
|
|
|
2010-04-20 11:52:33 +00:00
|
|
|
#include "gettime.h"
|
2007-06-26 13:48:44 +00:00
|
|
|
|
2007-05-15 16:10:48 +00:00
|
|
|
/* Redefine asprintf by our estream version which uses our own memory
|
|
|
|
allocator.. */
|
|
|
|
#define asprintf estream_asprintf
|
|
|
|
#define vasprintf estream_vasprintf
|
|
|
|
|
2010-03-10 12:24:58 +00:00
|
|
|
/* Due to a bug in mingw32's snprintf related to the 'l' modifier and
|
|
|
|
for increased portability we use our snprintf on all systems. */
|
2011-06-01 21:43:30 +02:00
|
|
|
#undef snprintf
|
2008-10-17 19:18:46 +00:00
|
|
|
#define snprintf estream_snprintf
|
|
|
|
|
2007-06-26 13:48:44 +00:00
|
|
|
|
2007-05-15 16:10:48 +00:00
|
|
|
/* GCC attributes. */
|
2011-02-02 15:48:54 +01:00
|
|
|
#if __GNUC__ >= 4
|
2006-10-10 11:11:04 +00:00
|
|
|
# define GNUPG_GCC_A_SENTINEL(a) __attribute__ ((sentinel(a)))
|
|
|
|
#else
|
2011-02-02 15:48:54 +01:00
|
|
|
# define GNUPG_GCC_A_SENTINEL(a)
|
2006-10-10 11:11:04 +00:00
|
|
|
#endif
|
|
|
|
|
|
|
|
|
2006-09-21 13:30:45 +00:00
|
|
|
/* We need this type even if we are not using libreadline and or we
|
|
|
|
did not include libreadline in the current file. */
|
|
|
|
#ifndef GNUPG_LIBREADLINE_H_INCLUDED
|
|
|
|
typedef char **rl_completion_func_t (const char *, int, int);
|
|
|
|
#endif /*!GNUPG_LIBREADLINE_H_INCLUDED*/
|
|
|
|
|
|
|
|
|
2004-06-06 12:59:02 +00:00
|
|
|
/* Handy malloc macros - please use only them. */
|
2003-08-05 17:11:04 +00:00
|
|
|
#define xtrymalloc(a) gcry_malloc ((a))
|
2004-06-06 12:59:02 +00:00
|
|
|
#define xtrymalloc_secure(a) gcry_malloc_secure ((a))
|
2003-08-05 17:11:04 +00:00
|
|
|
#define xtrycalloc(a,b) gcry_calloc ((a),(b))
|
2004-06-06 12:59:02 +00:00
|
|
|
#define xtrycalloc_secure(a,b) gcry_calloc_secure ((a),(b))
|
2003-08-05 17:11:04 +00:00
|
|
|
#define xtryrealloc(a,b) gcry_realloc ((a),(b))
|
|
|
|
#define xtrystrdup(a) gcry_strdup ((a))
|
|
|
|
#define xfree(a) gcry_free ((a))
|
2010-06-21 10:01:24 +00:00
|
|
|
#define xfree_fnc gcry_free
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
|
|
#define xmalloc(a) gcry_xmalloc ((a))
|
|
|
|
#define xmalloc_secure(a) gcry_xmalloc_secure ((a))
|
|
|
|
#define xcalloc(a,b) gcry_xcalloc ((a),(b))
|
|
|
|
#define xcalloc_secure(a,b) gcry_xcalloc_secure ((a),(b))
|
|
|
|
#define xrealloc(a,b) gcry_xrealloc ((a),(b))
|
|
|
|
#define xstrdup(a) gcry_xstrdup ((a))
|
|
|
|
|
2006-04-19 11:26:11 +00:00
|
|
|
/* For compatibility with gpg 1.4 we also define these: */
|
|
|
|
#define xmalloc_clear(a) gcry_xcalloc (1, (a))
|
|
|
|
#define xmalloc_secure_clear(a) gcry_xcalloc_secure (1, (a))
|
|
|
|
|
2012-02-06 20:50:47 +01:00
|
|
|
/* The default error source of the application. This is different
|
|
|
|
from GPG_ERR_SOURCE_DEFAULT in that it does not depend on the
|
|
|
|
source file and thus is usable in code shared by applications.
|
|
|
|
Defined by init.c. */
|
|
|
|
extern gpg_err_source_t default_errsource;
|
|
|
|
|
2006-09-06 16:35:52 +00:00
|
|
|
/* Convenience function to return a gpg-error code for memory
|
|
|
|
allocation failures. This function makes sure that an error will
|
|
|
|
be returned even if accidently ERRNO is not set. */
|
|
|
|
static inline gpg_error_t
|
|
|
|
out_of_core (void)
|
|
|
|
{
|
2006-09-14 16:50:33 +00:00
|
|
|
return gpg_error_from_syserror ();
|
2006-09-06 16:35:52 +00:00
|
|
|
}
|
2003-10-31 12:11:57 +00:00
|
|
|
|
|
|
|
|
2003-08-05 17:11:04 +00:00
|
|
|
/*-- signal.c --*/
|
|
|
|
void gnupg_init_signals (int mode, void (*fast_cleanup)(void));
|
|
|
|
void gnupg_block_all_signals (void);
|
|
|
|
void gnupg_unblock_all_signals (void);
|
|
|
|
|
|
|
|
/*-- yesno.c --*/
|
|
|
|
int answer_is_yes (const char *s);
|
|
|
|
int answer_is_yes_no_default (const char *s, int def_answer);
|
|
|
|
int answer_is_yes_no_quit (const char *s);
|
2006-05-23 16:19:43 +00:00
|
|
|
int answer_is_okay_cancel (const char *s, int def_answer);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
2004-06-14 08:32:07 +00:00
|
|
|
/*-- xreadline.c --*/
|
2011-02-02 15:48:54 +01:00
|
|
|
ssize_t read_line (FILE *fp,
|
2004-06-14 08:32:07 +00:00
|
|
|
char **addr_of_buffer, size_t *length_of_buffer,
|
|
|
|
size_t *max_length);
|
|
|
|
|
2003-08-05 17:11:04 +00:00
|
|
|
|
2008-06-09 14:49:28 +00:00
|
|
|
/*-- b64enc.c and b64dec.c --*/
|
2011-02-02 15:48:54 +01:00
|
|
|
struct b64state
|
|
|
|
{
|
2004-02-10 19:27:54 +00:00
|
|
|
unsigned int flags;
|
|
|
|
int idx;
|
|
|
|
int quad_count;
|
|
|
|
FILE *fp;
|
2010-07-16 13:19:45 +00:00
|
|
|
estream_t stream;
|
2004-02-10 19:27:54 +00:00
|
|
|
char *title;
|
|
|
|
unsigned char radbuf[4];
|
2008-04-07 19:31:12 +00:00
|
|
|
u32 crc;
|
2008-06-09 14:49:28 +00:00
|
|
|
int stop_seen:1;
|
|
|
|
int invalid_encoding:1;
|
2011-01-20 14:12:53 +01:00
|
|
|
gpg_error_t lasterr;
|
2004-02-10 19:27:54 +00:00
|
|
|
};
|
2008-06-09 14:49:28 +00:00
|
|
|
|
2004-02-10 19:27:54 +00:00
|
|
|
gpg_error_t b64enc_start (struct b64state *state, FILE *fp, const char *title);
|
2010-07-16 13:19:45 +00:00
|
|
|
gpg_error_t b64enc_start_es (struct b64state *state, estream_t fp,
|
|
|
|
const char *title);
|
2004-02-10 19:27:54 +00:00
|
|
|
gpg_error_t b64enc_write (struct b64state *state,
|
|
|
|
const void *buffer, size_t nbytes);
|
|
|
|
gpg_error_t b64enc_finish (struct b64state *state);
|
|
|
|
|
2008-06-09 14:49:28 +00:00
|
|
|
gpg_error_t b64dec_start (struct b64state *state, const char *title);
|
|
|
|
gpg_error_t b64dec_proc (struct b64state *state, void *buffer, size_t length,
|
|
|
|
size_t *r_nbytes);
|
|
|
|
gpg_error_t b64dec_finish (struct b64state *state);
|
|
|
|
|
|
|
|
|
2014-04-15 16:40:48 +02:00
|
|
|
/*-- zb32.c --*/
|
|
|
|
char *zb32_encode (const void *data, unsigned int databits);
|
2008-06-09 14:49:28 +00:00
|
|
|
|
|
|
|
|
2005-04-11 16:10:03 +00:00
|
|
|
/*-- sexputil.c */
|
2013-05-21 14:00:00 +01:00
|
|
|
char *canon_sexp_to_string (const unsigned char *canon, size_t canonlen);
|
|
|
|
void log_printcanon (const char *text,
|
|
|
|
const unsigned char *sexp, size_t sexplen);
|
|
|
|
void log_printsexp (const char *text, gcry_sexp_t sexp);
|
|
|
|
|
2009-03-06 17:31:27 +00:00
|
|
|
gpg_error_t make_canon_sexp (gcry_sexp_t sexp,
|
|
|
|
unsigned char **r_buffer, size_t *r_buflen);
|
2010-06-21 10:01:24 +00:00
|
|
|
gpg_error_t make_canon_sexp_pad (gcry_sexp_t sexp, int secure,
|
2010-06-17 15:44:44 +00:00
|
|
|
unsigned char **r_buffer, size_t *r_buflen);
|
2005-04-11 16:10:03 +00:00
|
|
|
gpg_error_t keygrip_from_canon_sexp (const unsigned char *key, size_t keylen,
|
|
|
|
unsigned char *grip);
|
2005-04-18 10:44:46 +00:00
|
|
|
int cmp_simple_canon_sexp (const unsigned char *a, const unsigned char *b);
|
|
|
|
unsigned char *make_simple_sexp_from_hexstr (const char *line,
|
|
|
|
size_t *nscanned);
|
2007-12-13 15:45:40 +00:00
|
|
|
int hash_algo_from_sigval (const unsigned char *sigval);
|
2009-05-07 15:01:47 +00:00
|
|
|
unsigned char *make_canon_sexp_from_rsa_pk (const void *m, size_t mlen,
|
|
|
|
const void *e, size_t elen,
|
|
|
|
size_t *r_len);
|
|
|
|
gpg_error_t get_rsa_pk_from_canon_sexp (const unsigned char *keydata,
|
|
|
|
size_t keydatalen,
|
2011-02-02 15:48:54 +01:00
|
|
|
unsigned char const **r_n,
|
2009-05-07 15:01:47 +00:00
|
|
|
size_t *r_nlen,
|
2011-02-02 15:48:54 +01:00
|
|
|
unsigned char const **r_e,
|
2009-05-07 15:01:47 +00:00
|
|
|
size_t *r_elen);
|
2009-07-01 18:30:33 +00:00
|
|
|
gpg_error_t get_pk_algo_from_canon_sexp (const unsigned char *keydata,
|
|
|
|
size_t keydatalen,
|
gpg: Use only OpenPGP public key algo ids and add the EdDSA algo id.
* common/sexputil.c (get_pk_algo_from_canon_sexp): Change to return a
string.
* g10/keygen.c (check_keygrip): Adjust for change.
* sm/certreqgen-ui.c (check_keygrip): Likewise.
* agent/pksign.c (do_encode_dsa): Remove bogus map_pk_openpgp_to_gcry.
* g10/misc.c (map_pk_openpgp_to_gcry): Remove.
(openpgp_pk_test_algo): Change to a wrapper for openpgp_pk_test_algo2.
(openpgp_pk_test_algo2): Rewrite.
(openpgp_pk_algo_usage, pubkey_nbits): Add support for EdDSA.
(openpgp_pk_algo_name): Rewrite to remove need for gcry calls.
(pubkey_get_npkey, pubkey_get_nskey): Ditto.
(pubkey_get_nsig, pubkey_get_nenc): Ditto.
* g10/keygen.c(do_create_from_keygrip): Support EdDSA.
(common_gen, gen_ecc, ask_keysize, generate_keypair): Ditto.
* g10/build-packet.c (do_key): Ditto.
* g10/export.c (transfer_format_to_openpgp): Ditto.
* g10/getkey.c (cache_public_key): Ditto.
* g10/import.c (transfer_secret_keys): Ditto.
* g10/keylist.c (list_keyblock_print, list_keyblock_colon): Ditto.
* g10/mainproc.c (proc_pubkey_enc): Ditto.
* g10/parse-packet.c (parse_key): Ditto,
* g10/sign.c (hash_for, sign_file, make_keysig_packet): Ditto.
* g10/keyserver.c (print_keyrec): Use openpgp_pk_algo_name.
* g10/pkglue.c (pk_verify, pk_encrypt, pk_check_secret_key): Use only
OpenPGP algo ids and support EdDSA.
* g10/pubkey-enc.c (get_it): Use only OpenPGP algo ids.
* g10/seskey.c (encode_md_value): Ditto.
--
This patch separates Libgcrypt and OpenPGP public key algorithms ids
and in most cases completely removes the Libgcrypt ones. This is
useful because for Libgcrypt we specify the algorithm in the
S-expressions and the public key ids are not anymore needed.
This patch also adds some support for PUBKEY_ALGO_EDDSA which will
eventually be used instead of merging EdDSA with ECDSA. As of now an
experimental algorithm id is used but the plan is to write an I-D so
that we can get a new id from the IETF. Note that EdDSA (Ed25519)
does not yet work and that more changes are required.
The ECC support is still broken right now. Needs to be fixed.
Signed-off-by: Werner Koch <wk@gnupg.org>
2014-01-30 18:48:37 +01:00
|
|
|
const char **r_algo);
|
2004-02-10 19:27:54 +00:00
|
|
|
|
2006-09-15 18:53:37 +00:00
|
|
|
/*-- convert.c --*/
|
2006-10-20 11:38:48 +00:00
|
|
|
int hex2bin (const char *string, void *buffer, size_t length);
|
2006-09-15 18:53:37 +00:00
|
|
|
int hexcolon2bin (const char *string, void *buffer, size_t length);
|
|
|
|
char *bin2hex (const void *buffer, size_t length, char *stringbuf);
|
|
|
|
char *bin2hexcolon (const void *buffer, size_t length, char *stringbuf);
|
2008-09-03 09:37:32 +00:00
|
|
|
const char *hex2str (const char *hexstring,
|
|
|
|
char *buffer, size_t bufsize, size_t *buflen);
|
|
|
|
char *hex2str_alloc (const char *hexstring, size_t *r_count);
|
2006-09-15 18:53:37 +00:00
|
|
|
|
2008-12-05 16:31:39 +00:00
|
|
|
/*-- percent.c --*/
|
|
|
|
char *percent_plus_escape (const char *string);
|
2009-04-01 10:51:53 +00:00
|
|
|
char *percent_plus_unescape (const char *string, int nulrepl);
|
|
|
|
char *percent_unescape (const char *string, int nulrepl);
|
|
|
|
|
|
|
|
size_t percent_plus_unescape_inplace (char *string, int nulrepl);
|
|
|
|
size_t percent_unescape_inplace (char *string, int nulrepl);
|
2008-12-05 16:31:39 +00:00
|
|
|
|
2011-01-31 18:19:14 +01:00
|
|
|
/*-- openpgp-oid.c --*/
|
|
|
|
gpg_error_t openpgp_oid_from_str (const char *string, gcry_mpi_t *r_mpi);
|
|
|
|
char *openpgp_oid_to_str (gcry_mpi_t a);
|
2013-11-15 08:59:45 +01:00
|
|
|
int openpgp_oid_is_ed25519 (gcry_mpi_t a);
|
|
|
|
const char *openpgp_curve_to_oid (const char *name, unsigned int *r_nbits);
|
|
|
|
const char *openpgp_oid_to_curve (const char *oid);
|
2011-01-31 18:19:14 +01:00
|
|
|
|
|
|
|
|
2006-09-15 18:53:37 +00:00
|
|
|
|
2006-04-19 11:26:11 +00:00
|
|
|
/*-- homedir.c --*/
|
2007-06-26 13:48:44 +00:00
|
|
|
const char *standard_homedir (void);
|
2004-12-21 10:03:00 +00:00
|
|
|
const char *default_homedir (void);
|
2007-06-14 17:05:07 +00:00
|
|
|
const char *gnupg_sysconfdir (void);
|
|
|
|
const char *gnupg_bindir (void);
|
|
|
|
const char *gnupg_libexecdir (void);
|
|
|
|
const char *gnupg_libdir (void);
|
|
|
|
const char *gnupg_datadir (void);
|
2008-11-04 19:54:02 +00:00
|
|
|
const char *gnupg_localedir (void);
|
2010-06-09 16:53:51 +00:00
|
|
|
const char *gnupg_cachedir (void);
|
2014-03-12 19:33:30 +01:00
|
|
|
const char *dirmngr_sys_socket_name (void);
|
|
|
|
const char *dirmngr_user_socket_name (void);
|
2007-06-14 17:05:07 +00:00
|
|
|
|
2007-08-29 09:51:37 +00:00
|
|
|
/* All module names. We also include gpg and gpgsm for the sake for
|
|
|
|
gpgconf. */
|
2007-06-14 17:05:07 +00:00
|
|
|
#define GNUPG_MODULE_NAME_AGENT 1
|
|
|
|
#define GNUPG_MODULE_NAME_PINENTRY 2
|
2011-02-02 15:48:54 +01:00
|
|
|
#define GNUPG_MODULE_NAME_SCDAEMON 3
|
2007-06-14 17:05:07 +00:00
|
|
|
#define GNUPG_MODULE_NAME_DIRMNGR 4
|
|
|
|
#define GNUPG_MODULE_NAME_PROTECT_TOOL 5
|
2007-08-27 18:10:27 +00:00
|
|
|
#define GNUPG_MODULE_NAME_CHECK_PATTERN 6
|
2007-08-29 09:51:37 +00:00
|
|
|
#define GNUPG_MODULE_NAME_GPGSM 7
|
|
|
|
#define GNUPG_MODULE_NAME_GPG 8
|
2008-05-27 12:03:50 +00:00
|
|
|
#define GNUPG_MODULE_NAME_CONNECT_AGENT 9
|
|
|
|
#define GNUPG_MODULE_NAME_GPGCONF 10
|
2010-06-09 16:53:51 +00:00
|
|
|
#define GNUPG_MODULE_NAME_DIRMNGR_LDAP 11
|
2007-06-14 17:05:07 +00:00
|
|
|
const char *gnupg_module_name (int which);
|
|
|
|
|
|
|
|
|
2004-12-21 10:03:00 +00:00
|
|
|
|
2006-09-21 13:30:45 +00:00
|
|
|
/*-- gpgrlhelp.c --*/
|
|
|
|
void gnupg_rl_initialize (void);
|
2004-12-21 10:03:00 +00:00
|
|
|
|
2007-12-04 11:23:31 +00:00
|
|
|
/*-- helpfile.c --*/
|
2007-12-04 15:00:14 +00:00
|
|
|
char *gnupg_get_help_string (const char *key, int only_current_locale);
|
2007-12-04 11:23:31 +00:00
|
|
|
|
|
|
|
/*-- localename.c --*/
|
|
|
|
const char *gnupg_messages_locale_name (void);
|
|
|
|
|
2003-08-05 17:11:04 +00:00
|
|
|
/*-- miscellaneous.c --*/
|
2003-12-17 12:26:38 +00:00
|
|
|
|
2007-04-20 16:59:37 +00:00
|
|
|
/* This function is called at startup to tell libgcrypt to use our own
|
|
|
|
logging subsystem. */
|
|
|
|
void setup_libgcrypt_logging (void);
|
|
|
|
|
2007-05-15 16:10:48 +00:00
|
|
|
/* Same as estream_asprintf but die on memory failure. */
|
2003-12-17 12:26:38 +00:00
|
|
|
char *xasprintf (const char *fmt, ...) JNLIB_GCC_A_PRINTF(1,2);
|
2007-05-15 16:10:48 +00:00
|
|
|
/* This is now an alias to estream_asprintf. */
|
2005-02-25 16:14:55 +00:00
|
|
|
char *xtryasprintf (const char *fmt, ...) JNLIB_GCC_A_PRINTF(1,2);
|
2003-12-17 12:26:38 +00:00
|
|
|
|
2010-12-02 15:49:02 +00:00
|
|
|
/* Replacement for gcry_cipher_algo_name. */
|
|
|
|
const char *gnupg_cipher_algo_name (int algo);
|
|
|
|
|
2003-08-05 17:11:04 +00:00
|
|
|
const char *print_fname_stdout (const char *s);
|
|
|
|
const char *print_fname_stdin (const char *s);
|
2010-03-15 11:15:45 +00:00
|
|
|
void print_utf8_buffer2 (estream_t fp, const void *p, size_t n, int delim);
|
|
|
|
void print_utf8_buffer (estream_t fp, const void *p, size_t n);
|
2007-03-19 15:44:59 +00:00
|
|
|
void print_hexstring (FILE *fp, const void *buffer, size_t length,
|
|
|
|
int reserved);
|
2005-06-16 08:12:03 +00:00
|
|
|
char *make_printable_string (const void *p, size_t n, int delim);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
|
|
int is_file_compressed (const char *s, int *ret_rc);
|
|
|
|
|
2006-05-23 16:19:43 +00:00
|
|
|
int match_multistr (const char *multistr,const char *match);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
2010-10-13 15:57:08 +00:00
|
|
|
int gnupg_compare_version (const char *a, const char *b);
|
|
|
|
|
* configure.ac (gl_INIT): Add gnulib stuff.
(fseeko, ftello, ttyname, isascii): Replaced the AC_REPLACE_FUNCS
by a simple check.
(putc_unlocked): Removed check. Not used.
(strsep, mkdtemp, asprintf): Replaced checks by gnulib checks.
(xsize): Added will probably come handy soon.
(CFLAGS): Use -Wformat-security instead of
-Wformat-nonliteral. Add --Wno-format-y2k.
* gl/, gl/m4/: New.
* gpg-agent.c: Include setenv.h.
* Makefile.am (AM_CPPFLAGS): Added.
* util.h: Add some includes for gnulib.
(ttyname, isascii): Define them inline.
* fseeko.c, ftello.c: Removed.
* strsep.c, mkdtemp.c: Removed.
* ttyname.c, isascii.c: Removed.
* mkdtemp.c: Removed.
* exec.c: Include mkdtemp.h
* keybox-file.c (ftello) [!HAVE_FSEEKO]: New replacement
function. Copied from ../common/ftello.c.
* keybox-update.c (fseeko) [!HAVE_FSEEKO]: New replacement
function. Copied from ../common/iobuf.c.
* scdaemon.c: Include mkdtemp.h.
* misc.c: Include setenv.h.
* symcryptrun.c: Include mkdtemp.h.
2005-06-01 15:46:01 +00:00
|
|
|
|
|
|
|
/*-- Simple replacement functions. */
|
2012-11-20 19:01:13 +01:00
|
|
|
|
|
|
|
/* We use the gnupg_ttyname macro to be safe not to run into conflicts
|
|
|
|
which an extisting but broken ttyname. */
|
|
|
|
#if !defined(HAVE_TTYNAME) || defined(HAVE_BROKEN_TTYNAME)
|
|
|
|
# define gnupg_ttyname(n) _gnupg_ttyname ((n))
|
* configure.ac (gl_INIT): Add gnulib stuff.
(fseeko, ftello, ttyname, isascii): Replaced the AC_REPLACE_FUNCS
by a simple check.
(putc_unlocked): Removed check. Not used.
(strsep, mkdtemp, asprintf): Replaced checks by gnulib checks.
(xsize): Added will probably come handy soon.
(CFLAGS): Use -Wformat-security instead of
-Wformat-nonliteral. Add --Wno-format-y2k.
* gl/, gl/m4/: New.
* gpg-agent.c: Include setenv.h.
* Makefile.am (AM_CPPFLAGS): Added.
* util.h: Add some includes for gnulib.
(ttyname, isascii): Define them inline.
* fseeko.c, ftello.c: Removed.
* strsep.c, mkdtemp.c: Removed.
* ttyname.c, isascii.c: Removed.
* mkdtemp.c: Removed.
* exec.c: Include mkdtemp.h
* keybox-file.c (ftello) [!HAVE_FSEEKO]: New replacement
function. Copied from ../common/ftello.c.
* keybox-update.c (fseeko) [!HAVE_FSEEKO]: New replacement
function. Copied from ../common/iobuf.c.
* scdaemon.c: Include mkdtemp.h.
* misc.c: Include setenv.h.
* symcryptrun.c: Include mkdtemp.h.
2005-06-01 15:46:01 +00:00
|
|
|
/* Systems without ttyname (W32) will merely return NULL. */
|
|
|
|
static inline char *
|
2012-11-20 19:01:13 +01:00
|
|
|
_gnupg_ttyname (int fd)
|
* configure.ac (gl_INIT): Add gnulib stuff.
(fseeko, ftello, ttyname, isascii): Replaced the AC_REPLACE_FUNCS
by a simple check.
(putc_unlocked): Removed check. Not used.
(strsep, mkdtemp, asprintf): Replaced checks by gnulib checks.
(xsize): Added will probably come handy soon.
(CFLAGS): Use -Wformat-security instead of
-Wformat-nonliteral. Add --Wno-format-y2k.
* gl/, gl/m4/: New.
* gpg-agent.c: Include setenv.h.
* Makefile.am (AM_CPPFLAGS): Added.
* util.h: Add some includes for gnulib.
(ttyname, isascii): Define them inline.
* fseeko.c, ftello.c: Removed.
* strsep.c, mkdtemp.c: Removed.
* ttyname.c, isascii.c: Removed.
* mkdtemp.c: Removed.
* exec.c: Include mkdtemp.h
* keybox-file.c (ftello) [!HAVE_FSEEKO]: New replacement
function. Copied from ../common/ftello.c.
* keybox-update.c (fseeko) [!HAVE_FSEEKO]: New replacement
function. Copied from ../common/iobuf.c.
* scdaemon.c: Include mkdtemp.h.
* misc.c: Include setenv.h.
* symcryptrun.c: Include mkdtemp.h.
2005-06-01 15:46:01 +00:00
|
|
|
{
|
2008-10-17 19:18:46 +00:00
|
|
|
(void)fd;
|
2007-06-06 18:12:30 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
2012-11-20 19:01:13 +01:00
|
|
|
#else /*HAVE_TTYNAME*/
|
|
|
|
# define gnupg_ttyname(n) ttyname ((n))
|
|
|
|
#endif /*HAVE_TTYNAME */
|
2004-12-20 16:17:25 +00:00
|
|
|
|
2010-03-02 21:25:08 +00:00
|
|
|
#ifdef HAVE_W32CE_SYSTEM
|
|
|
|
#define getpid() GetCurrentProcessId ()
|
|
|
|
char *_gnupg_getenv (const char *name); /* See sysutils.c */
|
|
|
|
#define getenv(a) _gnupg_getenv ((a))
|
2010-04-14 11:24:02 +00:00
|
|
|
char *_gnupg_setenv (const char *name); /* See sysutils.c */
|
|
|
|
#define setenv(a,b,c) _gnupg_setenv ((a),(b),(c))
|
2010-04-14 14:39:16 +00:00
|
|
|
int _gnupg_isatty (int fd);
|
|
|
|
#define gnupg_isatty(a) _gnupg_isatty ((a))
|
|
|
|
#else
|
|
|
|
#define gnupg_isatty(a) isatty ((a))
|
2010-03-02 21:25:08 +00:00
|
|
|
#endif
|
|
|
|
|
|
|
|
|
2003-08-05 17:11:04 +00:00
|
|
|
|
* configure.ac (gl_INIT): Add gnulib stuff.
(fseeko, ftello, ttyname, isascii): Replaced the AC_REPLACE_FUNCS
by a simple check.
(putc_unlocked): Removed check. Not used.
(strsep, mkdtemp, asprintf): Replaced checks by gnulib checks.
(xsize): Added will probably come handy soon.
(CFLAGS): Use -Wformat-security instead of
-Wformat-nonliteral. Add --Wno-format-y2k.
* gl/, gl/m4/: New.
* gpg-agent.c: Include setenv.h.
* Makefile.am (AM_CPPFLAGS): Added.
* util.h: Add some includes for gnulib.
(ttyname, isascii): Define them inline.
* fseeko.c, ftello.c: Removed.
* strsep.c, mkdtemp.c: Removed.
* ttyname.c, isascii.c: Removed.
* mkdtemp.c: Removed.
* exec.c: Include mkdtemp.h
* keybox-file.c (ftello) [!HAVE_FSEEKO]: New replacement
function. Copied from ../common/ftello.c.
* keybox-update.c (fseeko) [!HAVE_FSEEKO]: New replacement
function. Copied from ../common/iobuf.c.
* scdaemon.c: Include mkdtemp.h.
* misc.c: Include setenv.h.
* symcryptrun.c: Include mkdtemp.h.
2005-06-01 15:46:01 +00:00
|
|
|
/*-- Macros to replace ctype ones to avoid locale problems. --*/
|
2003-08-05 17:11:04 +00:00
|
|
|
#define spacep(p) (*(p) == ' ' || *(p) == '\t')
|
|
|
|
#define digitp(p) (*(p) >= '0' && *(p) <= '9')
|
|
|
|
#define hexdigitp(a) (digitp (a) \
|
|
|
|
|| (*(a) >= 'A' && *(a) <= 'F') \
|
|
|
|
|| (*(a) >= 'a' && *(a) <= 'f'))
|
2003-09-23 17:48:33 +00:00
|
|
|
/* Note this isn't identical to a C locale isspace() without \f and
|
|
|
|
\v, but works for the purposes used here. */
|
|
|
|
#define ascii_isspace(a) ((a)==' ' || (a)=='\n' || (a)=='\r' || (a)=='\t')
|
|
|
|
|
2004-01-27 16:40:42 +00:00
|
|
|
/* The atoi macros assume that the buffer has only valid digits. */
|
2003-08-05 17:11:04 +00:00
|
|
|
#define atoi_1(p) (*(p) - '0' )
|
|
|
|
#define atoi_2(p) ((atoi_1(p) * 10) + atoi_1((p)+1))
|
|
|
|
#define atoi_4(p) ((atoi_2(p) * 100) + atoi_2((p)+2))
|
|
|
|
#define xtoi_1(p) (*(p) <= '9'? (*(p)- '0'): \
|
|
|
|
*(p) <= 'F'? (*(p)-'A'+10):(*(p)-'a'+10))
|
|
|
|
#define xtoi_2(p) ((xtoi_1(p) * 16) + xtoi_1((p)+1))
|
2004-01-27 16:40:42 +00:00
|
|
|
#define xtoi_4(p) ((xtoi_2(p) * 256) + xtoi_2((p)+2))
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
|
|
|
2007-06-21 18:44:48 +00:00
|
|
|
/*-- Forward declaration of the commonly used server control structure. */
|
|
|
|
/* (We need it here as it is used by some callback prototypes.) */
|
|
|
|
struct server_control_s;
|
|
|
|
typedef struct server_control_s *ctrl_t;
|
|
|
|
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
|
|
#endif /*GNUPG_COMMON_UTIL_H*/
|