1998-04-07 20:16:10 +02:00
|
|
|
/* misc.c - miscellaneous functions
|
2002-06-29 15:46:34 +02:00
|
|
|
* Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
|
1998-04-07 20:16:10 +02:00
|
|
|
*
|
1998-12-23 13:41:40 +01:00
|
|
|
* This file is part of GnuPG.
|
1998-04-07 20:16:10 +02:00
|
|
|
*
|
1998-12-23 13:41:40 +01:00
|
|
|
* GnuPG is free software; you can redistribute it and/or modify
|
1998-04-07 20:16:10 +02:00
|
|
|
* 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.
|
|
|
|
*
|
1998-12-23 13:41:40 +01:00
|
|
|
* GnuPG is distributed in the hope that it will be useful,
|
1998-04-07 20:16:10 +02:00
|
|
|
* 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>
|
2002-06-29 15:46:34 +02:00
|
|
|
#include <unistd.h>
|
1998-07-14 19:10:28 +02:00
|
|
|
#include <errno.h>
|
1998-12-17 18:36:05 +01:00
|
|
|
#if defined(__linux__) && defined(__alpha__) && __GLIBC__ < 2
|
* armor.c, g10.c, kbnode.c, misc.c, pkclist.c, sign.c, build-packet.c,
getkey.c, keydb.c, openfile.c, plaintext.c, status.c, gpgv.c, keygen.c,
options.h, sig-check.c, tdbio.h, encode.c, mainproc.c, parse-packet.c,
signal.c, textfilter.c: Edit all preprocessor instructions to remove
whitespace before the '#'. This is not required by C89, but there are some
compilers out there that don't like it.
2003-05-24 23:50:33 +02:00
|
|
|
#include <asm/sysinfo.h>
|
|
|
|
#include <asm/unistd.h>
|
1998-05-15 20:49:19 +02:00
|
|
|
#endif
|
1998-07-14 19:10:28 +02:00
|
|
|
#ifdef HAVE_SETRLIMIT
|
* armor.c, g10.c, kbnode.c, misc.c, pkclist.c, sign.c, build-packet.c,
getkey.c, keydb.c, openfile.c, plaintext.c, status.c, gpgv.c, keygen.c,
options.h, sig-check.c, tdbio.h, encode.c, mainproc.c, parse-packet.c,
signal.c, textfilter.c: Edit all preprocessor instructions to remove
whitespace before the '#'. This is not required by C89, but there are some
compilers out there that don't like it.
2003-05-24 23:50:33 +02:00
|
|
|
#include <time.h>
|
|
|
|
#include <sys/time.h>
|
|
|
|
#include <sys/resource.h>
|
1998-07-14 19:10:28 +02:00
|
|
|
#endif
|
1998-04-07 20:16:10 +02:00
|
|
|
#include "util.h"
|
|
|
|
#include "main.h"
|
2002-06-29 15:46:34 +02:00
|
|
|
#include "photoid.h"
|
1998-06-15 17:41:04 +02:00
|
|
|
#include "options.h"
|
1998-11-10 13:59:59 +01:00
|
|
|
#include "i18n.h"
|
1998-04-07 20:16:10 +02:00
|
|
|
|
1998-06-16 17:13:28 +02:00
|
|
|
|
2002-06-29 15:46:34 +02:00
|
|
|
const char *g10m_revision_string(int);
|
|
|
|
const char *g10c_revision_string(int);
|
|
|
|
const char *g10u_revision_string(int);
|
|
|
|
|
|
|
|
#ifdef __GNUC__
|
|
|
|
volatile
|
|
|
|
#endif
|
|
|
|
void
|
|
|
|
pull_in_libs(void)
|
|
|
|
{
|
|
|
|
g10m_revision_string(0);
|
|
|
|
g10c_revision_string(0);
|
|
|
|
g10u_revision_string(0);
|
|
|
|
}
|
|
|
|
|
1999-12-08 22:03:03 +01:00
|
|
|
|
1998-12-17 18:36:05 +01:00
|
|
|
#if defined(__linux__) && defined(__alpha__) && __GLIBC__ < 2
|
1998-05-15 20:49:19 +02:00
|
|
|
static int
|
|
|
|
setsysinfo(unsigned long op, void *buffer, unsigned long size,
|
|
|
|
int *start, void *arg, unsigned long flag)
|
|
|
|
{
|
|
|
|
return syscall(__NR_osf_setsysinfo, op, buffer, size, start, arg, flag);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
trap_unaligned(void)
|
|
|
|
{
|
|
|
|
unsigned int buf[2];
|
|
|
|
|
|
|
|
buf[0] = SSIN_UACPROC;
|
|
|
|
buf[1] = UAC_SIGBUS | UAC_NOPRINT;
|
|
|
|
setsysinfo(SSI_NVPAIRS, buf, 1, 0, 0, 0);
|
|
|
|
}
|
|
|
|
#else
|
|
|
|
void
|
|
|
|
trap_unaligned(void)
|
|
|
|
{ /* dummy */
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
2000-09-18 16:35:34 +02:00
|
|
|
int
|
1998-07-14 19:10:28 +02:00
|
|
|
disable_core_dumps()
|
|
|
|
{
|
* armor.c, g10.c, kbnode.c, misc.c, pkclist.c, sign.c, build-packet.c,
getkey.c, keydb.c, openfile.c, plaintext.c, status.c, gpgv.c, keygen.c,
options.h, sig-check.c, tdbio.h, encode.c, mainproc.c, parse-packet.c,
signal.c, textfilter.c: Edit all preprocessor instructions to remove
whitespace before the '#'. This is not required by C89, but there are some
compilers out there that don't like it.
2003-05-24 23:50:33 +02:00
|
|
|
#ifdef HAVE_DOSISH_SYSTEM
|
2000-09-18 16:35:34 +02:00
|
|
|
return 0;
|
* armor.c, g10.c, kbnode.c, misc.c, pkclist.c, sign.c, build-packet.c,
getkey.c, keydb.c, openfile.c, plaintext.c, status.c, gpgv.c, keygen.c,
options.h, sig-check.c, tdbio.h, encode.c, mainproc.c, parse-packet.c,
signal.c, textfilter.c: Edit all preprocessor instructions to remove
whitespace before the '#'. This is not required by C89, but there are some
compilers out there that don't like it.
2003-05-24 23:50:33 +02:00
|
|
|
#else
|
|
|
|
#ifdef HAVE_SETRLIMIT
|
1998-07-14 19:10:28 +02:00
|
|
|
struct rlimit limit;
|
|
|
|
|
|
|
|
limit.rlim_cur = 0;
|
|
|
|
limit.rlim_max = 0;
|
1998-12-29 14:47:31 +01:00
|
|
|
if( !setrlimit( RLIMIT_CORE, &limit ) )
|
2000-09-18 16:35:34 +02:00
|
|
|
return 0;
|
|
|
|
if( errno != EINVAL && errno != ENOSYS )
|
1998-11-10 13:59:59 +01:00
|
|
|
log_fatal(_("can't disable core dumps: %s\n"), strerror(errno) );
|
* armor.c, g10.c, kbnode.c, misc.c, pkclist.c, sign.c, build-packet.c,
getkey.c, keydb.c, openfile.c, plaintext.c, status.c, gpgv.c, keygen.c,
options.h, sig-check.c, tdbio.h, encode.c, mainproc.c, parse-packet.c,
signal.c, textfilter.c: Edit all preprocessor instructions to remove
whitespace before the '#'. This is not required by C89, but there are some
compilers out there that don't like it.
2003-05-24 23:50:33 +02:00
|
|
|
#endif
|
2000-09-18 16:35:34 +02:00
|
|
|
return 1;
|
* armor.c, g10.c, kbnode.c, misc.c, pkclist.c, sign.c, build-packet.c,
getkey.c, keydb.c, openfile.c, plaintext.c, status.c, gpgv.c, keygen.c,
options.h, sig-check.c, tdbio.h, encode.c, mainproc.c, parse-packet.c,
signal.c, textfilter.c: Edit all preprocessor instructions to remove
whitespace before the '#'. This is not required by C89, but there are some
compilers out there that don't like it.
2003-05-24 23:50:33 +02:00
|
|
|
#endif
|
1998-07-14 19:10:28 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
2002-06-29 15:46:34 +02:00
|
|
|
u16
|
|
|
|
checksum_u16( unsigned n )
|
1999-12-08 22:03:03 +01:00
|
|
|
{
|
2002-06-29 15:46:34 +02:00
|
|
|
u16 a;
|
1999-12-08 22:03:03 +01:00
|
|
|
|
1998-06-15 17:41:04 +02:00
|
|
|
a = (n >> 8) & 0xff;
|
|
|
|
a += n & 0xff;
|
1998-04-07 20:16:10 +02:00
|
|
|
return a;
|
|
|
|
}
|
|
|
|
|
2002-09-11 09:27:54 +02:00
|
|
|
|
1998-04-07 20:16:10 +02:00
|
|
|
u16
|
|
|
|
checksum( byte *p, unsigned n )
|
|
|
|
{
|
|
|
|
u16 a;
|
|
|
|
|
|
|
|
for(a=0; n; n-- )
|
|
|
|
a += *p++;
|
|
|
|
return a;
|
|
|
|
}
|
|
|
|
|
|
|
|
u16
|
|
|
|
checksum_mpi( MPI a )
|
|
|
|
{
|
|
|
|
u16 csum;
|
|
|
|
byte *buffer;
|
2002-06-29 15:46:34 +02:00
|
|
|
unsigned nbytes;
|
|
|
|
unsigned nbits;
|
|
|
|
|
|
|
|
buffer = mpi_get_buffer( a, &nbytes, NULL );
|
|
|
|
nbits = mpi_get_nbits(a);
|
2002-09-11 09:27:54 +02:00
|
|
|
csum = checksum_u16( nbits );
|
2002-06-29 15:46:34 +02:00
|
|
|
csum += checksum( buffer, nbytes );
|
|
|
|
m_free( buffer );
|
1998-04-07 20:16:10 +02:00
|
|
|
return csum;
|
|
|
|
}
|
|
|
|
|
1998-06-25 12:19:08 +02:00
|
|
|
u32
|
|
|
|
buffer_to_u32( const byte *buffer )
|
|
|
|
{
|
|
|
|
unsigned long a;
|
|
|
|
a = *buffer << 24;
|
|
|
|
a |= buffer[1] << 16;
|
|
|
|
a |= buffer[2] << 8;
|
|
|
|
a |= buffer[3];
|
|
|
|
return a;
|
|
|
|
}
|
|
|
|
|
1998-12-10 20:20:47 +01:00
|
|
|
|
|
|
|
static void
|
|
|
|
no_exp_algo(void)
|
|
|
|
{
|
|
|
|
static int did_note = 0;
|
|
|
|
|
|
|
|
if( !did_note ) {
|
|
|
|
did_note = 1;
|
|
|
|
log_info(_("Experimental algorithms should not be used!\n"));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
print_pubkey_algo_note( int algo )
|
|
|
|
{
|
|
|
|
if( algo >= 100 && algo <= 110 )
|
|
|
|
no_exp_algo();
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
print_cipher_algo_note( int algo )
|
|
|
|
{
|
|
|
|
if( algo >= 100 && algo <= 110 )
|
|
|
|
no_exp_algo();
|
2002-06-29 15:46:34 +02:00
|
|
|
else if( algo == CIPHER_ALGO_3DES
|
|
|
|
|| algo == CIPHER_ALGO_CAST5
|
|
|
|
|| algo == CIPHER_ALGO_BLOWFISH
|
|
|
|
|| algo == CIPHER_ALGO_TWOFISH
|
|
|
|
|| algo == CIPHER_ALGO_RIJNDAEL
|
|
|
|
|| algo == CIPHER_ALGO_RIJNDAEL192
|
|
|
|
|| algo == CIPHER_ALGO_RIJNDAEL256
|
1998-12-10 20:20:47 +01:00
|
|
|
)
|
|
|
|
;
|
|
|
|
else {
|
|
|
|
static int did_note = 0;
|
|
|
|
|
|
|
|
if( !did_note ) {
|
|
|
|
did_note = 1;
|
2002-06-29 15:46:34 +02:00
|
|
|
log_info(_("this cipher algorithm is deprecated; "
|
1998-12-10 20:20:47 +01:00
|
|
|
"please use a more standard one!\n"));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
print_digest_algo_note( int algo )
|
|
|
|
{
|
|
|
|
if( algo >= 100 && algo <= 110 )
|
|
|
|
no_exp_algo();
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2002-06-29 15:46:34 +02:00
|
|
|
/* Return a string which is used as a kind of process ID */
|
|
|
|
const byte *
|
|
|
|
get_session_marker( size_t *rlen )
|
|
|
|
{
|
|
|
|
static byte marker[SIZEOF_UNSIGNED_LONG*2];
|
|
|
|
static int initialized;
|
|
|
|
|
|
|
|
if ( !initialized ) {
|
|
|
|
volatile ulong aa, bb; /* we really want the uninitialized value */
|
|
|
|
ulong a, b;
|
|
|
|
|
|
|
|
initialized = 1;
|
|
|
|
/* also this marker is guessable it is not easy to use this
|
|
|
|
* for a faked control packet because an attacker does not
|
|
|
|
* have enough control about the time the verification does
|
|
|
|
* take place. Of course, we can add just more random but
|
|
|
|
* than we need the random generator even for verification
|
|
|
|
* tasks - which does not make sense. */
|
|
|
|
a = aa ^ (ulong)getpid();
|
|
|
|
b = bb ^ (ulong)time(NULL);
|
|
|
|
memcpy( marker, &a, SIZEOF_UNSIGNED_LONG );
|
|
|
|
memcpy( marker+SIZEOF_UNSIGNED_LONG, &b, SIZEOF_UNSIGNED_LONG );
|
|
|
|
}
|
|
|
|
*rlen = sizeof(marker);
|
|
|
|
return marker;
|
|
|
|
}
|
2000-07-14 19:34:53 +02:00
|
|
|
|
1999-10-26 14:14:37 +02:00
|
|
|
/****************
|
|
|
|
* Wrapper around the libgcrypt function with addional checks on
|
2000-09-18 16:35:34 +02:00
|
|
|
* openPGP contraints for the algo ID.
|
1999-10-26 14:14:37 +02:00
|
|
|
*/
|
|
|
|
int
|
|
|
|
openpgp_cipher_test_algo( int algo )
|
|
|
|
{
|
|
|
|
if( algo < 0 || algo > 110 )
|
2002-06-29 15:46:34 +02:00
|
|
|
return G10ERR_CIPHER_ALGO;
|
|
|
|
return check_cipher_algo(algo);
|
1999-10-26 14:14:37 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
int
|
1999-11-13 17:43:23 +01:00
|
|
|
openpgp_pk_test_algo( int algo, unsigned int usage_flags )
|
1999-10-26 14:14:37 +02:00
|
|
|
{
|
|
|
|
if( algo < 0 || algo > 110 )
|
2002-06-29 15:46:34 +02:00
|
|
|
return G10ERR_PUBKEY_ALGO;
|
|
|
|
return check_pubkey_algo2( algo, usage_flags );
|
1999-10-26 14:14:37 +02:00
|
|
|
}
|
|
|
|
|
2000-09-18 16:35:34 +02:00
|
|
|
int
|
|
|
|
openpgp_pk_algo_usage ( int algo )
|
|
|
|
{
|
2002-06-29 15:46:34 +02:00
|
|
|
int use = 0;
|
2000-09-18 16:35:34 +02:00
|
|
|
|
2002-06-29 15:46:34 +02:00
|
|
|
/* they are hardwired in gpg 1.0 */
|
2000-09-18 16:35:34 +02:00
|
|
|
switch ( algo ) {
|
2002-06-29 15:46:34 +02:00
|
|
|
case PUBKEY_ALGO_RSA:
|
|
|
|
use = PUBKEY_USAGE_SIG | PUBKEY_USAGE_ENC;
|
2000-09-18 16:35:34 +02:00
|
|
|
break;
|
2002-06-29 15:46:34 +02:00
|
|
|
case PUBKEY_ALGO_RSA_E:
|
|
|
|
use = PUBKEY_USAGE_ENC;
|
2000-09-18 16:35:34 +02:00
|
|
|
break;
|
2002-06-29 15:46:34 +02:00
|
|
|
case PUBKEY_ALGO_RSA_S:
|
|
|
|
use = PUBKEY_USAGE_SIG;
|
2000-09-18 16:35:34 +02:00
|
|
|
break;
|
2002-06-29 15:46:34 +02:00
|
|
|
case PUBKEY_ALGO_ELGAMAL_E:
|
|
|
|
use = PUBKEY_USAGE_ENC;
|
2000-09-18 16:35:34 +02:00
|
|
|
break;
|
2002-06-29 15:46:34 +02:00
|
|
|
case PUBKEY_ALGO_DSA:
|
|
|
|
use = PUBKEY_USAGE_SIG;
|
2000-09-18 16:35:34 +02:00
|
|
|
break;
|
2002-06-29 15:46:34 +02:00
|
|
|
case PUBKEY_ALGO_ELGAMAL:
|
|
|
|
use = PUBKEY_USAGE_SIG | PUBKEY_USAGE_ENC;
|
2000-09-18 16:35:34 +02:00
|
|
|
break;
|
|
|
|
default:
|
2002-06-29 15:46:34 +02:00
|
|
|
break;
|
2000-09-18 16:35:34 +02:00
|
|
|
}
|
2002-06-29 15:46:34 +02:00
|
|
|
return use;
|
2000-09-18 16:35:34 +02:00
|
|
|
}
|
|
|
|
|
1999-10-26 14:14:37 +02:00
|
|
|
int
|
|
|
|
openpgp_md_test_algo( int algo )
|
|
|
|
{
|
|
|
|
if( algo < 0 || algo > 110 )
|
2002-06-29 15:46:34 +02:00
|
|
|
return G10ERR_DIGEST_ALGO;
|
|
|
|
return check_digest_algo(algo);
|
1999-10-26 14:14:37 +02:00
|
|
|
}
|
|
|
|
|
2003-02-22 14:00:18 +01:00
|
|
|
#ifdef USE_IDEA
|
2002-06-29 15:46:34 +02:00
|
|
|
/* Special warning for the IDEA cipher */
|
|
|
|
void
|
|
|
|
idea_cipher_warn(int show)
|
1999-11-13 17:43:23 +01:00
|
|
|
{
|
2002-06-29 15:46:34 +02:00
|
|
|
static int warned=0;
|
|
|
|
|
|
|
|
if(!warned || show)
|
|
|
|
{
|
|
|
|
log_info(_("the IDEA cipher plugin is not present\n"));
|
|
|
|
log_info(_("please see http://www.gnupg.org/why-not-idea.html "
|
|
|
|
"for more information\n"));
|
|
|
|
warned=1;
|
|
|
|
}
|
1999-11-13 17:43:23 +01:00
|
|
|
}
|
2003-02-22 14:00:18 +01:00
|
|
|
#endif
|
1999-11-13 17:43:23 +01:00
|
|
|
|
2002-06-29 15:46:34 +02:00
|
|
|
/* Expand %-strings. Returns a string which must be m_freed. Returns
|
|
|
|
NULL if the string cannot be expanded (too large). */
|
|
|
|
char *
|
|
|
|
pct_expando(const char *string,struct expando_args *args)
|
1999-11-13 17:43:23 +01:00
|
|
|
{
|
2002-06-29 15:46:34 +02:00
|
|
|
const char *ch=string;
|
|
|
|
int idx=0,maxlen=0,done=0;
|
|
|
|
u32 pk_keyid[2]={0,0},sk_keyid[2]={0,0};
|
|
|
|
char *ret=NULL;
|
|
|
|
|
|
|
|
if(args->pk)
|
|
|
|
keyid_from_pk(args->pk,pk_keyid);
|
|
|
|
|
|
|
|
if(args->sk)
|
|
|
|
keyid_from_sk(args->sk,sk_keyid);
|
|
|
|
|
* parse-packet.c (parse_signature): No need to reserve 8 bytes for the
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.
2003-07-10 16:30:07 +02:00
|
|
|
/* This is used so that %k works in photoid command strings in
|
|
|
|
--list-secret-keys (which of course has a sk, but no pk). */
|
2002-06-29 15:46:34 +02:00
|
|
|
if(!args->pk && args->sk)
|
|
|
|
keyid_from_sk(args->sk,pk_keyid);
|
|
|
|
|
|
|
|
while(*ch!='\0')
|
|
|
|
{
|
|
|
|
char *str=NULL;
|
|
|
|
|
|
|
|
if(!done)
|
|
|
|
{
|
|
|
|
/* 8192 is way bigger than we'll need here */
|
|
|
|
if(maxlen>=8192)
|
|
|
|
goto fail;
|
|
|
|
|
|
|
|
maxlen+=1024;
|
|
|
|
ret=m_realloc(ret,maxlen);
|
|
|
|
}
|
|
|
|
|
|
|
|
done=0;
|
|
|
|
|
|
|
|
if(*ch=='%')
|
|
|
|
{
|
|
|
|
switch(*(ch+1))
|
|
|
|
{
|
|
|
|
case 's': /* short key id */
|
|
|
|
if(idx+8<maxlen)
|
|
|
|
{
|
|
|
|
sprintf(&ret[idx],"%08lX",(ulong)sk_keyid[1]);
|
|
|
|
idx+=8;
|
|
|
|
done=1;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 'S': /* long key id */
|
|
|
|
if(idx+16<maxlen)
|
|
|
|
{
|
|
|
|
sprintf(&ret[idx],"%08lX%08lX",
|
|
|
|
(ulong)sk_keyid[0],(ulong)sk_keyid[1]);
|
|
|
|
idx+=16;
|
|
|
|
done=1;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 'k': /* short key id */
|
|
|
|
if(idx+8<maxlen)
|
|
|
|
{
|
|
|
|
sprintf(&ret[idx],"%08lX",(ulong)pk_keyid[1]);
|
|
|
|
idx+=8;
|
|
|
|
done=1;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 'K': /* long key id */
|
|
|
|
if(idx+16<maxlen)
|
|
|
|
{
|
|
|
|
sprintf(&ret[idx],"%08lX%08lX",
|
|
|
|
(ulong)pk_keyid[0],(ulong)pk_keyid[1]);
|
|
|
|
idx+=16;
|
|
|
|
done=1;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
* parse-packet.c (parse_signature): No need to reserve 8 bytes for the
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.
2003-07-10 16:30:07 +02:00
|
|
|
case 'p': /* primary pk fingerprint of a sk */
|
|
|
|
case 'f': /* pk fingerprint */
|
|
|
|
case 'g': /* sk fingerprint */
|
2002-06-29 15:46:34 +02:00
|
|
|
{
|
|
|
|
byte array[MAX_FINGERPRINT_LEN];
|
|
|
|
size_t len;
|
|
|
|
int i;
|
|
|
|
|
* parse-packet.c (parse_signature): No need to reserve 8 bytes for the
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.
2003-07-10 16:30:07 +02:00
|
|
|
if((*(ch+1))=='p' && args->sk)
|
|
|
|
{
|
|
|
|
if(args->sk->is_primary)
|
|
|
|
fingerprint_from_sk(args->sk,array,&len);
|
|
|
|
else if(args->sk->main_keyid[0] || args->sk->main_keyid[1])
|
|
|
|
{
|
|
|
|
PKT_public_key *pk=
|
|
|
|
m_alloc_clear(sizeof(PKT_public_key));
|
|
|
|
|
|
|
|
if(get_pubkey_fast(pk,args->sk->main_keyid)==0)
|
|
|
|
fingerprint_from_pk(pk,array,&len);
|
|
|
|
else
|
|
|
|
memset(array,0,(len=MAX_FINGERPRINT_LEN));
|
|
|
|
free_public_key(pk);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
memset(array,0,(len=MAX_FINGERPRINT_LEN));
|
|
|
|
}
|
|
|
|
else if((*(ch+1))=='f' && args->pk)
|
2002-06-29 15:46:34 +02:00
|
|
|
fingerprint_from_pk(args->pk,array,&len);
|
* parse-packet.c (parse_signature): No need to reserve 8 bytes for the
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.
2003-07-10 16:30:07 +02:00
|
|
|
else if((*(ch+1))=='g' && args->sk)
|
|
|
|
fingerprint_from_sk(args->sk,array,&len);
|
2002-06-29 15:46:34 +02:00
|
|
|
else
|
* parse-packet.c (parse_signature): No need to reserve 8 bytes for the
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.
2003-07-10 16:30:07 +02:00
|
|
|
memset(array,0,(len=MAX_FINGERPRINT_LEN));
|
2002-06-29 15:46:34 +02:00
|
|
|
|
|
|
|
if(idx+(len*2)<maxlen)
|
|
|
|
{
|
|
|
|
for(i=0;i<len;i++)
|
|
|
|
{
|
|
|
|
sprintf(&ret[idx],"%02X",array[i]);
|
|
|
|
idx+=2;
|
|
|
|
}
|
|
|
|
done=1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 't': /* e.g. "jpg" */
|
|
|
|
str=image_type_to_string(args->imagetype,0);
|
|
|
|
/* fall through */
|
|
|
|
|
|
|
|
case 'T': /* e.g. "image/jpeg" */
|
|
|
|
if(str==NULL)
|
|
|
|
str=image_type_to_string(args->imagetype,2);
|
|
|
|
|
|
|
|
if(idx+strlen(str)<maxlen)
|
|
|
|
{
|
|
|
|
strcpy(&ret[idx],str);
|
|
|
|
idx+=strlen(str);
|
|
|
|
done=1;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case '%':
|
|
|
|
if(idx+1<maxlen)
|
|
|
|
{
|
|
|
|
ret[idx++]='%';
|
|
|
|
ret[idx]='\0';
|
|
|
|
done=1;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
/* Any unknown %-keys (like %i, %o, %I, and %O) are
|
|
|
|
passed through for later expansion. Note this also
|
|
|
|
handles the case where the last character in the
|
|
|
|
string is a '%' - the terminating \0 will end up here
|
|
|
|
and properly terminate the string. */
|
|
|
|
default:
|
|
|
|
if(idx+2<maxlen)
|
|
|
|
{
|
|
|
|
ret[idx++]='%';
|
|
|
|
ret[idx++]=*(ch+1);
|
|
|
|
ret[idx]='\0';
|
|
|
|
done=1;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if(done)
|
|
|
|
ch++;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if(idx+1<maxlen)
|
|
|
|
{
|
|
|
|
ret[idx++]=*ch;
|
|
|
|
ret[idx]='\0';
|
|
|
|
done=1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if(done)
|
|
|
|
ch++;
|
|
|
|
}
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
fail:
|
|
|
|
m_free(ret);
|
|
|
|
return NULL;
|
1999-11-13 17:43:23 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
int
|
2002-06-29 15:46:34 +02:00
|
|
|
hextobyte( const char *s )
|
1999-11-13 17:43:23 +01:00
|
|
|
{
|
2002-06-29 15:46:34 +02:00
|
|
|
int c;
|
|
|
|
|
|
|
|
if( *s >= '0' && *s <= '9' )
|
|
|
|
c = 16 * (*s - '0');
|
|
|
|
else if( *s >= 'A' && *s <= 'F' )
|
|
|
|
c = 16 * (10 + *s - 'A');
|
|
|
|
else if( *s >= 'a' && *s <= 'f' )
|
|
|
|
c = 16 * (10 + *s - 'a');
|
|
|
|
else
|
|
|
|
return -1;
|
|
|
|
s++;
|
|
|
|
if( *s >= '0' && *s <= '9' )
|
|
|
|
c += *s - '0';
|
|
|
|
else if( *s >= 'A' && *s <= 'F' )
|
|
|
|
c += 10 + *s - 'A';
|
|
|
|
else if( *s >= 'a' && *s <= 'f' )
|
|
|
|
c += 10 + *s - 'a';
|
|
|
|
else
|
|
|
|
return -1;
|
|
|
|
return c;
|
1999-11-13 17:43:23 +01:00
|
|
|
}
|
|
|
|
|
2002-06-29 15:46:34 +02:00
|
|
|
void
|
|
|
|
deprecated_warning(const char *configname,unsigned int configlineno,
|
|
|
|
const char *option,const char *repl1,const char *repl2)
|
1999-12-31 12:44:29 +01:00
|
|
|
{
|
2002-06-29 15:46:34 +02:00
|
|
|
if(configname)
|
|
|
|
{
|
|
|
|
if(strncmp("--",option,2)==0)
|
|
|
|
option+=2;
|
2000-01-24 12:55:49 +01:00
|
|
|
|
2002-06-29 15:46:34 +02:00
|
|
|
if(strncmp("--",repl1,2)==0)
|
|
|
|
repl1+=2;
|
|
|
|
|
|
|
|
log_info(_("%s:%d: deprecated option \"%s\"\n"),
|
|
|
|
configname,configlineno,option);
|
2000-01-24 12:55:49 +01:00
|
|
|
}
|
2002-06-29 15:46:34 +02:00
|
|
|
else
|
|
|
|
log_info(_("WARNING: \"%s\" is a deprecated option\n"),option);
|
|
|
|
|
|
|
|
log_info(_("please use \"%s%s\" instead\n"),repl1,repl2);
|
|
|
|
}
|
|
|
|
|
|
|
|
const char *
|
|
|
|
compress_algo_to_string(int algo)
|
|
|
|
{
|
|
|
|
const char *s="?";
|
2000-01-24 12:55:49 +01:00
|
|
|
|
2002-06-29 15:46:34 +02:00
|
|
|
switch(algo)
|
|
|
|
{
|
|
|
|
case 0:
|
|
|
|
s="Uncompressed";
|
|
|
|
break;
|
2000-07-25 17:38:12 +02:00
|
|
|
|
2002-06-29 15:46:34 +02:00
|
|
|
case 1:
|
|
|
|
s="ZIP";
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 2:
|
|
|
|
s="ZLIB";
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
return s;
|
1999-12-31 12:44:29 +01:00
|
|
|
}
|
|
|
|
|
2002-11-03 01:00:42 +01:00
|
|
|
int
|
|
|
|
string_to_compress_algo(const char *string)
|
|
|
|
{
|
|
|
|
if(ascii_strcasecmp(string,"uncompressed")==0)
|
|
|
|
return 0;
|
|
|
|
else if(ascii_strcasecmp(string,"zip")==0)
|
|
|
|
return 1;
|
|
|
|
else if(ascii_strcasecmp(string,"zlib")==0)
|
|
|
|
return 2;
|
|
|
|
else if(ascii_strcasecmp(string,"z0")==0)
|
|
|
|
return 0;
|
|
|
|
else if(ascii_strcasecmp(string,"z1")==0)
|
|
|
|
return 1;
|
|
|
|
else if(ascii_strcasecmp(string,"z2")==0)
|
|
|
|
return 2;
|
|
|
|
else
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2002-06-29 15:46:34 +02:00
|
|
|
int
|
|
|
|
check_compress_algo(int algo)
|
|
|
|
{
|
|
|
|
if(algo>=0 && algo<=2)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
return G10ERR_COMPR_ALGO;
|
|
|
|
}
|
2002-11-25 05:24:41 +01:00
|
|
|
|
|
|
|
int
|
|
|
|
default_cipher_algo(void)
|
|
|
|
{
|
|
|
|
if(opt.def_cipher_algo)
|
|
|
|
return opt.def_cipher_algo;
|
|
|
|
else if(opt.personal_cipher_prefs)
|
|
|
|
return opt.personal_cipher_prefs[0].value;
|
|
|
|
else
|
|
|
|
return opt.s2k_cipher_algo;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* There is no default_digest_algo function, but see
|
|
|
|
sign.c:hash_for */
|
|
|
|
|
|
|
|
int
|
|
|
|
default_compress_algo(void)
|
|
|
|
{
|
|
|
|
if(opt.def_compress_algo!=-1)
|
|
|
|
return opt.def_compress_algo;
|
|
|
|
else if(opt.personal_compress_prefs)
|
|
|
|
return opt.personal_compress_prefs[0].value;
|
|
|
|
else
|
|
|
|
return DEFAULT_COMPRESS_ALGO;
|
|
|
|
}
|
* packet.h, build-packet.c (build_sig_subpkt), export.c
(do_export_stream), import.c (remove_bad_stuff, import), parse-packet.c
(dump_sig_subpkt, parse_one_sig_subpkt): Remove vestigal code for the old
sig cache subpacket. This wasn't completely harmless as it caused
subpacket 101 to disappear on import and export.
* options.h, armor.c, cipher.c, g10.c, keyedit.c, pkclist.c, sign.c,
encode.c, getkey.c, revoke.c: The current flags for different levels of
PGP-ness are massively complex. This is step one in simplifying them. No
functional change yet, just use a macro to check for compliance level.
* sign.c (sign_file): Fix bug that causes spurious compression preference
warning.
* sign.c (clearsign_file): Fix bug that prevents proper warning message
from appearing when clearsigning in --pgp2 mode with a non-v3 RSA key.
* main.h, misc.c (compliance_option_string, compliance_string,
compliance_failure), pkclist.c (build_pk_list), sign.c (sign_file,
clearsign_file), encode.c (encode_crypt, write_pubkey_enc_from_list): New
functions to put the "this message may not be usable...." warning in one
place.
* options.h, g10.c (main): Part two of the simplification. Use a single
enum to indicate what we are compliant to (1991, 2440, PGPx, etc.)
* g10.c (main): Show errors for failure in export, send-keys, recv-keys,
and refresh-keys.
* options.h, g10.c (main): Give algorithm warnings for algorithms chosen
against the --pgpX and --openpgp rules.
* keydb.h, pkclist.c (algo_available): Make TIGER192 invalid in --openpgp
mode.
* sign.c (sign_file), pkclist.c (algo_available): Allow passing a hint of
0.
2003-05-03 06:07:45 +02:00
|
|
|
|
|
|
|
const char *
|
|
|
|
compliance_option_string(void)
|
|
|
|
{
|
|
|
|
switch(opt.compliance)
|
|
|
|
{
|
|
|
|
case CO_RFC2440:
|
|
|
|
return "--openpgp";
|
|
|
|
case CO_PGP2:
|
|
|
|
return "--pgp2";
|
|
|
|
case CO_PGP6:
|
|
|
|
return "--pgp6";
|
|
|
|
case CO_PGP7:
|
|
|
|
return "--pgp7";
|
|
|
|
case CO_PGP8:
|
|
|
|
return "--pgp8";
|
|
|
|
default:
|
|
|
|
return "???";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static const char *
|
|
|
|
compliance_string(void)
|
|
|
|
{
|
|
|
|
switch(opt.compliance)
|
|
|
|
{
|
|
|
|
case CO_RFC2440:
|
|
|
|
return "OpenPGP";
|
|
|
|
case CO_PGP2:
|
|
|
|
return "PGP 2.x";
|
|
|
|
case CO_PGP6:
|
|
|
|
return "PGP 6.x";
|
|
|
|
case CO_PGP7:
|
|
|
|
return "PGP 7.x";
|
|
|
|
case CO_PGP8:
|
|
|
|
return "PGP 8.x";
|
|
|
|
default:
|
|
|
|
return "???";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
compliance_failure(void)
|
|
|
|
{
|
|
|
|
log_info(_("this message may not be usable by %s\n"),compliance_string());
|
|
|
|
opt.compliance=CO_GNUPG;
|
|
|
|
}
|
2003-05-31 23:52:16 +02:00
|
|
|
|
|
|
|
int
|
|
|
|
parse_options(char *str,unsigned int *options,struct parse_options *opts)
|
|
|
|
{
|
|
|
|
char *tok;
|
|
|
|
|
|
|
|
while((tok=strsep(&str," ,")))
|
|
|
|
{
|
|
|
|
int i,rev=0;
|
|
|
|
|
|
|
|
if(tok[0]=='\0')
|
|
|
|
continue;
|
|
|
|
|
|
|
|
if(ascii_strncasecmp("no-",tok,3)==0)
|
|
|
|
{
|
|
|
|
rev=1;
|
|
|
|
tok+=3;
|
|
|
|
}
|
|
|
|
|
|
|
|
for(i=0;opts[i].name;i++)
|
|
|
|
{
|
|
|
|
if(ascii_strcasecmp(opts[i].name,tok)==0)
|
|
|
|
{
|
|
|
|
if(rev)
|
|
|
|
*options&=~opts[i].bit;
|
|
|
|
else
|
|
|
|
*options|=opts[i].bit;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if(!opts[i].name)
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|