1998-04-07 18:16:10 +00:00
|
|
|
/* misc.c - miscellaneous functions
|
2002-04-29 14:42:34 +00:00
|
|
|
* Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
|
1998-04-07 18:16:10 +00:00
|
|
|
*
|
1998-12-23 12:41:40 +00:00
|
|
|
* This file is part of GnuPG.
|
1998-04-07 18:16:10 +00:00
|
|
|
*
|
1998-12-23 12:41:40 +00:00
|
|
|
* GnuPG is free software; you can redistribute it and/or modify
|
1998-04-07 18:16:10 +00: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 12:41:40 +00:00
|
|
|
* GnuPG is distributed in the hope that it will be useful,
|
1998-04-07 18:16:10 +00: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>
|
2000-10-13 15:03:48 +00:00
|
|
|
#include <unistd.h>
|
1998-07-14 17:10:28 +00:00
|
|
|
#include <errno.h>
|
2001-12-20 05:02:30 +00:00
|
|
|
#ifdef HAVE_STAT
|
|
|
|
#include <sys/stat.h>
|
|
|
|
#endif
|
1998-12-17 17:36:05 +00:00
|
|
|
#if defined(__linux__) && defined(__alpha__) && __GLIBC__ < 2
|
1998-05-15 18:49:19 +00:00
|
|
|
#include <asm/sysinfo.h>
|
|
|
|
#include <asm/unistd.h>
|
|
|
|
#endif
|
1998-07-14 17:10:28 +00:00
|
|
|
#ifdef HAVE_SETRLIMIT
|
2001-03-12 20:21:50 +00:00
|
|
|
#include <time.h>
|
1998-07-14 17:10:28 +00:00
|
|
|
#include <sys/time.h>
|
|
|
|
#include <sys/resource.h>
|
|
|
|
#endif
|
1998-04-07 18:16:10 +00:00
|
|
|
#include "util.h"
|
|
|
|
#include "main.h"
|
* photoid.h, photoid.c (parse_image_header, image_type_to_string): Useful
functions to return data about an image.
* packet.h, parse-packet.c (make_attribute_uidname,
parse_attribute_subpkts, parse_attribute), photoid.h, photoid.c
(show_photos): Handle multiple images in a single attribute packet.
* main.h, misc.c (pct_expando), sign.c (mk_notation_and_policy), photoid.c
(show_photos): Simpler expando code that does not require using
compile-time string sizes. Call image_type_to_string to get image strings
(i.e. "jpg", "image/jpeg"). Change all callers.
* keyedit.c (menu_showphoto), keylist.c (list_keyblock_print): Allow
viewing multiple images within a single attribute packet.
* gpgv.c: Various stubs for link happiness.
2002-05-02 20:47:23 +00:00
|
|
|
#include "photoid.h"
|
1998-06-15 15:41:04 +00:00
|
|
|
#include "options.h"
|
1998-11-10 12:59:59 +00:00
|
|
|
#include "i18n.h"
|
1998-04-07 18:16:10 +00:00
|
|
|
|
1998-06-16 15:13:28 +00:00
|
|
|
|
|
|
|
const char *g10m_revision_string(int);
|
|
|
|
const char *g10c_revision_string(int);
|
|
|
|
const char *g10u_revision_string(int);
|
|
|
|
|
1999-05-20 12:11:41 +00:00
|
|
|
#ifdef __GNUC__
|
|
|
|
volatile
|
|
|
|
#endif
|
|
|
|
void
|
1998-06-15 15:41:04 +00:00
|
|
|
pull_in_libs(void)
|
|
|
|
{
|
|
|
|
g10m_revision_string(0);
|
|
|
|
g10c_revision_string(0);
|
|
|
|
g10u_revision_string(0);
|
|
|
|
}
|
1998-04-07 18:16:10 +00:00
|
|
|
|
1998-05-15 18:49:19 +00:00
|
|
|
|
1998-12-17 17:36:05 +00:00
|
|
|
#if defined(__linux__) && defined(__alpha__) && __GLIBC__ < 2
|
1998-05-15 18:49:19 +00:00
|
|
|
#warning using trap_unaligned
|
|
|
|
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-14 12:20:30 +00:00
|
|
|
int
|
1998-07-14 17:10:28 +00:00
|
|
|
disable_core_dumps()
|
|
|
|
{
|
2000-09-14 12:20:30 +00:00
|
|
|
#ifdef HAVE_DOSISH_SYSTEM
|
|
|
|
return 0;
|
|
|
|
#else
|
1998-07-14 17:10:28 +00:00
|
|
|
#ifdef HAVE_SETRLIMIT
|
|
|
|
struct rlimit limit;
|
|
|
|
|
|
|
|
limit.rlim_cur = 0;
|
|
|
|
limit.rlim_max = 0;
|
1998-12-29 13:47:31 +00:00
|
|
|
if( !setrlimit( RLIMIT_CORE, &limit ) )
|
2000-09-14 12:20:30 +00:00
|
|
|
return 0;
|
|
|
|
if( errno != EINVAL && errno != ENOSYS )
|
1998-11-10 12:59:59 +00:00
|
|
|
log_fatal(_("can't disable core dumps: %s\n"), strerror(errno) );
|
1998-07-14 17:10:28 +00:00
|
|
|
#endif
|
2000-09-14 12:20:30 +00:00
|
|
|
return 1;
|
1999-08-30 18:48:57 +00:00
|
|
|
#endif
|
1998-07-14 17:10:28 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
1998-04-07 18:16:10 +00:00
|
|
|
u16
|
|
|
|
checksum_u16( unsigned n )
|
|
|
|
{
|
|
|
|
u16 a;
|
|
|
|
|
|
|
|
a = (n >> 8) & 0xff;
|
1998-07-29 19:35:05 +00:00
|
|
|
if( opt.emulate_bugs & EMUBUG_GPGCHKSUM ) {
|
1998-06-15 15:41:04 +00:00
|
|
|
a |= n & 0xff;
|
|
|
|
log_debug("csum_u16 emulated for n=%u\n", n);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
a += n & 0xff;
|
|
|
|
return a;
|
|
|
|
}
|
|
|
|
|
|
|
|
static u16
|
|
|
|
checksum_u16_nobug( unsigned n )
|
|
|
|
{
|
|
|
|
u16 a;
|
|
|
|
|
|
|
|
a = (n >> 8) & 0xff;
|
|
|
|
a += n & 0xff;
|
1998-04-07 18:16:10 +00:00
|
|
|
return a;
|
|
|
|
}
|
|
|
|
|
|
|
|
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;
|
|
|
|
unsigned nbytes;
|
1998-06-15 15:41:04 +00:00
|
|
|
unsigned nbits;
|
1998-04-07 18:16:10 +00:00
|
|
|
|
|
|
|
buffer = mpi_get_buffer( a, &nbytes, NULL );
|
1998-06-15 15:41:04 +00:00
|
|
|
/* some versions of gpg encode wrong values for the length of an mpi
|
|
|
|
* so that mpi_get_nbits() which counts the mpi yields another (shorter)
|
|
|
|
* value than the one store with the mpi. mpi_get_nbit_info() returns
|
|
|
|
* this stored value if it is still available.
|
|
|
|
*/
|
|
|
|
|
1998-07-29 19:35:05 +00:00
|
|
|
if( opt.emulate_bugs & EMUBUG_GPGCHKSUM )
|
1998-06-15 15:41:04 +00:00
|
|
|
nbits = 0;
|
|
|
|
else
|
|
|
|
nbits = mpi_get_nbit_info(a);
|
|
|
|
if( !nbits )
|
|
|
|
nbits = mpi_get_nbits(a);
|
|
|
|
csum = checksum_u16( nbits );
|
1998-04-07 18:16:10 +00:00
|
|
|
csum += checksum( buffer, nbytes );
|
|
|
|
m_free( buffer );
|
|
|
|
return csum;
|
|
|
|
}
|
|
|
|
|
1998-06-15 15:41:04 +00:00
|
|
|
/****************
|
|
|
|
* This is the correct function
|
|
|
|
*/
|
|
|
|
u16
|
|
|
|
checksum_mpi_counted_nbits( MPI a )
|
|
|
|
{
|
|
|
|
u16 csum;
|
|
|
|
byte *buffer;
|
|
|
|
unsigned nbytes;
|
|
|
|
unsigned nbits;
|
|
|
|
|
|
|
|
buffer = mpi_get_buffer( a, &nbytes, NULL );
|
|
|
|
nbits = mpi_get_nbits(a);
|
1998-06-16 15:13:28 +00:00
|
|
|
mpi_set_nbit_info(a,nbits);
|
1998-06-15 15:41:04 +00:00
|
|
|
csum = checksum_u16_nobug( nbits );
|
|
|
|
csum += checksum( buffer, nbytes );
|
|
|
|
m_free( buffer );
|
|
|
|
return csum;
|
|
|
|
}
|
1998-04-07 18:16:10 +00:00
|
|
|
|
1998-06-25 10:19:08 +00: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 19:20:47 +00: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();
|
|
|
|
else if( algo == CIPHER_ALGO_3DES
|
|
|
|
|| algo == CIPHER_ALGO_CAST5
|
|
|
|
|| algo == CIPHER_ALGO_BLOWFISH
|
1999-04-07 18:58:34 +00:00
|
|
|
|| algo == CIPHER_ALGO_TWOFISH
|
2000-10-18 15:06:45 +00:00
|
|
|
|| algo == CIPHER_ALGO_RIJNDAEL
|
|
|
|
|| algo == CIPHER_ALGO_RIJNDAEL192
|
|
|
|
|| algo == CIPHER_ALGO_RIJNDAEL256
|
1998-12-10 19:20:47 +00:00
|
|
|
)
|
|
|
|
;
|
|
|
|
else {
|
|
|
|
static int did_note = 0;
|
|
|
|
|
|
|
|
if( !did_note ) {
|
|
|
|
did_note = 1;
|
2000-10-18 16:41:09 +00:00
|
|
|
log_info(_("this cipher algorithm is deprecated; "
|
2001-04-23 11:44:46 +00:00
|
|
|
"please use a more standard one!\n"));
|
1998-12-10 19:20:47 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
print_digest_algo_note( int algo )
|
|
|
|
{
|
|
|
|
if( algo >= 100 && algo <= 110 )
|
|
|
|
no_exp_algo();
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2000-10-13 15:03:48 +00: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 ) {
|
2001-03-27 09:23:14 +00:00
|
|
|
volatile ulong aa, bb; /* we really want the uninitialized value */
|
2000-10-13 15:03:48 +00:00
|
|
|
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;
|
|
|
|
}
|
1998-12-10 19:20:47 +00:00
|
|
|
|
2001-02-08 16:28:28 +00:00
|
|
|
/****************
|
|
|
|
* Wrapper around the libgcrypt function with addional checks on
|
|
|
|
* openPGP contraints for the algo ID.
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
openpgp_cipher_test_algo( int algo )
|
|
|
|
{
|
|
|
|
if( algo < 0 || algo > 110 )
|
|
|
|
return G10ERR_CIPHER_ALGO;
|
|
|
|
return check_cipher_algo(algo);
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
openpgp_pk_test_algo( int algo, unsigned int usage_flags )
|
|
|
|
{
|
|
|
|
if( algo < 0 || algo > 110 )
|
|
|
|
return G10ERR_PUBKEY_ALGO;
|
|
|
|
return check_pubkey_algo2( algo, usage_flags );
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
openpgp_pk_algo_usage ( int algo )
|
|
|
|
{
|
2001-09-09 16:09:19 +00:00
|
|
|
int use = 0;
|
2001-02-08 16:28:28 +00:00
|
|
|
|
|
|
|
/* they are hardwired in gpg 1.0 */
|
|
|
|
switch ( algo ) {
|
|
|
|
case PUBKEY_ALGO_RSA:
|
2001-09-09 16:09:19 +00:00
|
|
|
use = PUBKEY_USAGE_SIG | PUBKEY_USAGE_ENC;
|
2001-02-08 16:28:28 +00:00
|
|
|
break;
|
|
|
|
case PUBKEY_ALGO_RSA_E:
|
2001-09-09 16:09:19 +00:00
|
|
|
use = PUBKEY_USAGE_ENC;
|
2001-02-08 16:28:28 +00:00
|
|
|
break;
|
|
|
|
case PUBKEY_ALGO_RSA_S:
|
2001-09-09 16:09:19 +00:00
|
|
|
use = PUBKEY_USAGE_SIG;
|
2001-02-08 16:28:28 +00:00
|
|
|
break;
|
|
|
|
case PUBKEY_ALGO_ELGAMAL_E:
|
2001-09-09 16:09:19 +00:00
|
|
|
use = PUBKEY_USAGE_ENC;
|
2001-02-08 16:28:28 +00:00
|
|
|
break;
|
|
|
|
case PUBKEY_ALGO_DSA:
|
2001-09-09 16:09:19 +00:00
|
|
|
use = PUBKEY_USAGE_SIG;
|
2001-02-08 16:28:28 +00:00
|
|
|
break;
|
|
|
|
case PUBKEY_ALGO_ELGAMAL:
|
2001-09-09 16:09:19 +00:00
|
|
|
use = PUBKEY_USAGE_SIG | PUBKEY_USAGE_ENC;
|
2001-02-08 16:28:28 +00:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
2001-09-09 16:09:19 +00:00
|
|
|
return use;
|
2001-02-08 16:28:28 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
openpgp_md_test_algo( int algo )
|
|
|
|
{
|
|
|
|
if( algo < 0 || algo > 110 )
|
|
|
|
return G10ERR_DIGEST_ALGO;
|
|
|
|
return check_digest_algo(algo);
|
|
|
|
}
|
|
|
|
|
2001-12-20 05:02:30 +00:00
|
|
|
int
|
2001-12-29 04:43:11 +00:00
|
|
|
check_permissions(const char *path,int extension,int checkonly)
|
2001-12-20 05:02:30 +00:00
|
|
|
{
|
2001-12-27 20:48:05 +00:00
|
|
|
#if defined(HAVE_STAT) && !defined(HAVE_DOSISH_SYSTEM)
|
2001-12-29 04:43:11 +00:00
|
|
|
char *tmppath;
|
2001-12-20 05:02:30 +00:00
|
|
|
struct stat statbuf;
|
2001-12-29 04:43:11 +00:00
|
|
|
int ret=1;
|
2001-12-20 05:02:30 +00:00
|
|
|
int isdir=0;
|
2001-02-08 16:28:28 +00:00
|
|
|
|
2001-12-20 05:02:30 +00:00
|
|
|
if(opt.no_perm_warn)
|
|
|
|
return 0;
|
2001-02-08 16:28:28 +00:00
|
|
|
|
2001-12-29 04:43:11 +00:00
|
|
|
if(extension && path[0]!=DIRSEP_C)
|
|
|
|
{
|
|
|
|
if(strchr(path,DIRSEP_C))
|
|
|
|
tmppath=make_filename(path,NULL);
|
|
|
|
else
|
|
|
|
tmppath=make_filename(GNUPG_LIBDIR,path,NULL);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
tmppath=m_strdup(path);
|
|
|
|
|
2001-12-20 05:02:30 +00:00
|
|
|
/* It's okay if the file doesn't exist */
|
2001-12-29 04:43:11 +00:00
|
|
|
if(stat(tmppath,&statbuf)!=0)
|
|
|
|
{
|
|
|
|
ret=0;
|
|
|
|
goto end;
|
|
|
|
}
|
2001-02-08 16:28:28 +00:00
|
|
|
|
2002-05-13 20:44:30 +00:00
|
|
|
/* We may have to revisit this if we start piping keyrings to gpg
|
|
|
|
over a named pipe or keyserver character device :) */
|
|
|
|
if(!S_ISREG(statbuf.st_mode))
|
|
|
|
{
|
|
|
|
ret=0;
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
|
2001-12-20 05:02:30 +00:00
|
|
|
isdir=S_ISDIR(statbuf.st_mode);
|
2001-02-08 16:28:28 +00:00
|
|
|
|
2001-12-29 04:43:11 +00:00
|
|
|
/* Per-user files must be owned by the user. Extensions must be
|
|
|
|
owned by the user or root. */
|
|
|
|
if((!extension && statbuf.st_uid != getuid()) ||
|
|
|
|
(extension && statbuf.st_uid!=0 && statbuf.st_uid!=getuid()))
|
2001-12-20 05:02:30 +00:00
|
|
|
{
|
|
|
|
if(!checkonly)
|
|
|
|
log_info(_("Warning: unsafe ownership on %s \"%s\"\n"),
|
2001-12-29 04:43:11 +00:00
|
|
|
isdir?"directory":extension?"extension":"file",path);
|
|
|
|
goto end;
|
2001-12-20 05:02:30 +00:00
|
|
|
}
|
2001-02-08 16:28:28 +00:00
|
|
|
|
2001-12-20 05:02:30 +00:00
|
|
|
/* This works for both directories and files - basically, we don't
|
|
|
|
care what the owner permissions are, so long as the group and
|
2001-12-29 04:43:11 +00:00
|
|
|
other permissions are 0 for per-user files, and non-writable for
|
|
|
|
extensions. */
|
|
|
|
if((extension && (statbuf.st_mode & (S_IWGRP|S_IWOTH)) !=0) ||
|
|
|
|
(!extension && (statbuf.st_mode & (S_IRWXG|S_IRWXO)) != 0))
|
2001-12-20 05:02:30 +00:00
|
|
|
{
|
|
|
|
char *dir;
|
|
|
|
|
|
|
|
/* However, if the directory the directory/file is in is owned
|
|
|
|
by the user and is 700, then this is not a problem.
|
|
|
|
Theoretically, we could walk this test up to the root
|
|
|
|
directory /, but for the sake of sanity, I'm stopping at one
|
|
|
|
level down. */
|
|
|
|
|
2001-12-29 04:43:11 +00:00
|
|
|
dir=make_dirname(tmppath);
|
2001-12-20 05:02:30 +00:00
|
|
|
if(stat(dir,&statbuf)==0 && statbuf.st_uid==getuid() &&
|
|
|
|
S_ISDIR(statbuf.st_mode) && (statbuf.st_mode & (S_IRWXG|S_IRWXO))==0)
|
|
|
|
{
|
|
|
|
m_free(dir);
|
2001-12-29 04:43:11 +00:00
|
|
|
ret=0;
|
|
|
|
goto end;
|
2001-12-20 05:02:30 +00:00
|
|
|
}
|
2001-02-08 16:28:28 +00:00
|
|
|
|
2001-12-20 05:02:30 +00:00
|
|
|
m_free(dir);
|
2001-02-08 16:28:28 +00:00
|
|
|
|
2001-12-20 05:02:30 +00:00
|
|
|
if(!checkonly)
|
|
|
|
log_info(_("Warning: unsafe permissions on %s \"%s\"\n"),
|
2001-12-29 04:43:11 +00:00
|
|
|
isdir?"directory":extension?"extension":"file",path);
|
|
|
|
goto end;
|
2001-12-20 05:02:30 +00:00
|
|
|
}
|
2001-12-27 20:48:05 +00:00
|
|
|
|
2001-12-29 04:43:11 +00:00
|
|
|
ret=0;
|
|
|
|
|
|
|
|
end:
|
|
|
|
m_free(tmppath);
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
|
2001-12-27 20:48:05 +00:00
|
|
|
#endif /* HAVE_STAT && !HAVE_DOSISH_SYSTEM */
|
2001-02-08 16:28:28 +00:00
|
|
|
|
2001-12-20 05:02:30 +00:00
|
|
|
return 0;
|
|
|
|
}
|
2002-01-09 19:59:26 +00:00
|
|
|
|
|
|
|
/* Special warning for the IDEA cipher */
|
|
|
|
void
|
|
|
|
idea_cipher_warn(int show)
|
|
|
|
{
|
|
|
|
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;
|
|
|
|
}
|
|
|
|
}
|
2002-02-05 00:04:24 +00:00
|
|
|
|
2002-02-10 00:18:54 +00:00
|
|
|
/* Expand %-strings. Returns a string which must be m_freed. Returns
|
|
|
|
NULL if the string cannot be expanded (too large). */
|
2002-02-05 00:04:24 +00:00
|
|
|
char *
|
* photoid.h, photoid.c (parse_image_header, image_type_to_string): Useful
functions to return data about an image.
* packet.h, parse-packet.c (make_attribute_uidname,
parse_attribute_subpkts, parse_attribute), photoid.h, photoid.c
(show_photos): Handle multiple images in a single attribute packet.
* main.h, misc.c (pct_expando), sign.c (mk_notation_and_policy), photoid.c
(show_photos): Simpler expando code that does not require using
compile-time string sizes. Call image_type_to_string to get image strings
(i.e. "jpg", "image/jpeg"). Change all callers.
* keyedit.c (menu_showphoto), keylist.c (list_keyblock_print): Allow
viewing multiple images within a single attribute packet.
* gpgv.c: Various stubs for link happiness.
2002-05-02 20:47:23 +00:00
|
|
|
pct_expando(const char *string,struct expando_args *args)
|
2002-02-05 00:04:24 +00:00
|
|
|
{
|
|
|
|
const char *ch=string;
|
* photoid.h, photoid.c (parse_image_header, image_type_to_string): Useful
functions to return data about an image.
* packet.h, parse-packet.c (make_attribute_uidname,
parse_attribute_subpkts, parse_attribute), photoid.h, photoid.c
(show_photos): Handle multiple images in a single attribute packet.
* main.h, misc.c (pct_expando), sign.c (mk_notation_and_policy), photoid.c
(show_photos): Simpler expando code that does not require using
compile-time string sizes. Call image_type_to_string to get image strings
(i.e. "jpg", "image/jpeg"). Change all callers.
* keyedit.c (menu_showphoto), keylist.c (list_keyblock_print): Allow
viewing multiple images within a single attribute packet.
* gpgv.c: Various stubs for link happiness.
2002-05-02 20:47:23 +00:00
|
|
|
int idx=0,maxlen=0,done=0;
|
2002-05-27 01:00:11 +00:00
|
|
|
u32 pk_keyid[2]={0,0},sk_keyid[2]={0,0};
|
* photoid.h, photoid.c (parse_image_header, image_type_to_string): Useful
functions to return data about an image.
* packet.h, parse-packet.c (make_attribute_uidname,
parse_attribute_subpkts, parse_attribute), photoid.h, photoid.c
(show_photos): Handle multiple images in a single attribute packet.
* main.h, misc.c (pct_expando), sign.c (mk_notation_and_policy), photoid.c
(show_photos): Simpler expando code that does not require using
compile-time string sizes. Call image_type_to_string to get image strings
(i.e. "jpg", "image/jpeg"). Change all callers.
* keyedit.c (menu_showphoto), keylist.c (list_keyblock_print): Allow
viewing multiple images within a single attribute packet.
* gpgv.c: Various stubs for link happiness.
2002-05-02 20:47:23 +00:00
|
|
|
char *ret=NULL;
|
2002-02-05 00:04:24 +00:00
|
|
|
|
* photoid.h, photoid.c (parse_image_header, image_type_to_string): Useful
functions to return data about an image.
* packet.h, parse-packet.c (make_attribute_uidname,
parse_attribute_subpkts, parse_attribute), photoid.h, photoid.c
(show_photos): Handle multiple images in a single attribute packet.
* main.h, misc.c (pct_expando), sign.c (mk_notation_and_policy), photoid.c
(show_photos): Simpler expando code that does not require using
compile-time string sizes. Call image_type_to_string to get image strings
(i.e. "jpg", "image/jpeg"). Change all callers.
* keyedit.c (menu_showphoto), keylist.c (list_keyblock_print): Allow
viewing multiple images within a single attribute packet.
* gpgv.c: Various stubs for link happiness.
2002-05-02 20:47:23 +00:00
|
|
|
if(args->pk)
|
2002-05-27 01:00:11 +00:00
|
|
|
keyid_from_pk(args->pk,pk_keyid);
|
|
|
|
|
|
|
|
if(args->sk)
|
|
|
|
keyid_from_sk(args->sk,sk_keyid);
|
2002-02-05 00:04:24 +00:00
|
|
|
|
|
|
|
while(*ch!='\0')
|
|
|
|
{
|
* photoid.h, photoid.c (parse_image_header, image_type_to_string): Useful
functions to return data about an image.
* packet.h, parse-packet.c (make_attribute_uidname,
parse_attribute_subpkts, parse_attribute), photoid.h, photoid.c
(show_photos): Handle multiple images in a single attribute packet.
* main.h, misc.c (pct_expando), sign.c (mk_notation_and_policy), photoid.c
(show_photos): Simpler expando code that does not require using
compile-time string sizes. Call image_type_to_string to get image strings
(i.e. "jpg", "image/jpeg"). Change all callers.
* keyedit.c (menu_showphoto), keylist.c (list_keyblock_print): Allow
viewing multiple images within a single attribute packet.
* gpgv.c: Various stubs for link happiness.
2002-05-02 20:47:23 +00:00
|
|
|
char *str=NULL;
|
|
|
|
|
|
|
|
if(!done)
|
2002-02-05 00:04:24 +00:00
|
|
|
{
|
* photoid.h, photoid.c (parse_image_header, image_type_to_string): Useful
functions to return data about an image.
* packet.h, parse-packet.c (make_attribute_uidname,
parse_attribute_subpkts, parse_attribute), photoid.h, photoid.c
(show_photos): Handle multiple images in a single attribute packet.
* main.h, misc.c (pct_expando), sign.c (mk_notation_and_policy), photoid.c
(show_photos): Simpler expando code that does not require using
compile-time string sizes. Call image_type_to_string to get image strings
(i.e. "jpg", "image/jpeg"). Change all callers.
* keyedit.c (menu_showphoto), keylist.c (list_keyblock_print): Allow
viewing multiple images within a single attribute packet.
* gpgv.c: Various stubs for link happiness.
2002-05-02 20:47:23 +00:00
|
|
|
/* 8192 is way bigger than we'll need here */
|
|
|
|
if(maxlen>=8192)
|
|
|
|
goto fail;
|
|
|
|
|
|
|
|
maxlen+=1024;
|
|
|
|
ret=m_realloc(ret,maxlen);
|
2002-02-05 00:04:24 +00:00
|
|
|
}
|
|
|
|
|
* photoid.h, photoid.c (parse_image_header, image_type_to_string): Useful
functions to return data about an image.
* packet.h, parse-packet.c (make_attribute_uidname,
parse_attribute_subpkts, parse_attribute), photoid.h, photoid.c
(show_photos): Handle multiple images in a single attribute packet.
* main.h, misc.c (pct_expando), sign.c (mk_notation_and_policy), photoid.c
(show_photos): Simpler expando code that does not require using
compile-time string sizes. Call image_type_to_string to get image strings
(i.e. "jpg", "image/jpeg"). Change all callers.
* keyedit.c (menu_showphoto), keylist.c (list_keyblock_print): Allow
viewing multiple images within a single attribute packet.
* gpgv.c: Various stubs for link happiness.
2002-05-02 20:47:23 +00:00
|
|
|
done=0;
|
|
|
|
|
2002-02-05 00:04:24 +00:00
|
|
|
if(*ch=='%')
|
|
|
|
{
|
* photoid.h, photoid.c (parse_image_header, image_type_to_string): Useful
functions to return data about an image.
* packet.h, parse-packet.c (make_attribute_uidname,
parse_attribute_subpkts, parse_attribute), photoid.h, photoid.c
(show_photos): Handle multiple images in a single attribute packet.
* main.h, misc.c (pct_expando), sign.c (mk_notation_and_policy), photoid.c
(show_photos): Simpler expando code that does not require using
compile-time string sizes. Call image_type_to_string to get image strings
(i.e. "jpg", "image/jpeg"). Change all callers.
* keyedit.c (menu_showphoto), keylist.c (list_keyblock_print): Allow
viewing multiple images within a single attribute packet.
* gpgv.c: Various stubs for link happiness.
2002-05-02 20:47:23 +00:00
|
|
|
switch(*(ch+1))
|
2002-02-05 00:04:24 +00:00
|
|
|
{
|
2002-05-27 01:00:11 +00:00
|
|
|
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;
|
|
|
|
|
2002-02-05 00:04:24 +00:00
|
|
|
case 'k': /* short key id */
|
* photoid.h, photoid.c (parse_image_header, image_type_to_string): Useful
functions to return data about an image.
* packet.h, parse-packet.c (make_attribute_uidname,
parse_attribute_subpkts, parse_attribute), photoid.h, photoid.c
(show_photos): Handle multiple images in a single attribute packet.
* main.h, misc.c (pct_expando), sign.c (mk_notation_and_policy), photoid.c
(show_photos): Simpler expando code that does not require using
compile-time string sizes. Call image_type_to_string to get image strings
(i.e. "jpg", "image/jpeg"). Change all callers.
* keyedit.c (menu_showphoto), keylist.c (list_keyblock_print): Allow
viewing multiple images within a single attribute packet.
* gpgv.c: Various stubs for link happiness.
2002-05-02 20:47:23 +00:00
|
|
|
if(idx+8<maxlen)
|
|
|
|
{
|
2002-05-27 01:00:11 +00:00
|
|
|
sprintf(&ret[idx],"%08lX",(ulong)pk_keyid[1]);
|
* photoid.h, photoid.c (parse_image_header, image_type_to_string): Useful
functions to return data about an image.
* packet.h, parse-packet.c (make_attribute_uidname,
parse_attribute_subpkts, parse_attribute), photoid.h, photoid.c
(show_photos): Handle multiple images in a single attribute packet.
* main.h, misc.c (pct_expando), sign.c (mk_notation_and_policy), photoid.c
(show_photos): Simpler expando code that does not require using
compile-time string sizes. Call image_type_to_string to get image strings
(i.e. "jpg", "image/jpeg"). Change all callers.
* keyedit.c (menu_showphoto), keylist.c (list_keyblock_print): Allow
viewing multiple images within a single attribute packet.
* gpgv.c: Various stubs for link happiness.
2002-05-02 20:47:23 +00:00
|
|
|
idx+=8;
|
|
|
|
done=1;
|
|
|
|
}
|
2002-02-05 00:04:24 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case 'K': /* long key id */
|
* photoid.h, photoid.c (parse_image_header, image_type_to_string): Useful
functions to return data about an image.
* packet.h, parse-packet.c (make_attribute_uidname,
parse_attribute_subpkts, parse_attribute), photoid.h, photoid.c
(show_photos): Handle multiple images in a single attribute packet.
* main.h, misc.c (pct_expando), sign.c (mk_notation_and_policy), photoid.c
(show_photos): Simpler expando code that does not require using
compile-time string sizes. Call image_type_to_string to get image strings
(i.e. "jpg", "image/jpeg"). Change all callers.
* keyedit.c (menu_showphoto), keylist.c (list_keyblock_print): Allow
viewing multiple images within a single attribute packet.
* gpgv.c: Various stubs for link happiness.
2002-05-02 20:47:23 +00:00
|
|
|
if(idx+16<maxlen)
|
|
|
|
{
|
|
|
|
sprintf(&ret[idx],"%08lX%08lX",
|
2002-05-27 01:00:11 +00:00
|
|
|
(ulong)pk_keyid[0],(ulong)pk_keyid[1]);
|
* photoid.h, photoid.c (parse_image_header, image_type_to_string): Useful
functions to return data about an image.
* packet.h, parse-packet.c (make_attribute_uidname,
parse_attribute_subpkts, parse_attribute), photoid.h, photoid.c
(show_photos): Handle multiple images in a single attribute packet.
* main.h, misc.c (pct_expando), sign.c (mk_notation_and_policy), photoid.c
(show_photos): Simpler expando code that does not require using
compile-time string sizes. Call image_type_to_string to get image strings
(i.e. "jpg", "image/jpeg"). Change all callers.
* keyedit.c (menu_showphoto), keylist.c (list_keyblock_print): Allow
viewing multiple images within a single attribute packet.
* gpgv.c: Various stubs for link happiness.
2002-05-02 20:47:23 +00:00
|
|
|
idx+=16;
|
|
|
|
done=1;
|
|
|
|
}
|
2002-02-05 00:04:24 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case 'f': /* fingerprint */
|
|
|
|
{
|
|
|
|
byte array[MAX_FINGERPRINT_LEN];
|
|
|
|
size_t len;
|
|
|
|
int i;
|
|
|
|
|
* photoid.h, photoid.c (parse_image_header, image_type_to_string): Useful
functions to return data about an image.
* packet.h, parse-packet.c (make_attribute_uidname,
parse_attribute_subpkts, parse_attribute), photoid.h, photoid.c
(show_photos): Handle multiple images in a single attribute packet.
* main.h, misc.c (pct_expando), sign.c (mk_notation_and_policy), photoid.c
(show_photos): Simpler expando code that does not require using
compile-time string sizes. Call image_type_to_string to get image strings
(i.e. "jpg", "image/jpeg"). Change all callers.
* keyedit.c (menu_showphoto), keylist.c (list_keyblock_print): Allow
viewing multiple images within a single attribute packet.
* gpgv.c: Various stubs for link happiness.
2002-05-02 20:47:23 +00:00
|
|
|
if(args->pk)
|
|
|
|
fingerprint_from_pk(args->pk,array,&len);
|
|
|
|
else
|
|
|
|
memset(array,0,MAX_FINGERPRINT_LEN);
|
2002-02-05 00:04:24 +00:00
|
|
|
|
* photoid.h, photoid.c (parse_image_header, image_type_to_string): Useful
functions to return data about an image.
* packet.h, parse-packet.c (make_attribute_uidname,
parse_attribute_subpkts, parse_attribute), photoid.h, photoid.c
(show_photos): Handle multiple images in a single attribute packet.
* main.h, misc.c (pct_expando), sign.c (mk_notation_and_policy), photoid.c
(show_photos): Simpler expando code that does not require using
compile-time string sizes. Call image_type_to_string to get image strings
(i.e. "jpg", "image/jpeg"). Change all callers.
* keyedit.c (menu_showphoto), keylist.c (list_keyblock_print): Allow
viewing multiple images within a single attribute packet.
* gpgv.c: Various stubs for link happiness.
2002-05-02 20:47:23 +00:00
|
|
|
if(idx+(len*2)<maxlen)
|
2002-02-05 00:04:24 +00:00
|
|
|
{
|
* photoid.h, photoid.c (parse_image_header, image_type_to_string): Useful
functions to return data about an image.
* packet.h, parse-packet.c (make_attribute_uidname,
parse_attribute_subpkts, parse_attribute), photoid.h, photoid.c
(show_photos): Handle multiple images in a single attribute packet.
* main.h, misc.c (pct_expando), sign.c (mk_notation_and_policy), photoid.c
(show_photos): Simpler expando code that does not require using
compile-time string sizes. Call image_type_to_string to get image strings
(i.e. "jpg", "image/jpeg"). Change all callers.
* keyedit.c (menu_showphoto), keylist.c (list_keyblock_print): Allow
viewing multiple images within a single attribute packet.
* gpgv.c: Various stubs for link happiness.
2002-05-02 20:47:23 +00:00
|
|
|
for(i=0;i<len;i++)
|
|
|
|
{
|
|
|
|
sprintf(&ret[idx],"%02X",array[i]);
|
|
|
|
idx+=2;
|
|
|
|
}
|
|
|
|
done=1;
|
2002-02-05 00:04:24 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
2002-04-11 04:04:41 +00:00
|
|
|
|
* photoid.h, photoid.c (parse_image_header, image_type_to_string): Useful
functions to return data about an image.
* packet.h, parse-packet.c (make_attribute_uidname,
parse_attribute_subpkts, parse_attribute), photoid.h, photoid.c
(show_photos): Handle multiple images in a single attribute packet.
* main.h, misc.c (pct_expando), sign.c (mk_notation_and_policy), photoid.c
(show_photos): Simpler expando code that does not require using
compile-time string sizes. Call image_type_to_string to get image strings
(i.e. "jpg", "image/jpeg"). Change all callers.
* keyedit.c (menu_showphoto), keylist.c (list_keyblock_print): Allow
viewing multiple images within a single attribute packet.
* gpgv.c: Various stubs for link happiness.
2002-05-02 20:47:23 +00:00
|
|
|
case 't': /* e.g. "jpg" */
|
2002-05-04 00:39:15 +00:00
|
|
|
str=image_type_to_string(args->imagetype,0);
|
* photoid.h, photoid.c (parse_image_header, image_type_to_string): Useful
functions to return data about an image.
* packet.h, parse-packet.c (make_attribute_uidname,
parse_attribute_subpkts, parse_attribute), photoid.h, photoid.c
(show_photos): Handle multiple images in a single attribute packet.
* main.h, misc.c (pct_expando), sign.c (mk_notation_and_policy), photoid.c
(show_photos): Simpler expando code that does not require using
compile-time string sizes. Call image_type_to_string to get image strings
(i.e. "jpg", "image/jpeg"). Change all callers.
* keyedit.c (menu_showphoto), keylist.c (list_keyblock_print): Allow
viewing multiple images within a single attribute packet.
* gpgv.c: Various stubs for link happiness.
2002-05-02 20:47:23 +00:00
|
|
|
/* fall through */
|
2002-04-11 04:04:41 +00:00
|
|
|
|
* photoid.h, photoid.c (parse_image_header, image_type_to_string): Useful
functions to return data about an image.
* packet.h, parse-packet.c (make_attribute_uidname,
parse_attribute_subpkts, parse_attribute), photoid.h, photoid.c
(show_photos): Handle multiple images in a single attribute packet.
* main.h, misc.c (pct_expando), sign.c (mk_notation_and_policy), photoid.c
(show_photos): Simpler expando code that does not require using
compile-time string sizes. Call image_type_to_string to get image strings
(i.e. "jpg", "image/jpeg"). Change all callers.
* keyedit.c (menu_showphoto), keylist.c (list_keyblock_print): Allow
viewing multiple images within a single attribute packet.
* gpgv.c: Various stubs for link happiness.
2002-05-02 20:47:23 +00:00
|
|
|
case 'T': /* e.g. "image/jpeg" */
|
|
|
|
if(str==NULL)
|
|
|
|
str=image_type_to_string(args->imagetype,2);
|
2002-04-23 02:48:44 +00:00
|
|
|
|
* photoid.h, photoid.c (parse_image_header, image_type_to_string): Useful
functions to return data about an image.
* packet.h, parse-packet.c (make_attribute_uidname,
parse_attribute_subpkts, parse_attribute), photoid.h, photoid.c
(show_photos): Handle multiple images in a single attribute packet.
* main.h, misc.c (pct_expando), sign.c (mk_notation_and_policy), photoid.c
(show_photos): Simpler expando code that does not require using
compile-time string sizes. Call image_type_to_string to get image strings
(i.e. "jpg", "image/jpeg"). Change all callers.
* keyedit.c (menu_showphoto), keylist.c (list_keyblock_print): Allow
viewing multiple images within a single attribute packet.
* gpgv.c: Various stubs for link happiness.
2002-05-02 20:47:23 +00:00
|
|
|
if(idx+strlen(str)<maxlen)
|
|
|
|
{
|
|
|
|
strcpy(&ret[idx],str);
|
|
|
|
idx+=strlen(str);
|
|
|
|
done=1;
|
|
|
|
}
|
2002-04-11 04:04:41 +00:00
|
|
|
break;
|
|
|
|
|
2002-02-05 00:04:24 +00:00
|
|
|
case '%':
|
* photoid.h, photoid.c (parse_image_header, image_type_to_string): Useful
functions to return data about an image.
* packet.h, parse-packet.c (make_attribute_uidname,
parse_attribute_subpkts, parse_attribute), photoid.h, photoid.c
(show_photos): Handle multiple images in a single attribute packet.
* main.h, misc.c (pct_expando), sign.c (mk_notation_and_policy), photoid.c
(show_photos): Simpler expando code that does not require using
compile-time string sizes. Call image_type_to_string to get image strings
(i.e. "jpg", "image/jpeg"). Change all callers.
* keyedit.c (menu_showphoto), keylist.c (list_keyblock_print): Allow
viewing multiple images within a single attribute packet.
* gpgv.c: Various stubs for link happiness.
2002-05-02 20:47:23 +00:00
|
|
|
if(idx+1<maxlen)
|
|
|
|
{
|
|
|
|
ret[idx++]='%';
|
|
|
|
ret[idx]='\0';
|
|
|
|
done=1;
|
|
|
|
}
|
2002-02-05 00:04:24 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
/* Any unknown %-keys (like %i, %o, %I, and %O) are
|
2002-02-10 00:18:54 +00:00
|
|
|
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. */
|
2002-02-05 00:04:24 +00:00
|
|
|
default:
|
* photoid.h, photoid.c (parse_image_header, image_type_to_string): Useful
functions to return data about an image.
* packet.h, parse-packet.c (make_attribute_uidname,
parse_attribute_subpkts, parse_attribute), photoid.h, photoid.c
(show_photos): Handle multiple images in a single attribute packet.
* main.h, misc.c (pct_expando), sign.c (mk_notation_and_policy), photoid.c
(show_photos): Simpler expando code that does not require using
compile-time string sizes. Call image_type_to_string to get image strings
(i.e. "jpg", "image/jpeg"). Change all callers.
* keyedit.c (menu_showphoto), keylist.c (list_keyblock_print): Allow
viewing multiple images within a single attribute packet.
* gpgv.c: Various stubs for link happiness.
2002-05-02 20:47:23 +00:00
|
|
|
if(idx+2<maxlen)
|
|
|
|
{
|
|
|
|
ret[idx++]='%';
|
|
|
|
ret[idx++]=*(ch+1);
|
|
|
|
ret[idx]='\0';
|
|
|
|
done=1;
|
|
|
|
}
|
2002-02-05 00:04:24 +00:00
|
|
|
break;
|
* photoid.h, photoid.c (parse_image_header, image_type_to_string): Useful
functions to return data about an image.
* packet.h, parse-packet.c (make_attribute_uidname,
parse_attribute_subpkts, parse_attribute), photoid.h, photoid.c
(show_photos): Handle multiple images in a single attribute packet.
* main.h, misc.c (pct_expando), sign.c (mk_notation_and_policy), photoid.c
(show_photos): Simpler expando code that does not require using
compile-time string sizes. Call image_type_to_string to get image strings
(i.e. "jpg", "image/jpeg"). Change all callers.
* keyedit.c (menu_showphoto), keylist.c (list_keyblock_print): Allow
viewing multiple images within a single attribute packet.
* gpgv.c: Various stubs for link happiness.
2002-05-02 20:47:23 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if(done)
|
|
|
|
ch++;
|
2002-02-05 00:04:24 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
* photoid.h, photoid.c (parse_image_header, image_type_to_string): Useful
functions to return data about an image.
* packet.h, parse-packet.c (make_attribute_uidname,
parse_attribute_subpkts, parse_attribute), photoid.h, photoid.c
(show_photos): Handle multiple images in a single attribute packet.
* main.h, misc.c (pct_expando), sign.c (mk_notation_and_policy), photoid.c
(show_photos): Simpler expando code that does not require using
compile-time string sizes. Call image_type_to_string to get image strings
(i.e. "jpg", "image/jpeg"). Change all callers.
* keyedit.c (menu_showphoto), keylist.c (list_keyblock_print): Allow
viewing multiple images within a single attribute packet.
* gpgv.c: Various stubs for link happiness.
2002-05-02 20:47:23 +00:00
|
|
|
if(idx+1<maxlen)
|
|
|
|
{
|
|
|
|
ret[idx++]=*ch;
|
|
|
|
ret[idx]='\0';
|
|
|
|
done=1;
|
|
|
|
}
|
2002-02-05 00:04:24 +00:00
|
|
|
}
|
|
|
|
|
* photoid.h, photoid.c (parse_image_header, image_type_to_string): Useful
functions to return data about an image.
* packet.h, parse-packet.c (make_attribute_uidname,
parse_attribute_subpkts, parse_attribute), photoid.h, photoid.c
(show_photos): Handle multiple images in a single attribute packet.
* main.h, misc.c (pct_expando), sign.c (mk_notation_and_policy), photoid.c
(show_photos): Simpler expando code that does not require using
compile-time string sizes. Call image_type_to_string to get image strings
(i.e. "jpg", "image/jpeg"). Change all callers.
* keyedit.c (menu_showphoto), keylist.c (list_keyblock_print): Allow
viewing multiple images within a single attribute packet.
* gpgv.c: Various stubs for link happiness.
2002-05-02 20:47:23 +00:00
|
|
|
if(done)
|
|
|
|
ch++;
|
2002-02-05 00:04:24 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
fail:
|
|
|
|
m_free(ret);
|
|
|
|
return NULL;
|
|
|
|
}
|
2002-02-26 01:00:12 +00:00
|
|
|
|
|
|
|
int
|
|
|
|
hextobyte( const char *s )
|
|
|
|
{
|
|
|
|
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;
|
|
|
|
}
|