mirror of
git://git.gnupg.org/gnupg.git
synced 2024-11-04 20:38:50 +01:00
f4617d97b8
unhashed signature cache any longer. * misc.c (pct_expando): Add two new expandos - signer's fingerprint (%g), and signer's primary fingerprint (%p). * Makefile.am: Include W32LIBS where appropriate. * g10.c (main): Add --rfc2440 alias for --openpgp since in a few months, they won't be the same thing. * keyserver.c (parse_keyserver_uri): Accept "http" as an alias for "hkp", since it is occasionally written that way. (keyserver_spawn): Use ascii_isspace to avoid locale issues. * keygen.c (ask_user_id): Make --allow-freeform-uid apply to the email field as well as the name field, and allow mixing fields when it is set. * options.skel: Use subkeys.pgp.net as the default keyserver. * trustdb.c (validate_one_keyblock): Certifications on revoked or expired uids do not count in the web of trust. * signal.c (init_one_signal, pause_on_sigusr, do_block): Only use sigprocmask() if we have sigset_t, and only use sigaction() if we have struct sigaction. This is for Forte c89 on Solaris which seems to define only the function call half of the two pairs by default. (pause_on_sigusr): Typo. (do_block): If we can't use sigprocmask() and sigset_t, try to get the number of signals from NSIG as well as MAXSIG, and if we can't, fail with an explanation. * signal.c, tdbio.c: Comment out the transaction code. It was not used in this version, and was causing some build problems on quasi-posix platforms (Solaris and Forte c89). * keylist.c (list_keyblock_colon): Don't include validity values when listing secret keys since they can be incorrect and/or misleading. This is a temporary kludge, and will be handled properly in 1.9/2.0. * mainproc.c (check_sig_and_print): Only show the "key available from" preferred keyserver line if the key is not currently present. * keyedit.c (sign_uids): Do not sign expired uids without --expert (same behavior as revoked uids). Do not allow signing a user ID without a self-signature. --expert overrides. Add additional prompt to the signature level question. (menu_expire): When changing expiration dates, don't replace selfsigs on revoked uids since this would effectively unrevoke them. There is also no point in replacing expired selfsigs. This is bug #181 * g10.c (add_notation_data): Make sure that only ascii is passed to iscntrl. Noted by Christian Biere. * getkey.c (classify_user_id2): Replaced isspace by spacep * keygen.c (ask_user_id): Ditto. (get_parameter_algo): Ditto. * keyedit.c (keyedit_menu): Ditto. * tdbdump.c (import_ownertrust): Ditto. s/isxdigit/hexdigitp/. * revoke.c (ask_revocation_reason): * keyserver.c (keyserver_spawn): Dito.
227 lines
5.3 KiB
C
227 lines
5.3 KiB
C
/* signal.c - signal handling
|
|
* Copyright (C) 1998, 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
|
|
*
|
|
* This file is part of GnuPG.
|
|
*
|
|
* GnuPG 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.
|
|
*
|
|
* GnuPG 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 <signal.h>
|
|
#include <unistd.h>
|
|
#include <string.h>
|
|
#include <errno.h>
|
|
#include <assert.h>
|
|
|
|
#include "options.h"
|
|
#include "errors.h"
|
|
#include "memory.h"
|
|
#include "util.h"
|
|
#include "main.h"
|
|
#include "ttyio.h"
|
|
|
|
static volatile int caught_fatal_sig = 0;
|
|
static volatile int caught_sigusr1 = 0;
|
|
|
|
static void
|
|
init_one_signal (int sig, RETSIGTYPE (*handler)(int), int check_ign )
|
|
{
|
|
#ifndef HAVE_DOSISH_SYSTEM
|
|
#if defined(HAVE_SIGACTION) && defined(HAVE_STRUCT_SIGACTION)
|
|
struct sigaction oact, nact;
|
|
|
|
if (check_ign) {
|
|
/* we don't want to change an IGN handler */
|
|
sigaction (sig, NULL, &oact );
|
|
if (oact.sa_handler == SIG_IGN )
|
|
return;
|
|
}
|
|
|
|
nact.sa_handler = handler;
|
|
sigemptyset (&nact.sa_mask);
|
|
nact.sa_flags = 0;
|
|
sigaction ( sig, &nact, NULL);
|
|
#else
|
|
RETSIGTYPE (*ohandler)(int);
|
|
|
|
ohandler = signal (sig, handler);
|
|
if (check_ign && ohandler == SIG_IGN) {
|
|
/* Change it back if it was already set to IGN */
|
|
signal (sig, SIG_IGN);
|
|
}
|
|
#endif
|
|
#endif /*!HAVE_DOSISH_SYSTEM*/
|
|
}
|
|
|
|
static const char *
|
|
get_signal_name( int signum )
|
|
{
|
|
#if defined(SYS_SIGLIST_DECLARED) && defined(NSIG)
|
|
return (signum >= 0 && signum < NSIG) ? sys_siglist[signum] : "?";
|
|
#else
|
|
return "some signal";
|
|
#endif
|
|
}
|
|
|
|
|
|
static RETSIGTYPE
|
|
got_fatal_signal( int sig )
|
|
{
|
|
const char *s;
|
|
|
|
if( caught_fatal_sig )
|
|
raise( sig );
|
|
caught_fatal_sig = 1;
|
|
|
|
secmem_term();
|
|
/* better don't transtale these messages */
|
|
write(2, "\n", 1 );
|
|
s = log_get_name(); if( s ) write(2, s, strlen(s) );
|
|
write(2, ": ", 2 );
|
|
s = get_signal_name(sig); write(2, s, strlen(s) );
|
|
write(2, " caught ... exiting\n", 20 );
|
|
|
|
/* reset action to default action and raise signal again */
|
|
init_one_signal (sig, SIG_DFL, 0);
|
|
remove_lockfiles ();
|
|
#ifdef __riscos__
|
|
riscos_close_fds ();
|
|
#endif /* __riscos__ */
|
|
raise( sig );
|
|
}
|
|
|
|
|
|
static RETSIGTYPE
|
|
got_usr_signal( int sig )
|
|
{
|
|
caught_sigusr1 = 1;
|
|
}
|
|
|
|
|
|
void
|
|
init_signals()
|
|
{
|
|
#ifndef HAVE_DOSISH_SYSTEM
|
|
init_one_signal (SIGINT, got_fatal_signal, 1 );
|
|
init_one_signal (SIGHUP, got_fatal_signal, 1 );
|
|
init_one_signal (SIGTERM, got_fatal_signal, 1 );
|
|
init_one_signal (SIGQUIT, got_fatal_signal, 1 );
|
|
init_one_signal (SIGSEGV, got_fatal_signal, 1 );
|
|
init_one_signal (SIGUSR1, got_usr_signal, 0 );
|
|
init_one_signal (SIGPIPE, SIG_IGN, 0 );
|
|
#endif
|
|
}
|
|
|
|
|
|
void
|
|
pause_on_sigusr( int which )
|
|
{
|
|
#ifndef HAVE_DOSISH_SYSTEM
|
|
#if defined(HAVE_SIGPROCMASK) && defined(HAVE_SIGSET_T)
|
|
sigset_t mask, oldmask;
|
|
|
|
assert( which == 1 );
|
|
sigemptyset( &mask );
|
|
sigaddset( &mask, SIGUSR1 );
|
|
|
|
sigprocmask( SIG_BLOCK, &mask, &oldmask );
|
|
while( !caught_sigusr1 )
|
|
sigsuspend( &oldmask );
|
|
caught_sigusr1 = 0;
|
|
sigprocmask( SIG_UNBLOCK, &mask, NULL );
|
|
#else
|
|
assert (which == 1);
|
|
sighold (SIGUSR1);
|
|
while (!caught_sigusr1)
|
|
sigpause(SIGUSR1);
|
|
caught_sigusr1 = 0;
|
|
sigrelse(SIGUSR1);
|
|
#endif /*! HAVE_SIGPROCMASK && HAVE_SIGSET_T */
|
|
#endif
|
|
}
|
|
|
|
/* Disabled - see comment in tdbio.c:tdbio_begin_transaction() */
|
|
#if 0
|
|
static void
|
|
do_block( int block )
|
|
{
|
|
#ifndef HAVE_DOSISH_SYSTEM
|
|
static int is_blocked;
|
|
#if defined(HAVE_SIGPROCMASK) && defined(HAVE_SIGSET_T)
|
|
static sigset_t oldmask;
|
|
|
|
if( block ) {
|
|
sigset_t newmask;
|
|
|
|
if( is_blocked )
|
|
log_bug("signals are already blocked\n");
|
|
sigfillset( &newmask );
|
|
sigprocmask( SIG_BLOCK, &newmask, &oldmask );
|
|
is_blocked = 1;
|
|
}
|
|
else {
|
|
if( !is_blocked )
|
|
log_bug("signals are not blocked\n");
|
|
sigprocmask( SIG_SETMASK, &oldmask, NULL );
|
|
is_blocked = 0;
|
|
}
|
|
#else /*! HAVE_SIGPROCMASK && HAVE_SIGSET_T */
|
|
|
|
#if defined(NSIG)
|
|
#define SIGSMAX (NSIG)
|
|
#elif defined(MAXSIG)
|
|
#define SIGSMAX (MAXSIG+1)
|
|
#else
|
|
#error "define SIGSMAX to the number of signals on your platform plus one"
|
|
#endif
|
|
|
|
static void (*disposition[SIGSMAX])(int);
|
|
int sig;
|
|
|
|
if( block ) {
|
|
if( is_blocked )
|
|
log_bug("signals are already blocked\n");
|
|
for (sig=1; sig < SIGSMAX; sig++) {
|
|
disposition[sig] = sigset (sig, SIG_HOLD);
|
|
}
|
|
is_blocked = 1;
|
|
}
|
|
else {
|
|
if( !is_blocked )
|
|
log_bug("signals are not blocked\n");
|
|
for (sig=1; sig < SIGSMAX; sig++) {
|
|
sigset (sig, disposition[sig]);
|
|
}
|
|
is_blocked = 0;
|
|
}
|
|
#endif /*! HAVE_SIGPROCMASK && HAVE_SIGSET_T */
|
|
#endif /*HAVE_DOSISH_SYSTEM*/
|
|
}
|
|
|
|
void
|
|
block_all_signals()
|
|
{
|
|
do_block(1);
|
|
}
|
|
|
|
void
|
|
unblock_all_signals()
|
|
{
|
|
do_block(0);
|
|
}
|
|
#endif
|