security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-06-29 02:22:45 +02:00
Code Activity

Converted all m_free to xfree etc.

Browse Source
This commit is contained in:
Werner Koch 2005-07-27 18:10:56 +00:00
parent cd570629b2
commit a1cdf3c75f
112 changed files with 2067 additions and 1813 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,5 +1,9 @@
2005-07-27 Werner Koch <wk@g10code.com> 2005-07-27 Werner Koch <wk@g10code.com>
Replaced in all directories all calls to m_free, m_alloc,
m_realloc, m_strdup by calls to xfoo functions. This is to ease
porting to gnupg 1.9.
* README.CVS: Renamed to README.SVN. * README.CVS: Renamed to README.SVN.
2005-07-26 David Shaw <dshaw@jabberwocky.com> 2005-07-26 David Shaw <dshaw@jabberwocky.com>

6
cipher/cipher.c
View File

@ -389,10 +389,10 @@ cipher_open( int algo, int mode, int secure )
/* ? perform selftest here and mark this with a flag in cipher_table ? */ /* ? perform selftest here and mark this with a flag in cipher_table ? */
hd = secure ? m_alloc_secure_clear( sizeof *hd hd = secure ? xmalloc_secure_clear( sizeof *hd
+ cipher_table[i].contextsize + cipher_table[i].contextsize
- sizeof(PROPERLY_ALIGNED_TYPE) ) - sizeof(PROPERLY_ALIGNED_TYPE) )
: m_alloc_clear( sizeof *hd + cipher_table[i].contextsize : xmalloc_clear( sizeof *hd + cipher_table[i].contextsize
- sizeof(PROPERLY_ALIGNED_TYPE) ); - sizeof(PROPERLY_ALIGNED_TYPE) );
hd->algo = algo; hd->algo = algo;
hd->blocksize = cipher_table[i].blocksize; hd->blocksize = cipher_table[i].blocksize;
@ -421,7 +421,7 @@ cipher_open( int algo, int mode, int secure )
void void
cipher_close( CIPHER_HANDLE c ) cipher_close( CIPHER_HANDLE c )
{ {
m_free(c); xfree(c);
} }

12
cipher/dsa.c
View File

@ -94,7 +94,7 @@ gen_k( MPI q )
progress('.'); progress('.');
if( !rndbuf || nbits < 32 ) { if( !rndbuf || nbits < 32 ) {
m_free(rndbuf); xfree(rndbuf);
rndbuf = get_random_bits( nbits, 1, 1 ); rndbuf = get_random_bits( nbits, 1, 1 );
} }
else { /* change only some of the higher bits */ else { /* change only some of the higher bits */
@ -103,7 +103,7 @@ gen_k( MPI q )
* maybe it is easier to do this directly in random.c */ * maybe it is easier to do this directly in random.c */
char *pp = get_random_bits( 32, 1, 1 ); char *pp = get_random_bits( 32, 1, 1 );
memcpy( rndbuf,pp, 4 ); memcpy( rndbuf,pp, 4 );
m_free(pp); xfree(pp);
} }
mpi_set_buffer( k, rndbuf, nbytes, 0 ); mpi_set_buffer( k, rndbuf, nbytes, 0 );
if( mpi_test_bit( k, nbits-1 ) ) if( mpi_test_bit( k, nbits-1 ) )
@ -125,7 +125,7 @@ gen_k( MPI q )
} }
break; /* okay */ break; /* okay */
} }
m_free(rndbuf); xfree(rndbuf);
if( DBG_CIPHER ) if( DBG_CIPHER )
progress('\n'); progress('\n');
@ -148,7 +148,7 @@ test_keys( DSA_secret_key *sk, unsigned qbits )
/*mpi_set_bytes( test, qbits, get_random_byte, 0 );*/ /*mpi_set_bytes( test, qbits, get_random_byte, 0 );*/
{ char *p = get_random_bits( qbits, 0, 0 ); { char *p = get_random_bits( qbits, 0, 0 );
mpi_set_buffer( test, p, (qbits+7)/8, 0 ); mpi_set_buffer( test, p, (qbits+7)/8, 0 );
m_free(p); xfree(p);
} }
sign( out1_a, out1_b, test, sk ); sign( out1_a, out1_b, test, sk );
@ -219,12 +219,12 @@ generate( DSA_secret_key *sk, unsigned nbits, MPI **ret_factors )
else { /* change only some of the higher bits (= 2 bytes)*/ else { /* change only some of the higher bits (= 2 bytes)*/
char *r = get_random_bits( 16, 2, 1 ); char *r = get_random_bits( 16, 2, 1 );
memcpy(rndbuf, r, 16/8 ); memcpy(rndbuf, r, 16/8 );
m_free(r); xfree(r);
} }
mpi_set_buffer( x, rndbuf, (qbits+7)/8, 0 ); mpi_set_buffer( x, rndbuf, (qbits+7)/8, 0 );
mpi_clear_highbit( x, qbits+1 ); mpi_clear_highbit( x, qbits+1 );
} while( !( mpi_cmp_ui( x, 0 )>0 && mpi_cmp( x, h )<0 ) ); } while( !( mpi_cmp_ui( x, 0 )>0 && mpi_cmp( x, h )<0 ) );
m_free(rndbuf); xfree(rndbuf);
mpi_free( e ); mpi_free( e );
mpi_free( h ); mpi_free( h );

8
cipher/dynload.c
View File

@ -65,12 +65,12 @@ register_cipher_extension( const char *mainpgm, const char *fname )
tmp = make_filename(fname, NULL); tmp = make_filename(fname, NULL);
else else
tmp = make_filename(GNUPG_LIBDIR, fname, NULL); tmp = make_filename(GNUPG_LIBDIR, fname, NULL);
el = m_alloc_clear( sizeof *el + strlen(tmp) ); el = xmalloc_clear( sizeof *el + strlen(tmp) );
strcpy(el->name, tmp ); strcpy(el->name, tmp );
m_free(tmp); xfree(tmp);
} }
else { else {
el = m_alloc_clear( sizeof *el + strlen(fname) ); el = xmalloc_clear( sizeof *el + strlen(fname) );
strcpy(el->name, fname ); strcpy(el->name, fname );
} }
/* check whether we have a class hint */ /* check whether we have a class hint */
@ -82,7 +82,7 @@ register_cipher_extension( const char *mainpgm, const char *fname )
for(r = extensions; r; r = r->next ) { for(r = extensions; r; r = r->next ) {
if( !compare_filenames(r->name, el->name) ) { if( !compare_filenames(r->name, el->name) ) {
log_info("extension `%s' already registered\n", el->name ); log_info("extension `%s' already registered\n", el->name );
m_free(el); xfree(el);
return; return;
} }
} }

14
cipher/elgamal.c
View File

@ -133,7 +133,7 @@ test_keys( ELG_secret_key *sk, unsigned nbits )
/*mpi_set_bytes( test, nbits, get_random_byte, 0 );*/ /*mpi_set_bytes( test, nbits, get_random_byte, 0 );*/
{ char *p = get_random_bits( nbits, 0, 0 ); { char *p = get_random_bits( nbits, 0, 0 );
mpi_set_buffer( test, p, (nbits+7)/8, 0 ); mpi_set_buffer( test, p, (nbits+7)/8, 0 );
m_free(p); xfree(p);
} }
do_encrypt( out1_a, out1_b, test, &pk ); do_encrypt( out1_a, out1_b, test, &pk );
@ -183,7 +183,7 @@ gen_k( MPI p, int small_k )
mpi_sub_ui( p_1, p, 1); mpi_sub_ui( p_1, p, 1);
for(;;) { for(;;) {
if( !rndbuf || nbits < 32 ) { if( !rndbuf || nbits < 32 ) {
m_free(rndbuf); xfree(rndbuf);
rndbuf = get_random_bits( nbits, 1, 1 ); rndbuf = get_random_bits( nbits, 1, 1 );
} }
else { /* Change only some of the higher bits. */ else { /* Change only some of the higher bits. */
@ -194,7 +194,7 @@ gen_k( MPI p, int small_k )
*/ */
char *pp = get_random_bits( 32, 1, 1 ); char *pp = get_random_bits( 32, 1, 1 );
memcpy( rndbuf,pp, 4 ); memcpy( rndbuf,pp, 4 );
m_free(pp); xfree(pp);
} }
mpi_set_buffer( k, rndbuf, nbytes, 0 ); mpi_set_buffer( k, rndbuf, nbytes, 0 );
@ -217,7 +217,7 @@ gen_k( MPI p, int small_k )
} }
} }
found: found:
m_free(rndbuf); xfree(rndbuf);
if( DBG_CIPHER ) if( DBG_CIPHER )
progress('\n'); progress('\n');
mpi_free(p_1); mpi_free(p_1);
@ -280,13 +280,13 @@ generate( ELG_secret_key *sk, unsigned int nbits, MPI **ret_factors )
progress('.'); progress('.');
if( rndbuf ) { /* change only some of the higher bits */ if( rndbuf ) { /* change only some of the higher bits */
if( xbits < 16 ) {/* should never happen ... */ if( xbits < 16 ) {/* should never happen ... */
m_free(rndbuf); xfree(rndbuf);
rndbuf = get_random_bits( xbits, 2, 1 ); rndbuf = get_random_bits( xbits, 2, 1 );
} }
else { else {
char *r = get_random_bits( 16, 2, 1 ); char *r = get_random_bits( 16, 2, 1 );
memcpy(rndbuf, r, 16/8 ); memcpy(rndbuf, r, 16/8 );
m_free(r); xfree(r);
} }
} }
else else
@ -294,7 +294,7 @@ generate( ELG_secret_key *sk, unsigned int nbits, MPI **ret_factors )
mpi_set_buffer( x, rndbuf, (xbits+7)/8, 0 ); mpi_set_buffer( x, rndbuf, (xbits+7)/8, 0 );
mpi_clear_highbit( x, xbits+1 ); mpi_clear_highbit( x, xbits+1 );
} while( !( mpi_cmp_ui( x, 0 )>0 && mpi_cmp( x, p_min1 )<0 ) ); } while( !( mpi_cmp_ui( x, 0 )>0 && mpi_cmp( x, p_min1 )<0 ) );
m_free(rndbuf); xfree(rndbuf);
y = mpi_alloc(nbits/BITS_PER_MPI_LIMB); y = mpi_alloc(nbits/BITS_PER_MPI_LIMB);
mpi_powm( y, g, x, p ); mpi_powm( y, g, x, p );

30
cipher/md.c
View File

@ -62,14 +62,14 @@ new_list_item (int algo,
{ {
struct md_digest_list_s *r; struct md_digest_list_s *r;
r = m_alloc_clear (sizeof *r ); r = xmalloc_clear (sizeof *r );
r->algo = algo; r->algo = algo;
r->name = (*get_info)( algo, &r->contextsize, r->name = (*get_info)( algo, &r->contextsize,
&r->asnoid, &r->asnlen, &r->mdlen, &r->asnoid, &r->asnlen, &r->mdlen,
&r->init, &r->write, &r->final, &r->read ); &r->init, &r->write, &r->final, &r->read );
if (!r->name ) if (!r->name )
{ {
m_free(r); xfree(r);
r = NULL; r = NULL;
} }
if (r) if (r)
@ -192,11 +192,11 @@ md_open( int algo, int secure )
if( secure ) { if( secure ) {
bufsize = 512 - sizeof( *hd ); bufsize = 512 - sizeof( *hd );
hd = m_alloc_secure_clear( sizeof *hd + bufsize ); hd = xmalloc_secure_clear( sizeof *hd + bufsize );
} }
else { else {
bufsize = 1024 - sizeof( *hd ); bufsize = 1024 - sizeof( *hd );
hd = m_alloc_clear( sizeof *hd + bufsize ); hd = xmalloc_clear( sizeof *hd + bufsize );
} }
hd->bufsize = bufsize+1; /* hd has already one byte allocated */ hd->bufsize = bufsize+1; /* hd has already one byte allocated */
@ -226,9 +226,9 @@ md_enable( MD_HANDLE h, int algo )
return; return;
} }
/* and allocate a new list entry */ /* and allocate a new list entry */
ac = h->secure? m_alloc_secure( sizeof *ac + r->contextsize ac = h->secure? xmalloc_secure( sizeof *ac + r->contextsize
- sizeof(r->context) ) - sizeof(r->context) )
: m_alloc( sizeof *ac + r->contextsize : xmalloc( sizeof *ac + r->contextsize
- sizeof(r->context) ); - sizeof(r->context) );
*ac = *r; *ac = *r;
ac->next = h->list; ac->next = h->list;
@ -246,17 +246,17 @@ md_copy( MD_HANDLE a )
if( a->bufcount ) if( a->bufcount )
md_write( a, NULL, 0 ); md_write( a, NULL, 0 );
b = a->secure ? m_alloc_secure( sizeof *b + a->bufsize - 1 ) b = a->secure ? xmalloc_secure( sizeof *b + a->bufsize - 1 )
: m_alloc( sizeof *b + a->bufsize - 1 ); : xmalloc( sizeof *b + a->bufsize - 1 );
memcpy( b, a, sizeof *a + a->bufsize - 1 ); memcpy( b, a, sizeof *a + a->bufsize - 1 );
b->list = NULL; b->list = NULL;
b->debug = NULL; b->debug = NULL;
/* and now copy the complete list of algorithms */ /* and now copy the complete list of algorithms */
/* I know that the copied list is reversed, but that doesn't matter */ /* I know that the copied list is reversed, but that doesn't matter */
for( ar=a->list; ar; ar = ar->next ) { for( ar=a->list; ar; ar = ar->next ) {
br = a->secure ? m_alloc_secure( sizeof *br + ar->contextsize br = a->secure ? xmalloc_secure( sizeof *br + ar->contextsize
- sizeof(ar->context) ) - sizeof(ar->context) )
: m_alloc( sizeof *br + ar->contextsize : xmalloc( sizeof *br + ar->contextsize
- sizeof(ar->context) ); - sizeof(ar->context) );
memcpy( br, ar, sizeof(*br) + ar->contextsize memcpy( br, ar, sizeof(*br) + ar->contextsize
- sizeof(ar->context) ); - sizeof(ar->context) );
@ -298,9 +298,9 @@ md_close(MD_HANDLE a)
md_stop_debug(a); md_stop_debug(a);
for(r=a->list; r; r = r2 ) { for(r=a->list; r; r = r2 ) {
r2 = r->next; r2 = r->next;
m_free(r); xfree(r);
} }
m_free(a); xfree(a);
} }
@ -404,8 +404,8 @@ md_digest( MD_HANDLE a, int algo, byte *buffer, int buflen )
/* I don't want to change the interface, so I simply work on a copy /* I don't want to change the interface, so I simply work on a copy
* the context (extra overhead - should be fixed)*/ * the context (extra overhead - should be fixed)*/
context = a->secure ? m_alloc_secure( r->contextsize ) context = a->secure ? xmalloc_secure( r->contextsize )
: m_alloc( r->contextsize ); : xmalloc( r->contextsize );
memcpy( context, r->context.c, r->contextsize ); memcpy( context, r->context.c, r->contextsize );
(*r->final)( context ); (*r->final)( context );
digest = (*r->read)( context ); digest = (*r->read)( context );
@ -414,7 +414,7 @@ md_digest( MD_HANDLE a, int algo, byte *buffer, int buflen )
buflen = r->mdlen; buflen = r->mdlen;
memcpy( buffer, digest, buflen ); memcpy( buffer, digest, buflen );
m_free(context); xfree(context);
return buflen; return buflen;
} }

24
cipher/primegen.c
View File

@ -137,7 +137,7 @@ generate_elg_prime( int mode, unsigned pbits, unsigned qbits,
q_factor = mode==1? gen_prime( req_qbits, 0, 0 ) : NULL; q_factor = mode==1? gen_prime( req_qbits, 0, 0 ) : NULL;
/* allocate an array to hold the factors + 2 for later usage */ /* allocate an array to hold the factors + 2 for later usage */
factors = m_alloc_clear( (n+2) * sizeof *factors ); factors = xmalloc_clear( (n+2) * sizeof *factors );
/* make a pool of 3n+5 primes (this is an arbitrary value) */ /* make a pool of 3n+5 primes (this is an arbitrary value) */
m = n*3+5; m = n*3+5;
@ -145,7 +145,7 @@ generate_elg_prime( int mode, unsigned pbits, unsigned qbits,
m += 5; /* need some more for DSA */ m += 5; /* need some more for DSA */
if( m < 25 ) if( m < 25 )
m = 25; m = 25;
pool = m_alloc_clear( m * sizeof *pool ); pool = xmalloc_clear( m * sizeof *pool );
/* permutate over the pool of primes */ /* permutate over the pool of primes */
count1=count2=0; count1=count2=0;
@ -158,7 +158,7 @@ generate_elg_prime( int mode, unsigned pbits, unsigned qbits,
pool[i] = NULL; pool[i] = NULL;
} }
/* init m_out_of_n() */ /* init m_out_of_n() */
perms = m_alloc_clear( m ); perms = xmalloc_clear( m );
for(i=0; i < n; i++ ) { for(i=0; i < n; i++ ) {
perms[i] = 1; perms[i] = 1;
pool[i] = gen_prime( fbits, 0, 0 ); pool[i] = gen_prime( fbits, 0, 0 );
@ -174,7 +174,7 @@ generate_elg_prime( int mode, unsigned pbits, unsigned qbits,
factors[j++] = pool[i]; factors[j++] = pool[i];
} }
if( i == n ) { if( i == n ) {
m_free(perms); perms = NULL; xfree(perms); perms = NULL;
progress('!'); progress('!');
goto next_try; /* allocate new primes */ goto next_try; /* allocate new primes */
} }
@ -231,7 +231,7 @@ generate_elg_prime( int mode, unsigned pbits, unsigned qbits,
} }
if( ret_factors ) { /* caller wants the factors */ if( ret_factors ) { /* caller wants the factors */
*ret_factors = m_alloc_clear( (n+2) * sizeof **ret_factors); *ret_factors = xmalloc_clear( (n+2) * sizeof **ret_factors);
i = 0; i = 0;
if( mode == 1 ) { if( mode == 1 ) {
(*ret_factors)[i++] = mpi_copy( q_factor ); (*ret_factors)[i++] = mpi_copy( q_factor );
@ -282,11 +282,11 @@ generate_elg_prime( int mode, unsigned pbits, unsigned qbits,
if( !DBG_CIPHER ) if( !DBG_CIPHER )
progress('\n'); progress('\n');
m_free( factors ); /* (factors are shallow copies) */ xfree( factors ); /* (factors are shallow copies) */
for(i=0; i < m; i++ ) for(i=0; i < m; i++ )
mpi_free( pool[i] ); mpi_free( pool[i] );
m_free( pool ); xfree( pool );
m_free(perms); xfree(perms);
mpi_free(val_2); mpi_free(val_2);
mpi_free(q); mpi_free(q);
return prime; return prime;
@ -317,7 +317,7 @@ gen_prime( unsigned int nbits, int secret, int randomlevel )
for(i=0; small_prime_numbers[i]; i++ ) for(i=0; small_prime_numbers[i]; i++ )
no_of_small_prime_numbers++; no_of_small_prime_numbers++;
} }
mods = m_alloc( no_of_small_prime_numbers * sizeof *mods ); mods = xmalloc( no_of_small_prime_numbers * sizeof *mods );
/* make nbits fit into MPI implementation */ /* make nbits fit into MPI implementation */
nlimbs = (nbits + BITS_PER_MPI_LIMB - 1) / BITS_PER_MPI_LIMB; nlimbs = (nbits + BITS_PER_MPI_LIMB - 1) / BITS_PER_MPI_LIMB;
val_2 = mpi_alloc_set_ui( 2 ); val_2 = mpi_alloc_set_ui( 2 );
@ -333,7 +333,7 @@ gen_prime( unsigned int nbits, int secret, int randomlevel )
/* generate a random number */ /* generate a random number */
{ char *p = get_random_bits( nbits, randomlevel, secret ); { char *p = get_random_bits( nbits, randomlevel, secret );
mpi_set_buffer( prime, p, (nbits+7)/8, 0 ); mpi_set_buffer( prime, p, (nbits+7)/8, 0 );
m_free(p); xfree(p);
} }
/* Set high order bit to 1, set low order bit to 0. /* Set high order bit to 1, set low order bit to 0.
@ -382,7 +382,7 @@ gen_prime( unsigned int nbits, int secret, int randomlevel )
mpi_free(result); mpi_free(result);
mpi_free(pminus1); mpi_free(pminus1);
mpi_free(prime); mpi_free(prime);
m_free(mods); xfree(mods);
return ptest; return ptest;
} }
} }
@ -467,7 +467,7 @@ is_prime( MPI n, int steps, int *count )
p = get_random_bits( nbits, 0, 0 ); p = get_random_bits( nbits, 0, 0 );
mpi_set_buffer( x, p, (nbits+7)/8, 0 ); mpi_set_buffer( x, p, (nbits+7)/8, 0 );
m_free(p); xfree(p);
/* Make sure that the number is smaller than the prime /* Make sure that the number is smaller than the prime
* and keep the randomness of the high bit. */ * and keep the randomness of the high bit. */

20
cipher/random.c
View File

@ -200,10 +200,10 @@ initialize(void)
/* The data buffer is allocated somewhat larger, so that /* The data buffer is allocated somewhat larger, so that
* we can use this extra space (which is allocated in secure memory) * we can use this extra space (which is allocated in secure memory)
* as a temporary hash buffer */ * as a temporary hash buffer */
rndpool = secure_alloc ? m_alloc_secure_clear(POOLSIZE+BLOCKLEN) rndpool = secure_alloc ? xmalloc_secure_clear(POOLSIZE+BLOCKLEN)
: m_alloc_clear(POOLSIZE+BLOCKLEN); : xmalloc_clear(POOLSIZE+BLOCKLEN);
keypool = secure_alloc ? m_alloc_secure_clear(POOLSIZE+BLOCKLEN) keypool = secure_alloc ? xmalloc_secure_clear(POOLSIZE+BLOCKLEN)
: m_alloc_clear(POOLSIZE+BLOCKLEN); : xmalloc_clear(POOLSIZE+BLOCKLEN);
is_initialized = 1; is_initialized = 1;
} }
@ -231,7 +231,7 @@ random_dump_stats()
} }
void void
secure_random_alloc() secure_randoxmalloc()
{ {
secure_alloc = 1; secure_alloc = 1;
} }
@ -260,7 +260,7 @@ randomize_buffer( byte *buffer, size_t length, int level )
{ {
char *p = get_random_bits( length*8, level, 1 ); char *p = get_random_bits( length*8, level, 1 );
memcpy( buffer, p, length ); memcpy( buffer, p, length );
m_free(p); xfree(p);
} }
@ -295,7 +295,7 @@ get_random_bits( size_t nbits, int level, int secure )
rndstats.ngetbytes2++; rndstats.ngetbytes2++;
} }
buf = secure && secure_alloc ? m_alloc_secure( nbytes ) : m_alloc( nbytes ); buf = secure && secure_alloc ? xmalloc_secure( nbytes ) : xmalloc( nbytes );
for( p = buf; nbytes > 0; ) { for( p = buf; nbytes > 0; ) {
size_t n = nbytes > POOLSIZE? POOLSIZE : nbytes; size_t n = nbytes > POOLSIZE? POOLSIZE : nbytes;
read_pool( p, n, level ); read_pool( p, n, level );
@ -356,7 +356,7 @@ set_random_seed_file( const char *name )
{ {
if( seed_file_name ) if( seed_file_name )
BUG(); BUG();
seed_file_name = m_strdup( name ); seed_file_name = xstrdup( name );
} }
/**************** /****************
@ -738,7 +738,7 @@ gather_faked( void (*add)(const void*, size_t, int), int requester,
#endif #endif
} }
p = buffer = m_alloc( length ); p = buffer = xmalloc( length );
n = length; n = length;
#ifdef HAVE_RAND #ifdef HAVE_RAND
while( n-- ) while( n-- )
@ -748,6 +748,6 @@ gather_faked( void (*add)(const void*, size_t, int), int requester,
*p++ = ((unsigned)(1 + (int) (256.0*random()/(RAND_MAX+1.0)))-1); *p++ = ((unsigned)(1 + (int) (256.0*random()/(RAND_MAX+1.0)))-1);
#endif #endif
add_randomness( buffer, length, requester ); add_randomness( buffer, length, requester );
m_free(buffer); xfree(buffer);
return 0; /* okay */ return 0; /* okay */
} }

2
cipher/random.h
View File

@ -25,7 +25,7 @@
/*-- random.c --*/ /*-- random.c --*/
void random_dump_stats(void); void random_dump_stats(void);
void secure_random_alloc(void); void secure_randoxmalloc(void);
void set_random_seed_file(const char *); void set_random_seed_file(const char *);
void update_random_seed_file(void); void update_random_seed_file(void);
int quick_random_gen( int onoff ); int quick_random_gen( int onoff );

2
cipher/rndegd.c
View File

@ -140,7 +140,7 @@ rndegd_connect_socket (int nofail)
close (fd); close (fd);
fd = -1; fd = -1;
} }
m_free(name); xfree(name);
if (fd != -1) if (fd != -1)
egd_socket = fd; egd_socket = fd;
return fd; return fd;

6
cipher/rndw32.c
View File

@ -482,7 +482,7 @@ slow_gatherer_windowsNT( void (*add)(const void*, size_t, int), int requester )
* worst-case estimate which is usually nowhere near the actual amount * worst-case estimate which is usually nowhere near the actual amount
* required. For example it may report that 128K of memory is required, * required. For example it may report that 128K of memory is required,
* but only return 64K of data */ * but only return 64K of data */
{ pPerfData = m_alloc (cbPerfData); { pPerfData = xmalloc (cbPerfData);
for (;;) { for (;;) {
dwSize = cbPerfData; dwSize = cbPerfData;
if ( debug_me ) if ( debug_me )
@ -499,14 +499,14 @@ slow_gatherer_windowsNT( void (*add)(const void*, size_t, int), int requester )
} }
else if (status == ERROR_MORE_DATA) { else if (status == ERROR_MORE_DATA) {
cbPerfData += PERFORMANCE_BUFFER_STEP; cbPerfData += PERFORMANCE_BUFFER_STEP;
pPerfData = m_realloc (pPerfData, cbPerfData); pPerfData = xrealloc (pPerfData, cbPerfData);
} }
else { else {
g10_log_debug ( "rndw32: get performance data problem\n"); g10_log_debug ( "rndw32: get performance data problem\n");
break; break;
} }
} }
m_free (pPerfData); xfree (pPerfData);
} }
/* Although this isn't documented in the Win32 API docs, it's necessary /* Although this isn't documented in the Win32 API docs, it's necessary
to explicitly close the HKEY_PERFORMANCE_DATA key after use (it's to explicitly close the HKEY_PERFORMANCE_DATA key after use (it's

4
cipher/rsa.c
View File

@ -70,7 +70,7 @@ test_keys( RSA_secret_key *sk, unsigned nbits )
pk.e = sk->e; pk.e = sk->e;
{ char *p = get_random_bits( nbits, 0, 0 ); { char *p = get_random_bits( nbits, 0, 0 );
mpi_set_buffer( test, p, (nbits+7)/8, 0 ); mpi_set_buffer( test, p, (nbits+7)/8, 0 );
m_free(p); xfree(p);
} }
public( out1, test, &pk ); public( out1, test, &pk );
@ -355,7 +355,7 @@ rsa_generate( int algo, unsigned nbits, MPI *skey, MPI **retfactors )
skey[5] = sk.u; skey[5] = sk.u;
/* make an empty list of factors */ /* make an empty list of factors */
if (retfactors) if (retfactors)
*retfactors = m_alloc_clear( 1 * sizeof **retfactors ); *retfactors = xmalloc_clear( 1 * sizeof **retfactors );
return 0; return 0;
} }

4
g10/ChangeLog
View File

@ -1,3 +1,7 @@
2005-07-27 Werner Koch <wk@g10code.com>
* export.c (do_export_stream): Make two strings translatable.
2005-07-26 David Shaw <dshaw@jabberwocky.com> 2005-07-26 David Shaw <dshaw@jabberwocky.com>
* keyserver.c (keyserver_typemap): Special-case LDAP since curl * keyserver.c (keyserver_typemap): Special-case LDAP since curl

8
g10/armor.c
View File

@ -1146,7 +1146,7 @@ armor_filter( void *opaque, int control,
if( afx->qp_detected ) if( afx->qp_detected )
log_error(_("quoted printable character in armor - " log_error(_("quoted printable character in armor - "
"probably a buggy MTA has been used\n") ); "probably a buggy MTA has been used\n") );
m_free( afx->buffer ); xfree( afx->buffer );
afx->buffer = NULL; afx->buffer = NULL;
} }
else if( control == IOBUFCTRL_DESC ) else if( control == IOBUFCTRL_DESC )
@ -1163,7 +1163,7 @@ make_radix64_string( const byte *data, size_t len )
{ {
char *buffer, *p; char *buffer, *p;
buffer = p = m_alloc( (len+2)/3*4 + 1 ); buffer = p = xmalloc( (len+2)/3*4 + 1 );
for( ; len >= 3 ; len -= 3, data += 3 ) { for( ; len >= 3 ; len -= 3, data += 3 ) {
*p++ = bintoasc[(data[0] >> 2) & 077]; *p++ = bintoasc[(data[0] >> 2) & 077];
*p++ = bintoasc[(((data[0] <<4)&060)|((data[1] >> 4)&017))&077]; *p++ = bintoasc[(((data[0] <<4)&060)|((data[1] >> 4)&017))&077];
@ -1223,14 +1223,14 @@ unarmor_pump_new (void)
if( !is_initialized ) if( !is_initialized )
initialize(); initialize();
x = m_alloc_clear (sizeof *x); x = xmalloc_clear (sizeof *x);
return x; return x;
} }
void void
unarmor_pump_release (UnarmorPump x) unarmor_pump_release (UnarmorPump x)
{ {
m_free (x); xfree (x);
} }
/* /*

6
g10/build-packet.c
View File

@ -749,12 +749,12 @@ build_sig_subpkt (PKT_signature *sig, sigsubpkttype_t type,
/*log_debug ("updating area for type %d\n", type );*/ /*log_debug ("updating area for type %d\n", type );*/
} }
else if (oldarea) { else if (oldarea) {
newarea = m_realloc (oldarea, sizeof (*newarea) + n - 1); newarea = xrealloc (oldarea, sizeof (*newarea) + n - 1);
newarea->size = n; newarea->size = n;
/*log_debug ("reallocating area for type %d\n", type );*/ /*log_debug ("reallocating area for type %d\n", type );*/
} }
else { else {
newarea = m_alloc (sizeof (*newarea) + n - 1); newarea = xmalloc (sizeof (*newarea) + n - 1);
newarea->size = n; newarea->size = n;
/*log_debug ("allocating area for type %d\n", type );*/ /*log_debug ("allocating area for type %d\n", type );*/
} }
@ -855,7 +855,7 @@ build_attribute_subpkt(PKT_user_id *uid,byte type,
/* realloc uid->attrib_data to the right size */ /* realloc uid->attrib_data to the right size */
uid->attrib_data=m_realloc(uid->attrib_data, uid->attrib_data=xrealloc(uid->attrib_data,
uid->attrib_len+idx+1+headerlen+buflen); uid->attrib_len+idx+1+headerlen+buflen);
attrib=&uid->attrib_data[uid->attrib_len]; attrib=&uid->attrib_data[uid->attrib_len];

2
g10/card-util.c
View File

@ -1052,7 +1052,7 @@ generate_card_keys (const char *serialno)
want_backup=answer_is_yes_no_default(answer,1); want_backup=answer_is_yes_no_default(answer,1);
cpr_kill_prompt(); cpr_kill_prompt();
m_free(answer); xfree(answer);
} }
#else #else
want_backup = cpr_get_answer_is_yes want_backup = cpr_get_answer_is_yes

16
g10/compress-bz2.c
View File

@ -57,7 +57,7 @@ init_compress( compress_filter_context_t *zfx, bz_stream *bzs )
log_fatal("bz2lib problem: %d\n",rc); log_fatal("bz2lib problem: %d\n",rc);
zfx->outbufsize = 8192; zfx->outbufsize = 8192;
zfx->outbuf = m_alloc( zfx->outbufsize ); zfx->outbuf = xmalloc( zfx->outbufsize );
} }
static int static int
@ -106,7 +106,7 @@ init_uncompress( compress_filter_context_t *zfx, bz_stream *bzs )
log_fatal("bz2lib problem: %d\n",rc); log_fatal("bz2lib problem: %d\n",rc);
zfx->inbufsize = 2048; zfx->inbufsize = 2048;
zfx->inbuf = m_alloc( zfx->inbufsize ); zfx->inbuf = xmalloc( zfx->inbufsize );
bzs->avail_in = 0; bzs->avail_in = 0;
} }
@ -178,7 +178,7 @@ compress_filter_bz2( void *opaque, int control,
{ {
if( !zfx->status ) if( !zfx->status )
{ {
bzs = zfx->opaque = m_alloc_clear( sizeof *bzs ); bzs = zfx->opaque = xmalloc_clear( sizeof *bzs );
init_uncompress( zfx, bzs ); init_uncompress( zfx, bzs );
zfx->status = 1; zfx->status = 1;
} }
@ -205,7 +205,7 @@ compress_filter_bz2( void *opaque, int control,
pkt.pkt.compressed = &cd; pkt.pkt.compressed = &cd;
if( build_packet( a, &pkt )) if( build_packet( a, &pkt ))
log_bug("build_packet(PKT_COMPRESSED) failed\n"); log_bug("build_packet(PKT_COMPRESSED) failed\n");
bzs = zfx->opaque = m_alloc_clear( sizeof *bzs ); bzs = zfx->opaque = xmalloc_clear( sizeof *bzs );
init_compress( zfx, bzs ); init_compress( zfx, bzs );
zfx->status = 2; zfx->status = 2;
} }
@ -219,9 +219,9 @@ compress_filter_bz2( void *opaque, int control,
if( zfx->status == 1 ) if( zfx->status == 1 )
{ {
BZ2_bzDecompressEnd(bzs); BZ2_bzDecompressEnd(bzs);
m_free(bzs); xfree(bzs);
zfx->opaque = NULL; zfx->opaque = NULL;
m_free(zfx->outbuf); zfx->outbuf = NULL; xfree(zfx->outbuf); zfx->outbuf = NULL;
} }
else if( zfx->status == 2 ) else if( zfx->status == 2 )
{ {
@ -229,9 +229,9 @@ compress_filter_bz2( void *opaque, int control,
bzs->avail_in = 0; bzs->avail_in = 0;
do_compress( zfx, bzs, BZ_FINISH, a ); do_compress( zfx, bzs, BZ_FINISH, a );
BZ2_bzCompressEnd(bzs); BZ2_bzCompressEnd(bzs);
m_free(bzs); xfree(bzs);
zfx->opaque = NULL; zfx->opaque = NULL;
m_free(zfx->outbuf); zfx->outbuf = NULL; xfree(zfx->outbuf); zfx->outbuf = NULL;
} }
if (zfx->release) if (zfx->release)
zfx->release (zfx); zfx->release (zfx);

20
g10/compress.c
View File

@ -81,7 +81,7 @@ init_compress( compress_filter_context_t *zfx, z_stream *zs )
} }
zfx->outbufsize = 8192; zfx->outbufsize = 8192;
zfx->outbuf = m_alloc( zfx->outbufsize ); zfx->outbuf = xmalloc( zfx->outbufsize );
} }
static int static int
@ -148,7 +148,7 @@ init_uncompress( compress_filter_context_t *zfx, z_stream *zs )
} }
zfx->inbufsize = 2048; zfx->inbufsize = 2048;
zfx->inbuf = m_alloc( zfx->inbufsize ); zfx->inbuf = xmalloc( zfx->inbufsize );
zs->avail_in = 0; zs->avail_in = 0;
} }
@ -227,7 +227,7 @@ compress_filter( void *opaque, int control,
if( control == IOBUFCTRL_UNDERFLOW ) { if( control == IOBUFCTRL_UNDERFLOW ) {
if( !zfx->status ) { if( !zfx->status ) {
zs = zfx->opaque = m_alloc_clear( sizeof *zs ); zs = zfx->opaque = xmalloc_clear( sizeof *zs );
init_uncompress( zfx, zs ); init_uncompress( zfx, zs );
zfx->status = 1; zfx->status = 1;
} }
@ -256,7 +256,7 @@ compress_filter( void *opaque, int control,
pkt.pkt.compressed = &cd; pkt.pkt.compressed = &cd;
if( build_packet( a, &pkt )) if( build_packet( a, &pkt ))
log_bug("build_packet(PKT_COMPRESSED) failed\n"); log_bug("build_packet(PKT_COMPRESSED) failed\n");
zs = zfx->opaque = m_alloc_clear( sizeof *zs ); zs = zfx->opaque = xmalloc_clear( sizeof *zs );
init_compress( zfx, zs ); init_compress( zfx, zs );
zfx->status = 2; zfx->status = 2;
} }
@ -272,9 +272,9 @@ compress_filter( void *opaque, int control,
else if( control == IOBUFCTRL_FREE ) { else if( control == IOBUFCTRL_FREE ) {
if( zfx->status == 1 ) { if( zfx->status == 1 ) {
inflateEnd(zs); inflateEnd(zs);
m_free(zs); xfree(zs);
zfx->opaque = NULL; zfx->opaque = NULL;
m_free(zfx->outbuf); zfx->outbuf = NULL; xfree(zfx->outbuf); zfx->outbuf = NULL;
} }
else if( zfx->status == 2 ) { else if( zfx->status == 2 ) {
#ifndef __riscos__ #ifndef __riscos__
@ -285,9 +285,9 @@ compress_filter( void *opaque, int control,
zs->avail_in = 0; zs->avail_in = 0;
do_compress( zfx, zs, Z_FINISH, a ); do_compress( zfx, zs, Z_FINISH, a );
deflateEnd(zs); deflateEnd(zs);
m_free(zs); xfree(zs);
zfx->opaque = NULL; zfx->opaque = NULL;
m_free(zfx->outbuf); zfx->outbuf = NULL; xfree(zfx->outbuf); zfx->outbuf = NULL;
} }
if (zfx->release) if (zfx->release)
zfx->release (zfx); zfx->release (zfx);
@ -301,7 +301,7 @@ compress_filter( void *opaque, int control,
static void static void
release_context (compress_filter_context_t *ctx) release_context (compress_filter_context_t *ctx)
{ {
m_free (ctx); xfree (ctx);
} }
/**************** /****************
@ -316,7 +316,7 @@ handle_compressed( void *procctx, PKT_compressed *cd,
if(check_compress_algo(cd->algorithm)) if(check_compress_algo(cd->algorithm))
return G10ERR_COMPR_ALGO; return G10ERR_COMPR_ALGO;
cfx = m_alloc_clear (sizeof *cfx); cfx = xmalloc_clear (sizeof *cfx);
cfx->release = release_context; cfx->release = release_context;
cfx->algo = cd->algorithm; cfx->algo = cd->algorithm;
push_compress_filter(cd->buf,cfx,cd->algorithm); push_compress_filter(cd->buf,cfx,cd->algorithm);

4
g10/decrypt.c
View File

@ -178,12 +178,12 @@ decrypt_messages(int nfiles, char *files[])
g10_errstr(rc)); g10_errstr(rc));
p = get_last_passphrase(); p = get_last_passphrase();
set_next_passphrase(p); set_next_passphrase(p);
m_free (p); xfree (p);
next_file: next_file:
/* Note that we emit file_done even after an error. */ /* Note that we emit file_done even after an error. */
write_status( STATUS_FILE_DONE ); write_status( STATUS_FILE_DONE );
m_free(output); xfree(output);
} }
set_next_passphrase(NULL); set_next_passphrase(NULL);

62
g10/encode.c
View File

@ -72,7 +72,7 @@ encode_seskey( DEK *dek, DEK **seskey, byte *enckey )
assert ( dek->keylen <= 32 ); assert ( dek->keylen <= 32 );
if(!*seskey) if(!*seskey)
{ {
*seskey=m_alloc_clear(sizeof(DEK)); *seskey=xmalloc_clear(sizeof(DEK));
(*seskey)->keylen=dek->keylen; (*seskey)->keylen=dek->keylen;
(*seskey)->algo=dek->algo; (*seskey)->algo=dek->algo;
make_session_key(*seskey); make_session_key(*seskey);
@ -199,7 +199,7 @@ encode_simple( const char *filename, int mode, int use_seskey )
cfx.dek = NULL; cfx.dek = NULL;
if( mode ) { if( mode ) {
s2k = m_alloc_clear( sizeof *s2k ); s2k = xmalloc_clear( sizeof *s2k );
s2k->mode = RFC1991? 0:opt.s2k_mode; s2k->mode = RFC1991? 0:opt.s2k_mode;
s2k->hash_algo=S2K_DIGEST_ALGO; s2k->hash_algo=S2K_DIGEST_ALGO;
cfx.dek = passphrase_to_dek( NULL, 0, cfx.dek = passphrase_to_dek( NULL, 0,
@ -207,8 +207,8 @@ encode_simple( const char *filename, int mode, int use_seskey )
NULL, NULL); NULL, NULL);
if( !cfx.dek || !cfx.dek->keylen ) { if( !cfx.dek || !cfx.dek->keylen ) {
rc = G10ERR_PASSPHRASE; rc = G10ERR_PASSPHRASE;
m_free(cfx.dek); xfree(cfx.dek);
m_free(s2k); xfree(s2k);
iobuf_close(inp); iobuf_close(inp);
log_error(_("error creating passphrase: %s\n"), g10_errstr(rc) ); log_error(_("error creating passphrase: %s\n"), g10_errstr(rc) );
return rc; return rc;
@ -224,7 +224,7 @@ encode_simple( const char *filename, int mode, int use_seskey )
DEK *dek = NULL; DEK *dek = NULL;
seskeylen = cipher_get_keylen( default_cipher_algo() ) / 8; seskeylen = cipher_get_keylen( default_cipher_algo() ) / 8;
encode_seskey( cfx.dek, &dek, enckey ); encode_seskey( cfx.dek, &dek, enckey );
m_free( cfx.dek ); cfx.dek = dek; xfree( cfx.dek ); cfx.dek = dek;
} }
if(opt.verbose) if(opt.verbose)
@ -244,8 +244,8 @@ encode_simple( const char *filename, int mode, int use_seskey )
if( rc || (rc = open_outfile( filename, opt.armor? 1:0, &out )) ) { if( rc || (rc = open_outfile( filename, opt.armor? 1:0, &out )) ) {
iobuf_cancel(inp); iobuf_cancel(inp);
m_free(cfx.dek); xfree(cfx.dek);
m_free(s2k); xfree(s2k);
return rc; return rc;
} }
@ -253,7 +253,7 @@ encode_simple( const char *filename, int mode, int use_seskey )
iobuf_push_filter( out, armor_filter, &afx ); iobuf_push_filter( out, armor_filter, &afx );
if( s2k && !RFC1991 ) { if( s2k && !RFC1991 ) {
PKT_symkey_enc *enc = m_alloc_clear( sizeof *enc + seskeylen + 1 ); PKT_symkey_enc *enc = xmalloc_clear( sizeof *enc + seskeylen + 1 );
enc->version = 4; enc->version = 4;
enc->cipher_algo = cfx.dek->algo; enc->cipher_algo = cfx.dek->algo;
enc->s2k = *s2k; enc->s2k = *s2k;
@ -265,7 +265,7 @@ encode_simple( const char *filename, int mode, int use_seskey )
pkt.pkt.symkey_enc = enc; pkt.pkt.symkey_enc = enc;
if( (rc = build_packet( out, &pkt )) ) if( (rc = build_packet( out, &pkt )) )
log_error("build symkey packet failed: %s\n", g10_errstr(rc) ); log_error("build symkey packet failed: %s\n", g10_errstr(rc) );
m_free(enc); xfree(enc);
} }
if (!opt.no_literal) { if (!opt.no_literal) {
@ -274,13 +274,13 @@ encode_simple( const char *filename, int mode, int use_seskey )
char *s = make_basename( opt.set_filename ? opt.set_filename char *s = make_basename( opt.set_filename ? opt.set_filename
: filename, : filename,
iobuf_get_real_fname( inp ) ); iobuf_get_real_fname( inp ) );
pt = m_alloc( sizeof *pt + strlen(s) - 1 ); pt = xmalloc( sizeof *pt + strlen(s) - 1 );
pt->namelen = strlen(s); pt->namelen = strlen(s);
memcpy(pt->name, s, pt->namelen ); memcpy(pt->name, s, pt->namelen );
m_free(s); xfree(s);
} }
else { /* no filename */ else { /* no filename */
pt = m_alloc( sizeof *pt - 1 ); pt = xmalloc( sizeof *pt - 1 );
pt->namelen = 0; pt->namelen = 0;
} }
} }
@ -373,15 +373,15 @@ encode_simple( const char *filename, int mode, int use_seskey )
if (pt) if (pt)
pt->buf = NULL; pt->buf = NULL;
free_packet(&pkt); free_packet(&pkt);
m_free(cfx.dek); xfree(cfx.dek);
m_free(s2k); xfree(s2k);
return rc; return rc;
} }
int int
setup_symkey(STRING2KEY **symkey_s2k,DEK **symkey_dek) setup_symkey(STRING2KEY **symkey_s2k,DEK **symkey_dek)
{ {
*symkey_s2k=m_alloc_clear(sizeof(STRING2KEY)); *symkey_s2k=xmalloc_clear(sizeof(STRING2KEY));
(*symkey_s2k)->mode = opt.s2k_mode; (*symkey_s2k)->mode = opt.s2k_mode;
(*symkey_s2k)->hash_algo = S2K_DIGEST_ALGO; (*symkey_s2k)->hash_algo = S2K_DIGEST_ALGO;
@ -389,8 +389,8 @@ setup_symkey(STRING2KEY **symkey_s2k,DEK **symkey_dek)
*symkey_s2k,2,NULL,NULL); *symkey_s2k,2,NULL,NULL);
if(!*symkey_dek || !(*symkey_dek)->keylen) if(!*symkey_dek || !(*symkey_dek)->keylen)
{ {
m_free(*symkey_dek); xfree(*symkey_dek);
m_free(*symkey_s2k); xfree(*symkey_s2k);
return G10ERR_PASSPHRASE; return G10ERR_PASSPHRASE;
} }
@ -406,7 +406,7 @@ write_symkey_enc(STRING2KEY *symkey_s2k,DEK *symkey_dek,DEK *dek,IOBUF out)
byte enckey[33]; byte enckey[33];
PACKET pkt; PACKET pkt;
enc=m_alloc_clear(sizeof(PKT_symkey_enc)+seskeylen+1); enc=xmalloc_clear(sizeof(PKT_symkey_enc)+seskeylen+1);
encode_seskey(symkey_dek,&dek,enckey); encode_seskey(symkey_dek,&dek,enckey);
enc->version = 4; enc->version = 4;
@ -421,7 +421,7 @@ write_symkey_enc(STRING2KEY *symkey_s2k,DEK *symkey_dek,DEK *dek,IOBUF out)
if((rc=build_packet(out,&pkt))) if((rc=build_packet(out,&pkt)))
log_error("build symkey_enc packet failed: %s\n",g10_errstr(rc)); log_error("build symkey_enc packet failed: %s\n",g10_errstr(rc));
m_free(enc); xfree(enc);
return rc; return rc;
} }
@ -503,7 +503,7 @@ encode_crypt( const char *filename, STRLIST remusr, int use_symkey )
iobuf_push_filter( out, armor_filter, &afx ); iobuf_push_filter( out, armor_filter, &afx );
/* create a session key */ /* create a session key */
cfx.dek = m_alloc_secure_clear (sizeof *cfx.dek); cfx.dek = xmalloc_secure_clear (sizeof *cfx.dek);
if( !opt.def_cipher_algo ) { /* try to get it from the prefs */ if( !opt.def_cipher_algo ) { /* try to get it from the prefs */
cfx.dek->algo = select_algo_from_prefs(pk_list,PREFTYPE_SYM,-1,NULL); cfx.dek->algo = select_algo_from_prefs(pk_list,PREFTYPE_SYM,-1,NULL);
/* The only way select_algo_from_prefs can fail here is when /* The only way select_algo_from_prefs can fail here is when
@ -575,13 +575,13 @@ encode_crypt( const char *filename, STRLIST remusr, int use_symkey )
char *s = make_basename( opt.set_filename ? opt.set_filename char *s = make_basename( opt.set_filename ? opt.set_filename
: filename, : filename,
iobuf_get_real_fname( inp ) ); iobuf_get_real_fname( inp ) );
pt = m_alloc( sizeof *pt + strlen(s) - 1 ); pt = xmalloc( sizeof *pt + strlen(s) - 1 );
pt->namelen = strlen(s); pt->namelen = strlen(s);
memcpy(pt->name, s, pt->namelen ); memcpy(pt->name, s, pt->namelen );
m_free(s); xfree(s);
} }
else { /* no filename */ else { /* no filename */
pt = m_alloc( sizeof *pt - 1 ); pt = xmalloc( sizeof *pt - 1 );
pt->namelen = 0; pt->namelen = 0;
} }
} }
@ -680,9 +680,9 @@ encode_crypt( const char *filename, STRLIST remusr, int use_symkey )
if( pt ) if( pt )
pt->buf = NULL; pt->buf = NULL;
free_packet(&pkt); free_packet(&pkt);
m_free(cfx.dek); xfree(cfx.dek);
m_free(symkey_dek); xfree(symkey_dek);
m_free(symkey_s2k); xfree(symkey_s2k);
release_pk_list( pk_list ); release_pk_list( pk_list );
return rc; return rc;
} }
@ -706,7 +706,7 @@ encrypt_filter( void *opaque, int control,
} }
else if( control == IOBUFCTRL_FLUSH ) { /* encrypt */ else if( control == IOBUFCTRL_FLUSH ) { /* encrypt */
if( !efx->header_okay ) { if( !efx->header_okay ) {
efx->cfx.dek = m_alloc_secure_clear( sizeof *efx->cfx.dek ); efx->cfx.dek = xmalloc_secure_clear( sizeof *efx->cfx.dek );
if( !opt.def_cipher_algo ) { /* try to get it from the prefs */ if( !opt.def_cipher_algo ) { /* try to get it from the prefs */
efx->cfx.dek->algo = efx->cfx.dek->algo =
@ -758,8 +758,8 @@ encrypt_filter( void *opaque, int control,
} }
else if( control == IOBUFCTRL_FREE ) else if( control == IOBUFCTRL_FREE )
{ {
m_free(efx->symkey_dek); xfree(efx->symkey_dek);
m_free(efx->symkey_s2k); xfree(efx->symkey_s2k);
} }
else if( control == IOBUFCTRL_DESC ) { else if( control == IOBUFCTRL_DESC ) {
*(char**)buf = "encrypt_filter"; *(char**)buf = "encrypt_filter";
@ -785,7 +785,7 @@ write_pubkey_enc_from_list( PK_LIST pk_list, DEK *dek, IOBUF out )
pk = pk_list->pk; pk = pk_list->pk;
print_pubkey_algo_note( pk->pubkey_algo ); print_pubkey_algo_note( pk->pubkey_algo );
enc = m_alloc_clear( sizeof *enc ); enc = xmalloc_clear( sizeof *enc );
enc->pubkey_algo = pk->pubkey_algo; enc->pubkey_algo = pk->pubkey_algo;
keyid_from_pk( pk, enc->keyid ); keyid_from_pk( pk, enc->keyid );
enc->throw_keyid = (opt.throw_keyid || (pk_list->flags&1)); enc->throw_keyid = (opt.throw_keyid || (pk_list->flags&1));
@ -822,7 +822,7 @@ write_pubkey_enc_from_list( PK_LIST pk_list, DEK *dek, IOBUF out )
log_info(_("%s/%s encrypted for: \"%s\"\n"), log_info(_("%s/%s encrypted for: \"%s\"\n"),
pubkey_algo_to_string(enc->pubkey_algo), pubkey_algo_to_string(enc->pubkey_algo),
cipher_algo_to_string(dek->algo), ustr ); cipher_algo_to_string(dek->algo), ustr );
m_free(ustr); xfree(ustr);
} }
/* and write it */ /* and write it */
init_packet(&pkt); init_packet(&pkt);

40
g10/exec.c
View File

@ -72,7 +72,7 @@ static int win_system(const char *command)
/* We must use a copy of the command as CreateProcess modifies this /* We must use a copy of the command as CreateProcess modifies this
argument. */ argument. */
string=m_strdup(command); string=xstrdup(command);
memset(&pi,0,sizeof(pi)); memset(&pi,0,sizeof(pi));
memset(&si,0,sizeof(si)); memset(&si,0,sizeof(si));
@ -86,7 +86,7 @@ static int win_system(const char *command)
CloseHandle(pi.hProcess); CloseHandle(pi.hProcess);
CloseHandle(pi.hThread); CloseHandle(pi.hThread);
m_free(string); xfree(string);
return 0; return 0;
} }
@ -97,7 +97,7 @@ int set_exec_path(const char *path)
{ {
char *p; char *p;
p=m_alloc(5+strlen(path)+1); p=xmalloc(5+strlen(path)+1);
strcpy(p,"PATH="); strcpy(p,"PATH=");
strcat(p,path); strcat(p,path);
@ -129,7 +129,7 @@ static int make_tempdir(struct exec_info *info)
if(tmp==NULL) if(tmp==NULL)
{ {
#if defined (_WIN32) #if defined (_WIN32)
tmp=m_alloc(256); tmp=xmalloc(256);
if(GetTempPath(256,tmp)==0) if(GetTempPath(256,tmp)==0)
strcpy(tmp,"c:\\windows\\temp"); strcpy(tmp,"c:\\windows\\temp");
else else
@ -161,12 +161,12 @@ static int make_tempdir(struct exec_info *info)
#endif #endif
} }
info->tempdir=m_alloc(strlen(tmp)+strlen(DIRSEP_S)+10+1); info->tempdir=xmalloc(strlen(tmp)+strlen(DIRSEP_S)+10+1);
sprintf(info->tempdir,"%s" DIRSEP_S "gpg-XXXXXX",tmp); sprintf(info->tempdir,"%s" DIRSEP_S "gpg-XXXXXX",tmp);
#if defined (_WIN32) #if defined (_WIN32)
m_free(tmp); xfree(tmp);
#endif #endif
if(mkdtemp(info->tempdir)==NULL) if(mkdtemp(info->tempdir)==NULL)
@ -176,13 +176,13 @@ static int make_tempdir(struct exec_info *info)
{ {
info->madedir=1; info->madedir=1;
info->tempfile_in=m_alloc(strlen(info->tempdir)+ info->tempfile_in=xmalloc(strlen(info->tempdir)+
strlen(DIRSEP_S)+strlen(namein)+1); strlen(DIRSEP_S)+strlen(namein)+1);
sprintf(info->tempfile_in,"%s" DIRSEP_S "%s",info->tempdir,namein); sprintf(info->tempfile_in,"%s" DIRSEP_S "%s",info->tempdir,namein);
if(!info->writeonly) if(!info->writeonly)
{ {
info->tempfile_out=m_alloc(strlen(info->tempdir)+ info->tempfile_out=xmalloc(strlen(info->tempdir)+
strlen(DIRSEP_S)+strlen(nameout)+1); strlen(DIRSEP_S)+strlen(nameout)+1);
sprintf(info->tempfile_out,"%s" DIRSEP_S "%s",info->tempdir,nameout); sprintf(info->tempfile_out,"%s" DIRSEP_S "%s",info->tempdir,nameout);
} }
@ -205,7 +205,7 @@ static int expand_args(struct exec_info *info,const char *args_in)
log_debug("expanding string \"%s\"\n",args_in); log_debug("expanding string \"%s\"\n",args_in);
size=100; size=100;
info->command=m_alloc(size); info->command=xmalloc(size);
len=0; len=0;
info->command[0]='\0'; info->command[0]='\0';
@ -262,7 +262,7 @@ static int expand_args(struct exec_info *info,const char *args_in)
applen=100; applen=100;
size+=applen; size+=applen;
info->command=m_realloc(info->command,size); info->command=xrealloc(info->command,size);
} }
strcat(info->command,append); strcat(info->command,append);
@ -274,7 +274,7 @@ static int expand_args(struct exec_info *info,const char *args_in)
if(len==size-1) /* leave room for the \0 */ if(len==size-1) /* leave room for the \0 */
{ {
size+=100; size+=100;
info->command=m_realloc(info->command,size); info->command=xrealloc(info->command,size);
} }
info->command[len++]=*ch; info->command[len++]=*ch;
@ -292,7 +292,7 @@ static int expand_args(struct exec_info *info,const char *args_in)
fail: fail:
m_free(info->command); xfree(info->command);
info->command=NULL; info->command=NULL;
return G10ERR_GENERAL; return G10ERR_GENERAL;
@ -327,10 +327,10 @@ int exec_write(struct exec_info **info,const char *program,
if(program==NULL && args_in==NULL) if(program==NULL && args_in==NULL)
BUG(); BUG();
*info=m_alloc_clear(sizeof(struct exec_info)); *info=xmalloc_clear(sizeof(struct exec_info));
if(name) if(name)
(*info)->name=m_strdup(name); (*info)->name=xstrdup(name);
(*info)->binary=binary; (*info)->binary=binary;
(*info)->writeonly=writeonly; (*info)->writeonly=writeonly;
@ -611,12 +611,12 @@ int exec_finish(struct exec_info *info)
info->tempdir,strerror(errno)); info->tempdir,strerror(errno));
} }
m_free(info->command); xfree(info->command);
m_free(info->name); xfree(info->name);
m_free(info->tempdir); xfree(info->tempdir);
m_free(info->tempfile_in); xfree(info->tempfile_in);
m_free(info->tempfile_out); xfree(info->tempfile_out);
m_free(info); xfree(info);
return ret; return ret;
} }

11
g10/export.c
View File

@ -163,13 +163,13 @@ do_export_stream( IOBUF out, STRLIST users, int secret,
if (!users) { if (!users) {
ndesc = 1; ndesc = 1;
desc = m_alloc_clear ( ndesc * sizeof *desc); desc = xmalloc_clear ( ndesc * sizeof *desc);
desc[0].mode = KEYDB_SEARCH_MODE_FIRST; desc[0].mode = KEYDB_SEARCH_MODE_FIRST;
} }
else { else {
for (ndesc=0, sl=users; sl; sl = sl->next, ndesc++) for (ndesc=0, sl=users; sl; sl = sl->next, ndesc++)
; ;
desc = m_alloc ( ndesc * sizeof *desc); desc = xmalloc ( ndesc * sizeof *desc);
for (ndesc=0, sl=users; sl; sl = sl->next) { for (ndesc=0, sl=users; sl; sl = sl->next) {
if (classify_user_id (sl->d, desc+ndesc)) if (classify_user_id (sl->d, desc+ndesc))
@ -406,7 +406,7 @@ do_export_stream( IOBUF out, STRLIST users, int secret,
sk = copy_secret_key (NULL, sk_save); sk = copy_secret_key (NULL, sk_save);
node->pkt->pkt.secret_key = sk; node->pkt->pkt.secret_key = sk;
log_info ("about to export an unprotected subkey\n"); log_info (_("about to export an unprotected subkey\n"));
switch (is_secret_key_protected (sk)) switch (is_secret_key_protected (sk))
{ {
case -1: case -1:
@ -429,8 +429,7 @@ do_export_stream( IOBUF out, STRLIST users, int secret,
{ {
node->pkt->pkt.secret_key = sk_save; node->pkt->pkt.secret_key = sk_save;
free_secret_key (sk); free_secret_key (sk);
/* FIXME: Make translatable after releasing 1.4.2 */ log_error (_("failed to unprotect the subkey: %s\n"),
log_error ("failed to unprotect the subkey: %s\n",
g10_errstr (rc)); g10_errstr (rc));
goto leave; goto leave;
} }
@ -478,7 +477,7 @@ do_export_stream( IOBUF out, STRLIST users, int secret,
rc = 0; rc = 0;
leave: leave:
m_free(desc); xfree(desc);
keydb_release (kdbhd); keydb_release (kdbhd);
if(rc || keyblock_out==NULL) if(rc || keyblock_out==NULL)
release_kbnode( keyblock ); release_kbnode( keyblock );

52
g10/free-packet.c
View File

@ -37,7 +37,7 @@
void void
free_symkey_enc( PKT_symkey_enc *enc ) free_symkey_enc( PKT_symkey_enc *enc )
{ {
m_free(enc); xfree(enc);
} }
void void
@ -49,7 +49,7 @@ free_pubkey_enc( PKT_pubkey_enc *enc )
mpi_free(enc->data[0]); mpi_free(enc->data[0]);
for(i=0; i < n; i++ ) for(i=0; i < n; i++ )
mpi_free( enc->data[i] ); mpi_free( enc->data[i] );
m_free(enc); xfree(enc);
} }
void void
@ -63,10 +63,10 @@ free_seckey_enc( PKT_signature *sig )
for(i=0; i < n; i++ ) for(i=0; i < n; i++ )
mpi_free( sig->data[i] ); mpi_free( sig->data[i] );
m_free(sig->revkey); xfree(sig->revkey);
m_free(sig->hashed); xfree(sig->hashed);
m_free(sig->unhashed); xfree(sig->unhashed);
m_free(sig); xfree(sig);
} }
@ -82,7 +82,7 @@ release_public_key_parts( PKT_public_key *pk )
pk->pkey[i] = NULL; pk->pkey[i] = NULL;
} }
if (pk->prefs) { if (pk->prefs) {
m_free (pk->prefs); xfree (pk->prefs);
pk->prefs = NULL; pk->prefs = NULL;
} }
if (pk->user_id) { if (pk->user_id) {
@ -90,7 +90,7 @@ release_public_key_parts( PKT_public_key *pk )
pk->user_id = NULL; pk->user_id = NULL;
} }
if (pk->revkey) { if (pk->revkey) {
m_free(pk->revkey); xfree(pk->revkey);
pk->revkey=NULL; pk->revkey=NULL;
pk->numrevkeys=0; pk->numrevkeys=0;
} }
@ -101,7 +101,7 @@ void
free_public_key( PKT_public_key *pk ) free_public_key( PKT_public_key *pk )
{ {
release_public_key_parts( pk ); release_public_key_parts( pk );
m_free(pk); xfree(pk);
} }
@ -112,7 +112,7 @@ cp_subpktarea (subpktarea_t *s )
if( !s ) if( !s )
return NULL; return NULL;
d = m_alloc (sizeof (*d) + s->size - 1 ); d = xmalloc (sizeof (*d) + s->size - 1 );
d->size = s->size; d->size = s->size;
d->len = s->len; d->len = s->len;
memcpy (d->data, s->data, s->len); memcpy (d->data, s->data, s->len);
@ -133,7 +133,7 @@ copy_prefs (const prefitem_t *prefs)
for (n=0; prefs[n].type; n++) for (n=0; prefs[n].type; n++)
; ;
new = m_alloc ( sizeof (*new) * (n+1)); new = xmalloc ( sizeof (*new) * (n+1));
for (n=0; prefs[n].type; n++) { for (n=0; prefs[n].type; n++) {
new[n].type = prefs[n].type; new[n].type = prefs[n].type;
new[n].value = prefs[n].value; new[n].value = prefs[n].value;
@ -151,7 +151,7 @@ copy_public_key ( PKT_public_key *d, PKT_public_key *s)
int n, i; int n, i;
if( !d ) if( !d )
d = m_alloc(sizeof *d); d = xmalloc(sizeof *d);
memcpy( d, s, sizeof *d ); memcpy( d, s, sizeof *d );
d->user_id = scopy_user_id (s->user_id); d->user_id = scopy_user_id (s->user_id);
d->prefs = copy_prefs (s->prefs); d->prefs = copy_prefs (s->prefs);
@ -165,7 +165,7 @@ copy_public_key ( PKT_public_key *d, PKT_public_key *s)
if( !s->revkey && s->numrevkeys ) if( !s->revkey && s->numrevkeys )
BUG(); BUG();
if( s->numrevkeys ) { if( s->numrevkeys ) {
d->revkey = m_alloc(sizeof(struct revocation_key)*s->numrevkeys); d->revkey = xmalloc(sizeof(struct revocation_key)*s->numrevkeys);
memcpy(d->revkey,s->revkey,sizeof(struct revocation_key)*s->numrevkeys); memcpy(d->revkey,s->revkey,sizeof(struct revocation_key)*s->numrevkeys);
} }
else else
@ -201,7 +201,7 @@ copy_signature( PKT_signature *d, PKT_signature *s )
int n, i; int n, i;
if( !d ) if( !d )
d = m_alloc(sizeof *d); d = xmalloc(sizeof *d);
memcpy( d, s, sizeof *d ); memcpy( d, s, sizeof *d );
n = pubkey_get_nsig( s->pubkey_algo ); n = pubkey_get_nsig( s->pubkey_algo );
if( !n ) if( !n )
@ -253,7 +253,7 @@ void
free_secret_key( PKT_secret_key *sk ) free_secret_key( PKT_secret_key *sk )
{ {
release_secret_key_parts( sk ); release_secret_key_parts( sk );
m_free(sk); xfree(sk);
} }
PKT_secret_key * PKT_secret_key *
@ -262,7 +262,7 @@ copy_secret_key( PKT_secret_key *d, PKT_secret_key *s )
int n, i; int n, i;
if( !d ) if( !d )
d = m_alloc(sizeof *d); d = xmalloc(sizeof *d);
else else
release_secret_key_parts (d); release_secret_key_parts (d);
memcpy( d, s, sizeof *d ); memcpy( d, s, sizeof *d );
@ -280,14 +280,14 @@ copy_secret_key( PKT_secret_key *d, PKT_secret_key *s )
void void
free_comment( PKT_comment *rem ) free_comment( PKT_comment *rem )
{ {
m_free(rem); xfree(rem);
} }
void void
free_attributes(PKT_user_id *uid) free_attributes(PKT_user_id *uid)
{ {
m_free(uid->attribs); xfree(uid->attribs);
m_free(uid->attrib_data); xfree(uid->attrib_data);
uid->attribs=NULL; uid->attribs=NULL;
uid->attrib_data=NULL; uid->attrib_data=NULL;
@ -302,9 +302,9 @@ free_user_id (PKT_user_id *uid)
return; return;
free_attributes(uid); free_attributes(uid);
m_free (uid->prefs); xfree (uid->prefs);
m_free (uid->namehash); xfree (uid->namehash);
m_free (uid); xfree (uid);
} }
void void
@ -316,7 +316,7 @@ free_compressed( PKT_compressed *zd )
while( iobuf_read( zd->buf, NULL, 1<<30 ) != -1 ) while( iobuf_read( zd->buf, NULL, 1<<30 ) != -1 )
; ;
} }
m_free(zd); xfree(zd);
} }
void void
@ -337,7 +337,7 @@ free_encrypted( PKT_encrypted *ed )
} }
} }
} }
m_free(ed); xfree(ed);
} }
@ -359,7 +359,7 @@ free_plaintext( PKT_plaintext *pt )
} }
} }
} }
m_free(pt); xfree(pt);
} }
/**************** /****************
@ -409,7 +409,7 @@ free_packet( PACKET *pkt )
free_plaintext( pkt->pkt.plaintext ); free_plaintext( pkt->pkt.plaintext );
break; break;
default: default:
m_free( pkt->pkt.generic ); xfree( pkt->pkt.generic );
break; break;
} }
pkt->pkt.generic = NULL; pkt->pkt.generic = NULL;

118
g10/g10.c
View File

@ -802,7 +802,7 @@ build_list( const char *text, char letter,
for(i=0; i <= 110; i++ ) for(i=0; i <= 110; i++ )
if( !chkf(i) && (s=mapf(i)) ) if( !chkf(i) && (s=mapf(i)) )
n += strlen(s) + 7 + 2; n += strlen(s) + 7 + 2;
list = m_alloc( 21 + n ); *list = 0; list = xmalloc( 21 + n ); *list = 0;
for(p=NULL, i=0; i <= 110; i++ ) { for(p=NULL, i=0; i <= 110; i++ ) {
if( !chkf(i) && (s=mapf(i)) ) { if( !chkf(i) && (s=mapf(i)) ) {
if( !p ) { if( !p ) {
@ -815,7 +815,7 @@ build_list( const char *text, char letter,
if(strlen(line)>60) { if(strlen(line)>60) {
int spaces=strlen(text); int spaces=strlen(text);
list=m_realloc(list,n+spaces+1); list=xrealloc(list,n+spaces+1);
/* realloc could move the block, so find the end again */ /* realloc could move the block, so find the end again */
p=list; p=list;
while(*p) while(*p)
@ -871,7 +871,7 @@ make_username( const char *string )
{ {
char *p; char *p;
if( utf8_strings ) if( utf8_strings )
p = m_strdup(string); p = xstrdup(string);
else else
p = native_to_utf8( string ); p = native_to_utf8( string );
return p; return p;
@ -1038,7 +1038,7 @@ add_group(char *string)
if(!item) if(!item)
{ {
item=m_alloc(sizeof(struct groupitem)); item=xmalloc(sizeof(struct groupitem));
item->name=name; item->name=name;
item->next=opt.grouplist; item->next=opt.grouplist;
item->values=NULL; item->values=NULL;
@ -1071,7 +1071,7 @@ rm_group(char *name)
opt.grouplist=item->next; opt.grouplist=item->next;
free_strlist(item->values); free_strlist(item->values);
m_free(item); xfree(item);
break; break;
} }
} }
@ -1114,7 +1114,7 @@ check_permissions(const char *path,int item)
tmppath=make_filename(GNUPG_LIBDIR,path,NULL); tmppath=make_filename(GNUPG_LIBDIR,path,NULL);
} }
else else
tmppath=m_strdup(path); tmppath=xstrdup(path);
/* If the item is located in the homedir, but isn't the homedir, /* If the item is located in the homedir, but isn't the homedir,
don't continue if we already checked the homedir itself. This is don't continue if we already checked the homedir itself. This is
@ -1147,7 +1147,7 @@ check_permissions(const char *path,int item)
goto end; goto end;
} }
m_free(dir); xfree(dir);
/* Assume failure */ /* Assume failure */
ret=1; ret=1;
@ -1270,7 +1270,7 @@ check_permissions(const char *path,int item)
} }
end: end:
m_free(tmppath); xfree(tmppath);
if(homedir) if(homedir)
homedir_cache=ret; homedir_cache=ret;
@ -1479,8 +1479,8 @@ parse_subpacket_list(char *list)
} }
} }
m_free(opt.show_subpackets); xfree(opt.show_subpackets);
opt.show_subpackets=m_alloc(count+1); opt.show_subpackets=xmalloc(count+1);
opt.show_subpackets[count--]=0; opt.show_subpackets[count--]=0;
for(i=1;i<128 && count>=0;i++) for(i=1;i<128 && count>=0;i++)
@ -1531,7 +1531,7 @@ parse_list_options(char *str)
else if(subpackets==NULL && opt.show_subpackets) else if(subpackets==NULL && opt.show_subpackets)
{ {
/* User did 'no-show-subpackets' */ /* User did 'no-show-subpackets' */
m_free(opt.show_subpackets); xfree(opt.show_subpackets);
opt.show_subpackets=NULL; opt.show_subpackets=NULL;
} }
@ -1552,7 +1552,7 @@ collapse_args(int argc,char *argv[])
for(i=0;i<argc;i++) for(i=0;i<argc;i++)
{ {
len+=strlen(argv[i])+2; len+=strlen(argv[i])+2;
str=m_realloc(str,len); str=xrealloc(str,len);
if(first) if(first)
{ {
str[0]='\0'; str[0]='\0';
@ -1641,7 +1641,7 @@ main (int argc, char **argv )
* secmem_init() somewhere after the option parsing * secmem_init() somewhere after the option parsing
*/ */
log_set_name("gpg"); log_set_name("gpg");
secure_random_alloc(); /* put random number into secure memory */ secure_randoxmalloc(); /* put random number into secure memory */
may_coredump = disable_core_dumps(); may_coredump = disable_core_dumps();
init_signals(); init_signals();
create_dotlock(NULL); /* register locking cleanup */ create_dotlock(NULL); /* register locking cleanup */
@ -1740,7 +1740,7 @@ main (int argc, char **argv )
#ifdef HAVE_DOSISH_SYSTEM #ifdef HAVE_DOSISH_SYSTEM
if ( strchr (opt.homedir,'\\') ) { if ( strchr (opt.homedir,'\\') ) {
char *d, *buf = m_alloc (strlen (opt.homedir)+1); char *d, *buf = xmalloc (strlen (opt.homedir)+1);
const char *s = opt.homedir; const char *s = opt.homedir;
for (d=buf,s=opt.homedir; *s; s++) for (d=buf,s=opt.homedir; *s; s++)
*d++ = *s == '\\'? '/': *s; *d++ = *s == '\\'? '/': *s;
@ -1770,7 +1770,7 @@ main (int argc, char **argv )
/* Try for a version specific config file first */ /* Try for a version specific config file first */
if( default_config ) if( default_config )
{ {
char *name=m_strdup("gpg" EXTSEP_S "conf-" SAFE_VERSION); char *name=xstrdup("gpg" EXTSEP_S "conf-" SAFE_VERSION);
char *ver=&name[strlen("gpg" EXTSEP_S "conf-")]; char *ver=&name[strlen("gpg" EXTSEP_S "conf-")];
do do
@ -1779,7 +1779,7 @@ main (int argc, char **argv )
{ {
char *tok; char *tok;
m_free(configname); xfree(configname);
configname=NULL; configname=NULL;
if((tok=strrchr(ver,SAFE_VERSION_DASH))) if((tok=strrchr(ver,SAFE_VERSION_DASH)))
@ -1794,7 +1794,7 @@ main (int argc, char **argv )
} }
while(access(configname,R_OK)); while(access(configname,R_OK));
m_free(name); xfree(name);
if(!configname) if(!configname)
configname=make_filename(opt.homedir, "gpg" EXTSEP_S "conf", NULL ); configname=make_filename(opt.homedir, "gpg" EXTSEP_S "conf", NULL );
@ -1803,11 +1803,11 @@ main (int argc, char **argv )
char *p = make_filename(opt.homedir, "options", NULL ); char *p = make_filename(opt.homedir, "options", NULL );
if (!access (p, R_OK)) if (!access (p, R_OK))
log_info (_("NOTE: old default options file `%s' ignored\n"), p); log_info (_("NOTE: old default options file `%s' ignored\n"), p);
m_free (p); xfree (p);
} }
else else
{ /* Keep on using the old default one. */ { /* Keep on using the old default one. */
m_free (configname); xfree (configname);
configname = make_filename(opt.homedir, "options", NULL ); configname = make_filename(opt.homedir, "options", NULL );
} }
} }
@ -1852,7 +1852,7 @@ main (int argc, char **argv )
configname, strerror(errno) ); configname, strerror(errno) );
g10_exit(2); g10_exit(2);
} }
m_free(configname); configname = NULL; xfree(configname); configname = NULL;
} }
if( parse_debug && configname ) if( parse_debug && configname )
log_info(_("reading options from `%s'\n"), configname ); log_info(_("reading options from `%s'\n"), configname );
@ -2022,8 +2022,8 @@ main (int argc, char **argv )
case oOptions: case oOptions:
/* config files may not be nested (silently ignore them) */ /* config files may not be nested (silently ignore them) */
if( !configfp ) { if( !configfp ) {
m_free(configname); xfree(configname);
configname = m_strdup(pargs.r.ret_str); configname = xstrdup(pargs.r.ret_str);
goto next_pass; goto next_pass;
} }
break; break;
@ -2045,11 +2045,11 @@ main (int argc, char **argv )
opt.def_recipient = make_username(pargs.r.ret_str); opt.def_recipient = make_username(pargs.r.ret_str);
break; break;
case oDefRecipientSelf: case oDefRecipientSelf:
m_free(opt.def_recipient); opt.def_recipient = NULL; xfree(opt.def_recipient); opt.def_recipient = NULL;
opt.def_recipient_self = 1; opt.def_recipient_self = 1;
break; break;
case oNoDefRecipient: case oNoDefRecipient:
m_free(opt.def_recipient); opt.def_recipient = NULL; xfree(opt.def_recipient); opt.def_recipient = NULL;
opt.def_recipient_self = 0; opt.def_recipient_self = 0;
break; break;
case oNoOptions: opt.no_homedir_creation = 1; break; /* no-options */ case oNoOptions: opt.no_homedir_creation = 1; break; /* no-options */
@ -2206,8 +2206,8 @@ main (int argc, char **argv )
case oDisableMDC: opt.disable_mdc = 1; break; case oDisableMDC: opt.disable_mdc = 1; break;
case oNoDisableMDC: opt.disable_mdc = 0; break; case oNoDisableMDC: opt.disable_mdc = 0; break;
case oS2KMode: opt.s2k_mode = pargs.r.ret_int; break; case oS2KMode: opt.s2k_mode = pargs.r.ret_int; break;
case oS2KDigest: s2k_digest_string = m_strdup(pargs.r.ret_str); break; case oS2KDigest: s2k_digest_string = xstrdup(pargs.r.ret_str); break;
case oS2KCipher: s2k_cipher_string = m_strdup(pargs.r.ret_str); break; case oS2KCipher: s2k_cipher_string = xstrdup(pargs.r.ret_str); break;
case oSimpleSKChecksum: opt.simple_sk_checksum = 1; break; case oSimpleSKChecksum: opt.simple_sk_checksum = 1; break;
case oNoEncryptTo: opt.no_encrypt_to = 1; break; case oNoEncryptTo: opt.no_encrypt_to = 1; break;
case oEncryptTo: /* store the recipient in the second list */ case oEncryptTo: /* store the recipient in the second list */
@ -2284,10 +2284,10 @@ main (int argc, char **argv )
opt.command_fd = open_info_file (pargs.r.ret_str, 0); opt.command_fd = open_info_file (pargs.r.ret_str, 0);
break; break;
case oCipherAlgo: case oCipherAlgo:
def_cipher_string = m_strdup(pargs.r.ret_str); def_cipher_string = xstrdup(pargs.r.ret_str);
break; break;
case oDigestAlgo: case oDigestAlgo:
def_digest_string = m_strdup(pargs.r.ret_str); def_digest_string = xstrdup(pargs.r.ret_str);
break; break;
case oCompressAlgo: case oCompressAlgo:
/* If it is all digits, stick a Z in front of it for /* If it is all digits, stick a Z in front of it for
@ -2305,15 +2305,15 @@ main (int argc, char **argv )
if(*pt=='\0') if(*pt=='\0')
{ {
compress_algo_string=m_alloc(strlen(pargs.r.ret_str)+2); compress_algo_string=xmalloc(strlen(pargs.r.ret_str)+2);
strcpy(compress_algo_string,"Z"); strcpy(compress_algo_string,"Z");
strcat(compress_algo_string,pargs.r.ret_str); strcat(compress_algo_string,pargs.r.ret_str);
} }
else else
compress_algo_string = m_strdup(pargs.r.ret_str); compress_algo_string = xstrdup(pargs.r.ret_str);
} }
break; break;
case oCertDigestAlgo: cert_digest_string = m_strdup(pargs.r.ret_str); break; case oCertDigestAlgo: cert_digest_string = xstrdup(pargs.r.ret_str); break;
case oNoSecmemWarn: secmem_set_flags( secmem_get_flags() | 1 ); break; case oNoSecmemWarn: secmem_set_flags( secmem_get_flags() | 1 ); break;
case oRequireSecmem: require_secmem=1; break; case oRequireSecmem: require_secmem=1; break;
case oNoRequireSecmem: require_secmem=0; break; case oNoRequireSecmem: require_secmem=0; break;
@ -2524,7 +2524,7 @@ main (int argc, char **argv )
struct groupitem *iter=opt.grouplist; struct groupitem *iter=opt.grouplist;
free_strlist(iter->values); free_strlist(iter->values);
opt.grouplist=opt.grouplist->next; opt.grouplist=opt.grouplist->next;
m_free(iter); xfree(iter);
} }
break; break;
case oStrict: opt.strict=1; log_set_strict(1); break; case oStrict: opt.strict=1; log_set_strict(1); break;
@ -2569,11 +2569,11 @@ main (int argc, char **argv )
if (!save_configname) if (!save_configname)
save_configname = configname; save_configname = configname;
else else
m_free(configname); xfree(configname);
configname = NULL; configname = NULL;
goto next_pass; goto next_pass;
} }
m_free( configname ); configname = NULL; xfree( configname ); configname = NULL;
if( log_get_errorcount(0) ) if( log_get_errorcount(0) )
g10_exit(2); g10_exit(2);
@ -2584,7 +2584,7 @@ main (int argc, char **argv )
gpgconf_list (save_configname); gpgconf_list (save_configname);
g10_exit (0); g10_exit (0);
} }
m_free (save_configname); xfree (save_configname);
if( nogreeting ) if( nogreeting )
greeting = 0; greeting = 0;
@ -2699,8 +2699,8 @@ main (int argc, char **argv )
/* This only sets IDEA for symmetric encryption /* This only sets IDEA for symmetric encryption
since it is set via select_algo_from_prefs for since it is set via select_algo_from_prefs for
pk encryption. */ pk encryption. */
m_free(def_cipher_string); xfree(def_cipher_string);
def_cipher_string = m_strdup("idea"); def_cipher_string = xstrdup("idea");
} }
/* PGP2 can't handle the output from the textmode /* PGP2 can't handle the output from the textmode
@ -2722,10 +2722,10 @@ main (int argc, char **argv )
opt.pgp2_workarounds = 1; opt.pgp2_workarounds = 1;
opt.ask_sig_expire = 0; opt.ask_sig_expire = 0;
opt.ask_cert_expire = 0; opt.ask_cert_expire = 0;
m_free(def_digest_string); xfree(def_digest_string);
def_digest_string = m_strdup("md5"); def_digest_string = xstrdup("md5");
m_free(s2k_digest_string); xfree(s2k_digest_string);
s2k_digest_string = m_strdup("md5"); s2k_digest_string = xstrdup("md5");
opt.compress_algo = COMPRESS_ALGO_ZIP; opt.compress_algo = COMPRESS_ALGO_ZIP;
} }
} }
@ -2754,37 +2754,37 @@ main (int argc, char **argv )
(ascii_strcasecmp(def_cipher_string,"idea")==0 (ascii_strcasecmp(def_cipher_string,"idea")==0
|| ascii_strcasecmp(def_cipher_string,"s1")==0)) || ascii_strcasecmp(def_cipher_string,"s1")==0))
idea_cipher_warn(1); idea_cipher_warn(1);
m_free(def_cipher_string); def_cipher_string = NULL; xfree(def_cipher_string); def_cipher_string = NULL;
if( check_cipher_algo(opt.def_cipher_algo) ) if( check_cipher_algo(opt.def_cipher_algo) )
log_error(_("selected cipher algorithm is invalid\n")); log_error(_("selected cipher algorithm is invalid\n"));
} }
if( def_digest_string ) { if( def_digest_string ) {
opt.def_digest_algo = string_to_digest_algo(def_digest_string); opt.def_digest_algo = string_to_digest_algo(def_digest_string);
m_free(def_digest_string); def_digest_string = NULL; xfree(def_digest_string); def_digest_string = NULL;
if( check_digest_algo(opt.def_digest_algo) ) if( check_digest_algo(opt.def_digest_algo) )
log_error(_("selected digest algorithm is invalid\n")); log_error(_("selected digest algorithm is invalid\n"));
} }
if( compress_algo_string ) { if( compress_algo_string ) {
opt.compress_algo = string_to_compress_algo(compress_algo_string); opt.compress_algo = string_to_compress_algo(compress_algo_string);
m_free(compress_algo_string); compress_algo_string = NULL; xfree(compress_algo_string); compress_algo_string = NULL;
if( check_compress_algo(opt.compress_algo) ) if( check_compress_algo(opt.compress_algo) )
log_error(_("selected compression algorithm is invalid\n")); log_error(_("selected compression algorithm is invalid\n"));
} }
if( cert_digest_string ) { if( cert_digest_string ) {
opt.cert_digest_algo = string_to_digest_algo(cert_digest_string); opt.cert_digest_algo = string_to_digest_algo(cert_digest_string);
m_free(cert_digest_string); cert_digest_string = NULL; xfree(cert_digest_string); cert_digest_string = NULL;
if( check_digest_algo(opt.cert_digest_algo) ) if( check_digest_algo(opt.cert_digest_algo) )
log_error(_("selected certification digest algorithm is invalid\n")); log_error(_("selected certification digest algorithm is invalid\n"));
} }
if( s2k_cipher_string ) { if( s2k_cipher_string ) {
opt.s2k_cipher_algo = string_to_cipher_algo(s2k_cipher_string); opt.s2k_cipher_algo = string_to_cipher_algo(s2k_cipher_string);
m_free(s2k_cipher_string); s2k_cipher_string = NULL; xfree(s2k_cipher_string); s2k_cipher_string = NULL;
if( check_cipher_algo(opt.s2k_cipher_algo) ) if( check_cipher_algo(opt.s2k_cipher_algo) )
log_error(_("selected cipher algorithm is invalid\n")); log_error(_("selected cipher algorithm is invalid\n"));
} }
if( s2k_digest_string ) { if( s2k_digest_string ) {
opt.s2k_digest_algo = string_to_digest_algo(s2k_digest_string); opt.s2k_digest_algo = string_to_digest_algo(s2k_digest_string);
m_free(s2k_digest_string); s2k_digest_string = NULL; xfree(s2k_digest_string); s2k_digest_string = NULL;
if( check_digest_algo(opt.s2k_digest_algo) ) if( check_digest_algo(opt.s2k_digest_algo) )
log_error(_("selected digest algorithm is invalid\n")); log_error(_("selected digest algorithm is invalid\n"));
} }
@ -2936,7 +2936,7 @@ main (int argc, char **argv )
set_random_seed_file(p); set_random_seed_file(p);
if (!access (p, F_OK)) if (!access (p, F_OK))
register_secured_file (p); register_secured_file (p);
m_free(p); xfree(p);
} }
if( !cmd && opt.fingerprint && !with_fpr ) { if( !cmd && opt.fingerprint && !with_fpr ) {
@ -3093,7 +3093,7 @@ main (int argc, char **argv )
if( argc > 1 ) if( argc > 1 )
wrong_args(_("--sign [filename]")); wrong_args(_("--sign [filename]"));
if( argc ) { if( argc ) {
sl = m_alloc_clear( sizeof *sl + strlen(fname)); sl = xmalloc_clear( sizeof *sl + strlen(fname));
strcpy(sl->d, fname); strcpy(sl->d, fname);
} }
} }
@ -3106,7 +3106,7 @@ main (int argc, char **argv )
if( argc > 1 ) if( argc > 1 )
wrong_args(_("--sign --encrypt [filename]")); wrong_args(_("--sign --encrypt [filename]"));
if( argc ) { if( argc ) {
sl = m_alloc_clear( sizeof *sl + strlen(fname)); sl = xmalloc_clear( sizeof *sl + strlen(fname));
strcpy(sl->d, fname); strcpy(sl->d, fname);
} }
else else
@ -3130,7 +3130,7 @@ main (int argc, char **argv )
{ {
if( argc ) if( argc )
{ {
sl = m_alloc_clear( sizeof *sl + strlen(fname)); sl = xmalloc_clear( sizeof *sl + strlen(fname));
strcpy(sl->d, fname); strcpy(sl->d, fname);
} }
else else
@ -3205,7 +3205,7 @@ main (int argc, char **argv )
append_to_strlist( &sl, "save" ); append_to_strlist( &sl, "save" );
username = make_username( fname ); username = make_username( fname );
keyedit_menu(fname, locusr, sl, 0, 0 ); keyedit_menu(fname, locusr, sl, 0, 0 );
m_free(username); xfree(username);
free_strlist(sl); free_strlist(sl);
break; break;
@ -3222,7 +3222,7 @@ main (int argc, char **argv )
} }
else else
keyedit_menu(username, locusr, NULL, 0, 1 ); keyedit_menu(username, locusr, NULL, 0, 1 );
m_free(username); xfree(username);
break; break;
case aDeleteKeys: case aDeleteKeys:
@ -3369,7 +3369,7 @@ main (int argc, char **argv )
wrong_args("--gen-revoke user-id"); wrong_args("--gen-revoke user-id");
username = make_username(*argv); username = make_username(*argv);
gen_revoke( username ); gen_revoke( username );
m_free( username ); xfree( username );
break; break;
case aDesigRevoke: case aDesigRevoke:
@ -3377,7 +3377,7 @@ main (int argc, char **argv )
wrong_args("--desig-revoke user-id"); wrong_args("--desig-revoke user-id");
username = make_username(*argv); username = make_username(*argv);
gen_desig_revoke( username ); gen_desig_revoke( username );
m_free( username ); xfree( username );
break; break;
case aDeArmor: case aDeArmor:
@ -3455,7 +3455,7 @@ main (int argc, char **argv )
if (opt.armor) { if (opt.armor) {
char *tmp = make_radix64_string (p, n); char *tmp = make_radix64_string (p, n);
fputs (tmp, stdout); fputs (tmp, stdout);
m_free (tmp); xfree (tmp);
if (n%3 == 1) if (n%3 == 1)
putchar ('='); putchar ('=');
if (n%3) if (n%3)
@ -3463,7 +3463,7 @@ main (int argc, char **argv )
} else { } else {
fwrite( p, n, 1, stdout ); fwrite( p, n, 1, stdout );
} }
m_free(p); xfree(p);
if( !endless ) if( !endless )
count -= n; count -= n;
} }
@ -3534,7 +3534,7 @@ main (int argc, char **argv )
for( ; argc; argc--, argv++ ) { for( ; argc; argc--, argv++ ) {
username = make_username( *argv ); username = make_username( *argv );
list_trust_path( username ); list_trust_path( username );
m_free(username); xfree(username);
} }
break; break;
@ -3595,7 +3595,7 @@ main (int argc, char **argv )
{ {
char *str=collapse_args(argc,argv); char *str=collapse_args(argc,argv);
list_config(str); list_config(str);
m_free(str); xfree(str);
} }
break; break;

66
g10/getkey.c
View File

@ -152,7 +152,7 @@ cache_public_key( PKT_public_key *pk )
return; return;
} }
pk_cache_entries++; pk_cache_entries++;
ce = m_alloc( sizeof *ce ); ce = xmalloc( sizeof *ce );
ce->next = pk_cache; ce->next = pk_cache;
pk_cache = ce; pk_cache = ce;
ce->pk = copy_public_key( NULL, pk ); ce->pk = copy_public_key( NULL, pk );
@ -195,7 +195,7 @@ release_keyid_list ( keyid_list_t k )
{ {
while ( k ) { while ( k ) {
keyid_list_t k2 = k->next; keyid_list_t k2 = k->next;
m_free (k); xfree (k);
k = k2; k = k2;
} }
} }
@ -216,7 +216,7 @@ cache_user_id( KBNODE keyblock )
for (k=keyblock; k; k = k->next ) { for (k=keyblock; k; k = k->next ) {
if ( k->pkt->pkttype == PKT_PUBLIC_KEY if ( k->pkt->pkttype == PKT_PUBLIC_KEY
|| k->pkt->pkttype == PKT_PUBLIC_SUBKEY ) { || k->pkt->pkttype == PKT_PUBLIC_SUBKEY ) {
keyid_list_t a = m_alloc_clear ( sizeof *a ); keyid_list_t a = xmalloc_clear ( sizeof *a );
/* Hmmm: For a long list of keyids it might be an advantage /* Hmmm: For a long list of keyids it might be an advantage
* to append the keys */ * to append the keys */
keyid_from_pk( k->pkt->pkt.public_key, a->keyid ); keyid_from_pk( k->pkt->pkt.public_key, a->keyid );
@ -229,7 +229,7 @@ cache_user_id( KBNODE keyblock )
if( DBG_CACHE ) if( DBG_CACHE )
log_debug("cache_user_id: already in cache\n"); log_debug("cache_user_id: already in cache\n");
release_keyid_list ( keyids ); release_keyid_list ( keyids );
m_free ( a ); xfree ( a );
return; return;
} }
} }
@ -250,10 +250,10 @@ cache_user_id( KBNODE keyblock )
r = user_id_db; r = user_id_db;
user_id_db = r->next; user_id_db = r->next;
release_keyid_list ( r->keyids ); release_keyid_list ( r->keyids );
m_free(r); xfree(r);
uid_cache_entries--; uid_cache_entries--;
} }
r = m_alloc( sizeof *r + uidlen-1 ); r = xmalloc( sizeof *r + uidlen-1 );
r->keyids = keyids; r->keyids = keyids;
r->len = uidlen; r->len = uidlen;
memcpy(r->name, uid, r->len); memcpy(r->name, uid, r->len);
@ -273,7 +273,7 @@ getkey_disable_caches()
for( ce = pk_cache; ce; ce = ce2 ) { for( ce = pk_cache; ce; ce = ce2 ) {
ce2 = ce->next; ce2 = ce->next;
free_public_key( ce->pk ); free_public_key( ce->pk );
m_free( ce ); xfree( ce );
} }
pk_cache_disabled=1; pk_cache_disabled=1;
pk_cache_entries = 0; pk_cache_entries = 0;
@ -338,7 +338,7 @@ get_pubkey( PKT_public_key *pk, u32 *keyid )
#endif #endif
/* more init stuff */ /* more init stuff */
if( !pk ) { if( !pk ) {
pk = m_alloc_clear( sizeof *pk ); pk = xmalloc_clear( sizeof *pk );
internal++; internal++;
} }
@ -810,7 +810,7 @@ key_byname( GETKEY_CTX *retctx, STRLIST namelist,
if(!namelist) if(!namelist)
{ {
ctx = m_alloc_clear (sizeof *ctx); ctx = xmalloc_clear (sizeof *ctx);
ctx->nitems = 1; ctx->nitems = 1;
ctx->items[0].mode=KEYDB_SEARCH_MODE_FIRST; ctx->items[0].mode=KEYDB_SEARCH_MODE_FIRST;
if(!include_unusable) if(!include_unusable)
@ -822,7 +822,7 @@ key_byname( GETKEY_CTX *retctx, STRLIST namelist,
for(n=0, r=namelist; r; r = r->next ) for(n=0, r=namelist; r; r = r->next )
n++; n++;
ctx = m_alloc_clear (sizeof *ctx + (n-1)*sizeof ctx->items ); ctx = xmalloc_clear (sizeof *ctx + (n-1)*sizeof ctx->items );
ctx->nitems = n; ctx->nitems = n;
for(n=0, r=namelist; r; r = r->next, n++ ) for(n=0, r=namelist; r; r = r->next, n++ )
@ -833,7 +833,7 @@ key_byname( GETKEY_CTX *retctx, STRLIST namelist,
ctx->exact = 1; ctx->exact = 1;
if (!ctx->items[n].mode) if (!ctx->items[n].mode)
{ {
m_free (ctx); xfree (ctx);
return G10ERR_INV_USER_ID; return G10ERR_INV_USER_ID;
} }
if(!include_unusable if(!include_unusable
@ -932,7 +932,7 @@ get_pubkey_end( GETKEY_CTX ctx )
memset (&ctx->kbpos, 0, sizeof ctx->kbpos); memset (&ctx->kbpos, 0, sizeof ctx->kbpos);
keydb_release (ctx->kr_handle); keydb_release (ctx->kr_handle);
if( !ctx->not_allocated ) if( !ctx->not_allocated )
m_free( ctx ); xfree( ctx );
} }
} }
@ -1392,12 +1392,12 @@ fixup_uidnode ( KBNODE uidnode, KBNODE signode, u32 keycreated )
p = parse_sig_subpkt ( sig->hashed, SIGSUBPKT_PREF_COMPR, &n ); p = parse_sig_subpkt ( sig->hashed, SIGSUBPKT_PREF_COMPR, &n );
zip = p; nzip = p?n:0; zip = p; nzip = p?n:0;
if (uid->prefs) if (uid->prefs)
m_free (uid->prefs); xfree (uid->prefs);
n = nsym + nhash + nzip; n = nsym + nhash + nzip;
if (!n) if (!n)
uid->prefs = NULL; uid->prefs = NULL;
else { else {
uid->prefs = m_alloc (sizeof (*uid->prefs) * (n+1)); uid->prefs = xmalloc (sizeof (*uid->prefs) * (n+1));
n = 0; n = 0;
for (; nsym; nsym--, n++) { for (; nsym; nsym--, n++) {
uid->prefs[n].type = PREFTYPE_SYM; uid->prefs[n].type = PREFTYPE_SYM;
@ -1477,7 +1477,7 @@ merge_selfsigs_main(KBNODE keyblock, int *r_revoked, struct revoke_info *rinfo)
*/ */
/* In case this key was already merged */ /* In case this key was already merged */
m_free(pk->revkey); xfree(pk->revkey);
pk->revkey=NULL; pk->revkey=NULL;
pk->numrevkeys=0; pk->numrevkeys=0;
@ -1514,7 +1514,7 @@ merge_selfsigs_main(KBNODE keyblock, int *r_revoked, struct revoke_info *rinfo)
int i; int i;
pk->revkey= pk->revkey=
m_realloc(pk->revkey,sizeof(struct revocation_key)* xrealloc(pk->revkey,sizeof(struct revocation_key)*
(pk->numrevkeys+sig->numrevkeys)); (pk->numrevkeys+sig->numrevkeys));
for(i=0;i<sig->numrevkeys;i++) for(i=0;i<sig->numrevkeys;i++)
@ -1565,7 +1565,7 @@ merge_selfsigs_main(KBNODE keyblock, int *r_revoked, struct revoke_info *rinfo)
} }
if(changed) if(changed)
pk->revkey=m_realloc(pk->revkey, pk->revkey=xrealloc(pk->revkey,
pk->numrevkeys*sizeof(struct revocation_key)); pk->numrevkeys*sizeof(struct revocation_key));
} }
@ -1703,7 +1703,7 @@ merge_selfsigs_main(KBNODE keyblock, int *r_revoked, struct revoke_info *rinfo)
{ {
PKT_public_key *ultimate_pk; PKT_public_key *ultimate_pk;
ultimate_pk=m_alloc_clear(sizeof(*ultimate_pk)); ultimate_pk=xmalloc_clear(sizeof(*ultimate_pk));
/* We don't want to use the full get_pubkey to /* We don't want to use the full get_pubkey to
avoid infinite recursion in certain cases. avoid infinite recursion in certain cases.
@ -2023,7 +2023,7 @@ merge_selfsigs_subkey( KBNODE keyblock, KBNODE subnode )
if(p) if(p)
{ {
PKT_signature *backsig=m_alloc_clear(sizeof(PKT_signature)); PKT_signature *backsig=xmalloc_clear(sizeof(PKT_signature));
IOBUF backsig_buf=iobuf_temp_with_content(p,n); IOBUF backsig_buf=iobuf_temp_with_content(p,n);
if(parse_signature(backsig_buf,PKT_SIGNATURE,n,backsig)==0) if(parse_signature(backsig_buf,PKT_SIGNATURE,n,backsig)==0)
@ -2133,7 +2133,7 @@ merge_selfsigs( KBNODE keyblock )
|| k->pkt->pkttype == PKT_PUBLIC_SUBKEY ) { || k->pkt->pkttype == PKT_PUBLIC_SUBKEY ) {
PKT_public_key *pk = k->pkt->pkt.public_key; PKT_public_key *pk = k->pkt->pkt.public_key;
if (pk->prefs) if (pk->prefs)
m_free (pk->prefs); xfree (pk->prefs);
pk->prefs = copy_prefs (prefs); pk->prefs = copy_prefs (prefs);
pk->mdc_feature = mdc_feature; pk->mdc_feature = mdc_feature;
} }
@ -2464,10 +2464,10 @@ finish_lookup (GETKEY_CTX ctx)
if (latest_key != keyblock && opt.verbose) if (latest_key != keyblock && opt.verbose)
{ {
char *tempkeystr= char *tempkeystr=
m_strdup(keystr_from_pk(latest_key->pkt->pkt.public_key)); xstrdup(keystr_from_pk(latest_key->pkt->pkt.public_key));
log_info(_("using subkey %s instead of primary key %s\n"), log_info(_("using subkey %s instead of primary key %s\n"),
tempkeystr, keystr_from_pk(keyblock->pkt->pkt.public_key)); tempkeystr, keystr_from_pk(keyblock->pkt->pkt.public_key));
m_free(tempkeystr); xfree(tempkeystr);
} }
cache_user_id( keyblock ); cache_user_id( keyblock );
@ -2610,7 +2610,7 @@ enum_secret_keys( void **context, PKT_secret_key *sk,
if( !c ) { /* make a new context */ if( !c ) { /* make a new context */
c = m_alloc_clear( sizeof *c ); c = xmalloc_clear( sizeof *c );
*context = c; *context = c;
c->hd = keydb_new (1); c->hd = keydb_new (1);
c->first = 1; c->first = 1;
@ -2621,7 +2621,7 @@ enum_secret_keys( void **context, PKT_secret_key *sk,
if( !sk ) { /* free the context */ if( !sk ) { /* free the context */
keydb_release (c->hd); keydb_release (c->hd);
release_kbnode (c->keyblock); release_kbnode (c->keyblock);
m_free( c ); xfree( c );
*context = NULL; *context = NULL;
return 0; return 0;
} }
@ -2668,7 +2668,7 @@ enum_secret_keys( void **context, PKT_secret_key *sk,
/**************** /****************
* Return a string with a printable representation of the user_id. * Return a string with a printable representation of the user_id.
* this string must be freed by m_free. * this string must be freed by xfree.
*/ */
char* char*
get_user_id_string( u32 *keyid ) get_user_id_string( u32 *keyid )
@ -2686,14 +2686,14 @@ get_user_id_string( u32 *keyid )
{ {
if( a->keyid[0] == keyid[0] && a->keyid[1] == keyid[1] ) if( a->keyid[0] == keyid[0] && a->keyid[1] == keyid[1] )
{ {
p = m_alloc( keystrlen() + 1 + r->len + 1 ); p = xmalloc( keystrlen() + 1 + r->len + 1 );
sprintf(p, "%s %.*s", keystr(keyid), r->len, r->name ); sprintf(p, "%s %.*s", keystr(keyid), r->len, r->name );
return p; return p;
} }
} }
} }
} while( ++pass < 2 && !get_pubkey( NULL, keyid ) ); } while( ++pass < 2 && !get_pubkey( NULL, keyid ) );
p = m_alloc( keystrlen() + 5 ); p = xmalloc( keystrlen() + 5 );
sprintf(p, "%s [?]", keystr(keyid)); sprintf(p, "%s [?]", keystr(keyid));
return p; return p;
} }
@ -2704,7 +2704,7 @@ get_user_id_string_native ( u32 *keyid )
{ {
char *p = get_user_id_string( keyid ); char *p = get_user_id_string( keyid );
char *p2 = utf8_to_native( p, strlen(p), 0 ); char *p2 = utf8_to_native( p, strlen(p), 0 );
m_free(p); xfree(p);
return p2; return p2;
} }
@ -2721,7 +2721,7 @@ get_long_user_id_string( u32 *keyid )
keyid_list_t a; keyid_list_t a;
for (a=r->keyids; a; a= a->next ) { for (a=r->keyids; a; a= a->next ) {
if( a->keyid[0] == keyid[0] && a->keyid[1] == keyid[1] ) { if( a->keyid[0] == keyid[0] && a->keyid[1] == keyid[1] ) {
p = m_alloc( r->len + 20 ); p = xmalloc( r->len + 20 );
sprintf(p, "%08lX%08lX %.*s", sprintf(p, "%08lX%08lX %.*s",
(ulong)keyid[0], (ulong)keyid[1], (ulong)keyid[0], (ulong)keyid[1],
r->len, r->name ); r->len, r->name );
@ -2730,7 +2730,7 @@ get_long_user_id_string( u32 *keyid )
} }
} }
} while( ++pass < 2 && !get_pubkey( NULL, keyid ) ); } while( ++pass < 2 && !get_pubkey( NULL, keyid ) );
p = m_alloc( 25 ); p = xmalloc( 25 );
sprintf(p, "%08lX%08lX [?]", (ulong)keyid[0], (ulong)keyid[1] ); sprintf(p, "%08lX%08lX [?]", (ulong)keyid[0], (ulong)keyid[1] );
return p; return p;
} }
@ -2748,7 +2748,7 @@ get_user_id( u32 *keyid, size_t *rn )
keyid_list_t a; keyid_list_t a;
for (a=r->keyids; a; a= a->next ) { for (a=r->keyids; a; a= a->next ) {
if( a->keyid[0] == keyid[0] && a->keyid[1] == keyid[1] ) { if( a->keyid[0] == keyid[0] && a->keyid[1] == keyid[1] ) {
p = m_alloc( r->len ); p = xmalloc( r->len );
memcpy(p, r->name, r->len ); memcpy(p, r->name, r->len );
*rn = r->len; *rn = r->len;
return p; return p;
@ -2756,7 +2756,7 @@ get_user_id( u32 *keyid, size_t *rn )
} }
} }
} while( ++pass < 2 && !get_pubkey( NULL, keyid ) ); } while( ++pass < 2 && !get_pubkey( NULL, keyid ) );
p = m_strdup( _("[User ID not found]") ); p = xstrdup( _("[User ID not found]") );
*rn = strlen(p); *rn = strlen(p);
return p; return p;
} }
@ -2767,7 +2767,7 @@ get_user_id_native( u32 *keyid )
size_t rn; size_t rn;
char *p = get_user_id( keyid, &rn ); char *p = get_user_id( keyid, &rn );
char *p2 = utf8_to_native( p, rn, 0 ); char *p2 = utf8_to_native( p, rn, 0 );
m_free(p); xfree(p);
return p2; return p2;
} }

54
g10/import.c
View File

@ -113,13 +113,13 @@ parse_import_options(char *str,unsigned int *options,int noisy)
void * void *
import_new_stats_handle (void) import_new_stats_handle (void)
{ {
return m_alloc_clear ( sizeof (struct stats_s) ); return xmalloc_clear ( sizeof (struct stats_s) );
} }
void void
import_release_stats_handle (void *p) import_release_stats_handle (void *p)
{ {
m_free (p); xfree (p);
} }
/**************** /****************
@ -237,7 +237,7 @@ import( IOBUF inp, const char* fname,
getkey_disable_caches(); getkey_disable_caches();
if( !opt.no_armor ) { /* armored reading is not disabled */ if( !opt.no_armor ) { /* armored reading is not disabled */
armor_filter_context_t *afx = m_alloc_clear( sizeof *afx ); armor_filter_context_t *afx = xmalloc_clear( sizeof *afx );
afx->only_keyblocks = 1; afx->only_keyblocks = 1;
iobuf_push_filter2( inp, armor_filter, afx, 1 ); iobuf_push_filter2( inp, armor_filter, afx, 1 );
} }
@ -356,7 +356,7 @@ read_block( IOBUF a, PACKET **pending_pkt, KBNODE *ret_root )
} }
else else
in_cert = 0; in_cert = 0;
pkt = m_alloc( sizeof *pkt ); pkt = xmalloc( sizeof *pkt );
init_packet(pkt); init_packet(pkt);
while( (rc=parse_packet(a, pkt)) != -1 ) { while( (rc=parse_packet(a, pkt)) != -1 ) {
if( rc ) { /* ignore errors */ if( rc ) { /* ignore errors */
@ -389,7 +389,7 @@ read_block( IOBUF a, PACKET **pending_pkt, KBNODE *ret_root )
} }
else else
{ {
compress_filter_context_t *cfx = m_alloc_clear( sizeof *cfx ); compress_filter_context_t *cfx = xmalloc_clear( sizeof *cfx );
pkt->pkt.compressed->buf = NULL; pkt->pkt.compressed->buf = NULL;
push_compress_filter2(a,cfx,pkt->pkt.compressed->algorithm,1); push_compress_filter2(a,cfx,pkt->pkt.compressed->algorithm,1);
} }
@ -417,7 +417,7 @@ read_block( IOBUF a, PACKET **pending_pkt, KBNODE *ret_root )
root = new_kbnode( pkt ); root = new_kbnode( pkt );
else else
add_kbnode( root, new_kbnode( pkt ) ); add_kbnode( root, new_kbnode( pkt ) );
pkt = m_alloc( sizeof *pkt ); pkt = xmalloc( sizeof *pkt );
} }
init_packet(pkt); init_packet(pkt);
break; break;
@ -432,7 +432,7 @@ read_block( IOBUF a, PACKET **pending_pkt, KBNODE *ret_root )
else else
*ret_root = root; *ret_root = root;
free_packet( pkt ); free_packet( pkt );
m_free( pkt ); xfree( pkt );
return rc; return rc;
} }
@ -534,7 +534,7 @@ print_import_check (PKT_public_key * pk, PKT_user_id * id)
u32 keyid[2]; u32 keyid[2];
size_t i, pos = 0, n; size_t i, pos = 0, n;
buf = m_alloc (17+41+id->len+32); buf = xmalloc (17+41+id->len+32);
keyid_from_pk (pk, keyid); keyid_from_pk (pk, keyid);
sprintf (buf, "%08X%08X ", keyid[0], keyid[1]); sprintf (buf, "%08X%08X ", keyid[0], keyid[1]);
pos = 17; pos = 17;
@ -545,7 +545,7 @@ print_import_check (PKT_public_key * pk, PKT_user_id * id)
pos += 1; pos += 1;
strcat (buf, id->name); strcat (buf, id->name);
write_status_text (STATUS_IMPORT_CHECK, buf); write_status_text (STATUS_IMPORT_CHECK, buf);
m_free (buf); xfree (buf);
} }
static void static void
@ -621,7 +621,7 @@ check_prefs(KBNODE keyblock)
} }
} }
m_free(user); xfree(user);
} }
} }
@ -762,7 +762,7 @@ import_one( const char *fname, KBNODE keyblock,
node->flag |= 1; node->flag |= 1;
log_info( _("key %s: accepted non self-signed user ID \"%s\"\n"), log_info( _("key %s: accepted non self-signed user ID \"%s\"\n"),
keystr_from_pk(pk),user); keystr_from_pk(pk),user);
m_free(user); xfree(user);
} }
if( !delete_inv_parts( fname, keyblock, keyid, options ) ) { if( !delete_inv_parts( fname, keyblock, keyid, options ) ) {
@ -774,7 +774,7 @@ import_one( const char *fname, KBNODE keyblock,
} }
/* do we have this key already in one of our pubrings ? */ /* do we have this key already in one of our pubrings ? */
pk_orig = m_alloc_clear( sizeof *pk_orig ); pk_orig = xmalloc_clear( sizeof *pk_orig );
rc = get_pubkey_fast ( pk_orig, keyid ); rc = get_pubkey_fast ( pk_orig, keyid );
if( rc && rc != G10ERR_NO_PUBKEY && rc != G10ERR_UNU_PUBKEY ) if( rc && rc != G10ERR_NO_PUBKEY && rc != G10ERR_UNU_PUBKEY )
{ {
@ -825,13 +825,13 @@ import_one( const char *fname, KBNODE keyblock,
char *p=get_user_id_native (keyid); char *p=get_user_id_native (keyid);
log_info( _("key %s: public key \"%s\" imported\n"), log_info( _("key %s: public key \"%s\" imported\n"),
keystr(keyid),p); keystr(keyid),p);
m_free(p); xfree(p);
} }
if( is_status_enabled() ) if( is_status_enabled() )
{ {
char *us = get_long_user_id_string( keyid ); char *us = get_long_user_id_string( keyid );
write_status_text( STATUS_IMPORTED, us ); write_status_text( STATUS_IMPORTED, us );
m_free(us); xfree(us);
print_import_ok (pk,NULL, 1); print_import_ok (pk,NULL, 1);
} }
stats->imported++; stats->imported++;
@ -941,7 +941,7 @@ import_one( const char *fname, KBNODE keyblock,
else if(n_uids_cleaned) else if(n_uids_cleaned)
log_info(_("key %s: \"%s\" %d user IDs cleaned\n"), log_info(_("key %s: \"%s\" %d user IDs cleaned\n"),
keystr(keyid),p,n_uids_cleaned); keystr(keyid),p,n_uids_cleaned);
m_free(p); xfree(p);
} }
stats->n_uids +=n_uids; stats->n_uids +=n_uids;
@ -963,7 +963,7 @@ import_one( const char *fname, KBNODE keyblock,
{ {
char *p=get_user_id_native(keyid); char *p=get_user_id_native(keyid);
log_info( _("key %s: \"%s\" not changed\n"),keystr(keyid),p); log_info( _("key %s: \"%s\" not changed\n"),keystr(keyid),p);
m_free(p); xfree(p);
} }
stats->unchanged++; stats->unchanged++;
@ -1014,8 +1014,8 @@ sec_to_pub_keyblock(KBNODE sec_keyblock)
write the keyblock out. */ write the keyblock out. */
PKT_secret_key *sk=secnode->pkt->pkt.secret_key; PKT_secret_key *sk=secnode->pkt->pkt.secret_key;
PACKET *pkt=m_alloc_clear(sizeof(PACKET)); PACKET *pkt=xmalloc_clear(sizeof(PACKET));
PKT_public_key *pk=m_alloc_clear(sizeof(PKT_public_key)); PKT_public_key *pk=xmalloc_clear(sizeof(PKT_public_key));
int n; int n;
if(secnode->pkt->pkttype==PKT_SECRET_KEY) if(secnode->pkt->pkttype==PKT_SECRET_KEY)
@ -1211,7 +1211,7 @@ import_revoke_cert( const char *fname, KBNODE node, struct stats_s *stats )
keyid[0] = node->pkt->pkt.signature->keyid[0]; keyid[0] = node->pkt->pkt.signature->keyid[0];
keyid[1] = node->pkt->pkt.signature->keyid[1]; keyid[1] = node->pkt->pkt.signature->keyid[1];
pk = m_alloc_clear( sizeof *pk ); pk = xmalloc_clear( sizeof *pk );
rc = get_pubkey( pk, keyid ); rc = get_pubkey( pk, keyid );
if( rc == G10ERR_NO_PUBKEY ) if( rc == G10ERR_NO_PUBKEY )
{ {
@ -1292,7 +1292,7 @@ import_revoke_cert( const char *fname, KBNODE node, struct stats_s *stats )
char *p=get_user_id_native (keyid); char *p=get_user_id_native (keyid);
log_info( _("key %s: \"%s\" revocation certificate imported\n"), log_info( _("key %s: \"%s\" revocation certificate imported\n"),
keystr(keyid),p); keystr(keyid),p);
m_free(p); xfree(p);
} }
stats->n_revoc++; stats->n_revoc++;
@ -1376,7 +1376,7 @@ chk_self_sigs( const char *fname, KBNODE keyblock,
_("key %s: invalid self-signature " _("key %s: invalid self-signature "
"on user ID \"%s\"\n"), "on user ID \"%s\"\n"),
keystr(keyid),p); keystr(keyid),p);
m_free(p); xfree(p);
} }
} }
else else
@ -1513,7 +1513,7 @@ delete_inv_parts( const char *fname, KBNODE keyblock,
node->pkt->pkt.user_id->len,0); node->pkt->pkt.user_id->len,0);
log_info( _("key %s: skipped user ID \"%s\"\n"), log_info( _("key %s: skipped user ID \"%s\"\n"),
keystr(keyid),p); keystr(keyid),p);
m_free(p); xfree(p);
} }
delete_kbnode( node ); /* the user-id */ delete_kbnode( node ); /* the user-id */
/* and all following packets up to the next user-id */ /* and all following packets up to the next user-id */
@ -1763,7 +1763,7 @@ revocation_present(KBNODE keyblock)
MAX_FINGERPRINT_LEN); MAX_FINGERPRINT_LEN);
if(rc==G10ERR_NO_PUBKEY || rc==G10ERR_UNU_PUBKEY) if(rc==G10ERR_NO_PUBKEY || rc==G10ERR_UNU_PUBKEY)
{ {
char *tempkeystr=m_strdup(keystr_from_pk(pk)); char *tempkeystr=xstrdup(keystr_from_pk(pk));
/* No, so try and get it */ /* No, so try and get it */
if(opt.keyserver if(opt.keyserver
@ -1788,7 +1788,7 @@ revocation_present(KBNODE keyblock)
" revocation key %s not present.\n"), " revocation key %s not present.\n"),
tempkeystr,keystr(keyid)); tempkeystr,keystr(keyid));
m_free(tempkeystr); xfree(tempkeystr);
} }
} }
} }
@ -1845,7 +1845,7 @@ merge_blocks( const char *fname, KBNODE keyblock_orig, KBNODE keyblock,
char *p=get_user_id_native (keyid); char *p=get_user_id_native (keyid);
log_info(_("key %s: \"%s\" revocation" log_info(_("key %s: \"%s\" revocation"
" certificate added\n"), keystr(keyid),p); " certificate added\n"), keystr(keyid),p);
m_free(p); xfree(p);
} }
} }
} }
@ -2170,8 +2170,8 @@ pub_to_sec_keyblock (KBNODE pub_keyblock)
/* Make a secret key. We only need to convert enough to /* Make a secret key. We only need to convert enough to
write the keyblock out. */ write the keyblock out. */
PKT_public_key *pk = pubnode->pkt->pkt.public_key; PKT_public_key *pk = pubnode->pkt->pkt.public_key;
PACKET *pkt = m_alloc_clear (sizeof *pkt); PACKET *pkt = xmalloc_clear (sizeof *pkt);
PKT_secret_key *sk = m_alloc_clear (sizeof *sk); PKT_secret_key *sk = xmalloc_clear (sizeof *sk);
int i, n; int i, n;
if (pubnode->pkt->pkttype == PKT_PUBLIC_KEY) if (pubnode->pkt->pkttype == PKT_PUBLIC_KEY)

10
g10/kbnode.c
View File

@ -43,7 +43,7 @@ alloc_node(void)
if( n ) if( n )
unused_nodes = n->next; unused_nodes = n->next;
else else
n = m_alloc( sizeof *n ); n = xmalloc( sizeof *n );
n->next = NULL; n->next = NULL;
n->pkt = NULL; n->pkt = NULL;
n->flag = 0; n->flag = 0;
@ -60,7 +60,7 @@ free_node( KBNODE n )
n->next = unused_nodes; n->next = unused_nodes;
unused_nodes = n; unused_nodes = n;
#else #else
m_free( n ); xfree( n );
#endif #endif
} }
} }
@ -96,7 +96,7 @@ release_kbnode( KBNODE n )
n2 = n->next; n2 = n->next;
if( !is_cloned_kbnode(n) ) { if( !is_cloned_kbnode(n) ) {
free_packet( n->pkt ); free_packet( n->pkt );
m_free( n->pkt ); xfree( n->pkt );
} }
free_node( n ); free_node( n );
n = n2; n = n2;
@ -267,7 +267,7 @@ commit_kbnode( KBNODE *root )
nl->next = n->next; nl->next = n->next;
if( !is_cloned_kbnode(n) ) { if( !is_cloned_kbnode(n) ) {
free_packet( n->pkt ); free_packet( n->pkt );
m_free( n->pkt ); xfree( n->pkt );
} }
free_node( n ); free_node( n );
changed = 1; changed = 1;
@ -291,7 +291,7 @@ remove_kbnode( KBNODE *root, KBNODE node )
nl->next = n->next; nl->next = n->next;
if( !is_cloned_kbnode(n) ) { if( !is_cloned_kbnode(n) ) {
free_packet( n->pkt ); free_packet( n->pkt );
m_free( n->pkt ); xfree( n->pkt );
} }
free_node( n ); free_node( n );
} }

10
g10/keydb.c
View File

@ -235,7 +235,7 @@ keydb_add_resource (const char *url, int flags, int secret)
filename = make_filename (opt.homedir, resname, NULL); filename = make_filename (opt.homedir, resname, NULL);
} }
else else
filename = m_strdup (resname); filename = xstrdup (resname);
if (!force) if (!force)
force = secret? !any_secret : !any_public; force = secret? !any_secret : !any_public;
@ -323,7 +323,7 @@ keydb_add_resource (const char *url, int flags, int secret)
any_secret = 1; any_secret = 1;
else else
any_public = 1; any_public = 1;
m_free (filename); xfree (filename);
return rc; return rc;
} }
@ -336,7 +336,7 @@ keydb_new (int secret)
KEYDB_HANDLE hd; KEYDB_HANDLE hd;
int i, j; int i, j;
hd = m_alloc_clear (sizeof *hd); hd = xmalloc_clear (sizeof *hd);
hd->found = -1; hd->found = -1;
assert (used_resources <= MAX_KEYDB_RESOURCES); assert (used_resources <= MAX_KEYDB_RESOURCES);
@ -354,7 +354,7 @@ keydb_new (int secret)
hd->active[j].secret = all_resources[i].secret; hd->active[j].secret = all_resources[i].secret;
hd->active[j].u.kr = keyring_new (all_resources[i].token, secret); hd->active[j].u.kr = keyring_new (all_resources[i].token, secret);
if (!hd->active[j].u.kr) { if (!hd->active[j].u.kr) {
m_free (hd); xfree (hd);
return NULL; /* fixme: release all previously allocated handles*/ return NULL; /* fixme: release all previously allocated handles*/
} }
j++; j++;
@ -388,7 +388,7 @@ keydb_release (KEYDB_HANDLE hd)
} }
} }
m_free (hd); xfree (hd);
} }

128
g10/keyedit.c
View File

@ -267,7 +267,7 @@ print_and_check_one_sig( KBNODE keyblock, KBNODE node,
char *p = get_user_id( sig->keyid, &n ); char *p = get_user_id( sig->keyid, &n );
tty_print_utf8_string2(p, n, opt.screen_columns-keystrlen()-26- tty_print_utf8_string2(p, n, opt.screen_columns-keystrlen()-26-
((opt.list_options&LIST_SHOW_SIG_EXPIRE)?11:0)); ((opt.list_options&LIST_SHOW_SIG_EXPIRE)?11:0));
m_free(p); xfree(p);
} }
tty_printf("\n"); tty_printf("\n");
@ -425,7 +425,7 @@ trustsig_prompt(byte *trust_value,byte *trust_depth,char **regexp)
*trust_value=60; *trust_value=60;
else if(p[0]=='2' && !p[1]) else if(p[0]=='2' && !p[1])
*trust_value=120; *trust_value=120;
m_free(p); xfree(p);
} }
tty_printf("\n"); tty_printf("\n");
@ -442,7 +442,7 @@ trustsig_prompt(byte *trust_value,byte *trust_depth,char **regexp)
trim_spaces(p); trim_spaces(p);
cpr_kill_prompt(); cpr_kill_prompt();
*trust_depth=atoi(p); *trust_depth=atoi(p);
m_free(p); xfree(p);
} }
tty_printf("\n"); tty_printf("\n");
@ -461,7 +461,7 @@ trustsig_prompt(byte *trust_value,byte *trust_depth,char **regexp)
char *q=p; char *q=p;
int regexplen=100,ind; int regexplen=100,ind;
*regexp=m_alloc(regexplen); *regexp=xmalloc(regexplen);
/* Now mangle the domain the user entered into a regexp. To do /* Now mangle the domain the user entered into a regexp. To do
this, \-escape everything that isn't alphanumeric, and attach this, \-escape everything that isn't alphanumeric, and attach
@ -481,7 +481,7 @@ trustsig_prompt(byte *trust_value,byte *trust_depth,char **regexp)
if((regexplen-ind)<3) if((regexplen-ind)<3)
{ {
regexplen+=100; regexplen+=100;
*regexp=m_realloc(*regexp,regexplen); *regexp=xrealloc(*regexp,regexplen);
} }
q++; q++;
@ -491,7 +491,7 @@ trustsig_prompt(byte *trust_value,byte *trust_depth,char **regexp)
strcat(*regexp,">$"); strcat(*regexp,">$");
} }
m_free(p); xfree(p);
tty_printf("\n"); tty_printf("\n");
} }
@ -684,7 +684,7 @@ sign_uids( KBNODE keyblock, STRLIST locusr, int *ret_modified,
} }
} }
m_free(user); xfree(user);
} }
} }
else if( uidnode && node->pkt->pkttype == PKT_SIGNATURE else if( uidnode && node->pkt->pkttype == PKT_SIGNATURE
@ -714,7 +714,7 @@ sign_uids( KBNODE keyblock, STRLIST locusr, int *ret_modified,
{ {
force_v4=1; force_v4=1;
node->flag|=NODFLG_DELSIG; node->flag|=NODFLG_DELSIG;
m_free(user); xfree(user);
continue; continue;
} }
} }
@ -738,7 +738,7 @@ sign_uids( KBNODE keyblock, STRLIST locusr, int *ret_modified,
in place. */ in place. */
node->flag|=NODFLG_DELSIG; node->flag|=NODFLG_DELSIG;
m_free(user); xfree(user);
continue; continue;
} }
} }
@ -763,7 +763,7 @@ sign_uids( KBNODE keyblock, STRLIST locusr, int *ret_modified,
in place. */ in place. */
node->flag|=NODFLG_DELSIG; node->flag|=NODFLG_DELSIG;
m_free(user); xfree(user);
continue; continue;
} }
} }
@ -785,7 +785,7 @@ sign_uids( KBNODE keyblock, STRLIST locusr, int *ret_modified,
{ {
/* Don't delete the old sig here since this is /* Don't delete the old sig here since this is
an --expert thing. */ an --expert thing. */
m_free(user); xfree(user);
continue; continue;
} }
@ -794,7 +794,7 @@ sign_uids( KBNODE keyblock, STRLIST locusr, int *ret_modified,
write_status_text (STATUS_ALREADY_SIGNED, buf); write_status_text (STATUS_ALREADY_SIGNED, buf);
uidnode->flag &= ~NODFLG_MARK_A; /* remove mark */ uidnode->flag &= ~NODFLG_MARK_A; /* remove mark */
m_free(user); xfree(user);
} }
} }
} }
@ -857,7 +857,7 @@ sign_uids( KBNODE keyblock, STRLIST locusr, int *ret_modified,
} }
cpr_kill_prompt(); cpr_kill_prompt();
m_free(answer); xfree(answer);
} }
} }
} }
@ -940,7 +940,7 @@ sign_uids( KBNODE keyblock, STRLIST locusr, int *ret_modified,
else else
tty_printf(_("Invalid selection.\n")); tty_printf(_("Invalid selection.\n"));
m_free(answer); xfree(answer);
} }
} }
@ -951,7 +951,7 @@ sign_uids( KBNODE keyblock, STRLIST locusr, int *ret_modified,
p=get_user_id_native(sk_keyid); p=get_user_id_native(sk_keyid);
tty_printf(_("Are you sure that you want to sign this key with your\n" tty_printf(_("Are you sure that you want to sign this key with your\n"
"key \"%s\" (%s)\n"),p,keystr_from_sk(sk)); "key \"%s\" (%s)\n"),p,keystr_from_sk(sk));
m_free(p); xfree(p);
if(selfsig) if(selfsig)
{ {
@ -1066,7 +1066,7 @@ sign_uids( KBNODE keyblock, STRLIST locusr, int *ret_modified,
*ret_modified = 1; /* we changed the keyblock */ *ret_modified = 1; /* we changed the keyblock */
update_trust = 1; update_trust = 1;
pkt = m_alloc_clear( sizeof *pkt ); pkt = xmalloc_clear( sizeof *pkt );
pkt->pkttype = PKT_SIGNATURE; pkt->pkttype = PKT_SIGNATURE;
pkt->pkt.signature = sig; pkt->pkt.signature = sig;
insert_kbnode( node, new_kbnode(pkt), PKT_SIGNATURE ); insert_kbnode( node, new_kbnode(pkt), PKT_SIGNATURE );
@ -1174,7 +1174,7 @@ change_passphrase( KBNODE keyblock )
tty_printf(_("Can't edit this key: %s\n"), g10_errstr(rc)); tty_printf(_("Can't edit this key: %s\n"), g10_errstr(rc));
else { else {
DEK *dek = NULL; DEK *dek = NULL;
STRING2KEY *s2k = m_alloc_secure( sizeof *s2k ); STRING2KEY *s2k = xmalloc_secure( sizeof *s2k );
const char *errtext = NULL; const char *errtext = NULL;
tty_printf(_("Enter the new passphrase for this secret key.\n\n") ); tty_printf(_("Enter the new passphrase for this secret key.\n\n") );
@ -1227,12 +1227,12 @@ change_passphrase( KBNODE keyblock )
break; break;
} }
} }
m_free(s2k); xfree(s2k);
m_free(dek); xfree(dek);
} }
leave: leave:
m_free( passphrase ); xfree( passphrase );
set_next_passphrase( NULL ); set_next_passphrase( NULL );
return changed && !rc; return changed && !rc;
} }
@ -1594,14 +1594,14 @@ keyedit_menu( const char *username, STRLIST locusr,
redisplay = 0; redisplay = 0;
} }
do { do {
m_free(answer); xfree(answer);
if( have_commands ) { if( have_commands ) {
if( commands ) { if( commands ) {
answer = m_strdup( commands->d ); answer = xstrdup( commands->d );
commands = commands->next; commands = commands->next;
} }
else if( opt.batch ) { else if( opt.batch ) {
answer = m_strdup("quit"); answer = xstrdup("quit");
} }
else else
have_commands = 0; have_commands = 0;
@ -2225,7 +2225,7 @@ keyedit_menu( const char *username, STRLIST locusr,
release_kbnode( keyblock ); release_kbnode( keyblock );
release_kbnode( sec_keyblock ); release_kbnode( sec_keyblock );
keydb_release (kdbhd); keydb_release (kdbhd);
m_free(answer); xfree(answer);
} }
@ -2589,7 +2589,7 @@ show_key_with_all_names( KBNODE keyblock, int only_marked, int with_revoker,
const char *algo=pubkey_algo_to_string(pk->revoked.algo); const char *algo=pubkey_algo_to_string(pk->revoked.algo);
tty_printf(_("This key was revoked on %s by %s key %s\n"), tty_printf(_("This key was revoked on %s by %s key %s\n"),
revokestr_from_pk(pk),algo?algo:"?",user); revokestr_from_pk(pk),algo?algo:"?",user);
m_free(user); xfree(user);
} }
if(with_revoker) if(with_revoker)
@ -2618,7 +2618,7 @@ show_key_with_all_names( KBNODE keyblock, int only_marked, int with_revoker,
} }
tty_printf ("\n"); tty_printf ("\n");
m_free(user); xfree(user);
} }
} }
@ -2993,7 +2993,7 @@ menu_adduid( KBNODE pub_keyblock, KBNODE sec_keyblock, int photo)
} }
/* insert/append to secret keyblock */ /* insert/append to secret keyblock */
pkt = m_alloc_clear( sizeof *pkt ); pkt = xmalloc_clear( sizeof *pkt );
pkt->pkttype = PKT_USER_ID; pkt->pkttype = PKT_USER_ID;
pkt->pkt.user_id = scopy_user_id(uid); pkt->pkt.user_id = scopy_user_id(uid);
node = new_kbnode(pkt); node = new_kbnode(pkt);
@ -3001,7 +3001,7 @@ menu_adduid( KBNODE pub_keyblock, KBNODE sec_keyblock, int photo)
insert_kbnode( sec_where, node, 0 ); insert_kbnode( sec_where, node, 0 );
else else
add_kbnode( sec_keyblock, node ); add_kbnode( sec_keyblock, node );
pkt = m_alloc_clear( sizeof *pkt ); pkt = xmalloc_clear( sizeof *pkt );
pkt->pkttype = PKT_SIGNATURE; pkt->pkttype = PKT_SIGNATURE;
pkt->pkt.signature = copy_signature(NULL, sig); pkt->pkt.signature = copy_signature(NULL, sig);
if( sec_where ) if( sec_where )
@ -3009,7 +3009,7 @@ menu_adduid( KBNODE pub_keyblock, KBNODE sec_keyblock, int photo)
else else
add_kbnode( sec_keyblock, new_kbnode(pkt) ); add_kbnode( sec_keyblock, new_kbnode(pkt) );
/* insert/append to public keyblock */ /* insert/append to public keyblock */
pkt = m_alloc_clear( sizeof *pkt ); pkt = xmalloc_clear( sizeof *pkt );
pkt->pkttype = PKT_USER_ID; pkt->pkttype = PKT_USER_ID;
pkt->pkt.user_id = uid; pkt->pkt.user_id = uid;
node = new_kbnode(pkt); node = new_kbnode(pkt);
@ -3017,7 +3017,7 @@ menu_adduid( KBNODE pub_keyblock, KBNODE sec_keyblock, int photo)
insert_kbnode( pub_where, node, 0 ); insert_kbnode( pub_where, node, 0 );
else else
add_kbnode( pub_keyblock, node ); add_kbnode( pub_keyblock, node );
pkt = m_alloc_clear( sizeof *pkt ); pkt = xmalloc_clear( sizeof *pkt );
pkt->pkttype = PKT_SIGNATURE; pkt->pkttype = PKT_SIGNATURE;
pkt->pkt.signature = copy_signature(NULL, sig); pkt->pkt.signature = copy_signature(NULL, sig);
if( pub_where ) if( pub_where )
@ -3182,7 +3182,7 @@ menu_clean_sigs_from_uids(KBNODE keyblock)
else else
tty_printf(_("User ID \"%s\": already clean.\n"),user); tty_printf(_("User ID \"%s\": already clean.\n"),user);
m_free(user); xfree(user);
} }
} }
@ -3220,7 +3220,7 @@ menu_clean_uids_from_key(KBNODE keyblock)
uidnode=NULL; uidnode=NULL;
m_free(user); xfree(user);
} }
} }
} }
@ -3339,7 +3339,7 @@ menu_addrevoker( KBNODE pub_keyblock, KBNODE sec_keyblock, int sensitive )
if(revoker_pk) if(revoker_pk)
free_public_key(revoker_pk); free_public_key(revoker_pk);
revoker_pk=m_alloc_clear(sizeof(*revoker_pk)); revoker_pk=xmalloc_clear(sizeof(*revoker_pk));
tty_printf("\n"); tty_printf("\n");
@ -3347,7 +3347,7 @@ menu_addrevoker( KBNODE pub_keyblock, KBNODE sec_keyblock, int sensitive )
_("Enter the user ID of the designated revoker: ")); _("Enter the user ID of the designated revoker: "));
if(answer[0]=='\0' || answer[0]=='\004') if(answer[0]=='\0' || answer[0]=='\004')
{ {
m_free(answer); xfree(answer);
goto fail; goto fail;
} }
@ -3358,11 +3358,11 @@ menu_addrevoker( KBNODE pub_keyblock, KBNODE sec_keyblock, int sensitive )
if(rc) if(rc)
{ {
log_error (_("key \"%s\" not found: %s\n"),answer,g10_errstr(rc)); log_error (_("key \"%s\" not found: %s\n"),answer,g10_errstr(rc));
m_free(answer); xfree(answer);
continue; continue;
} }
m_free(answer); xfree(answer);
fingerprint_from_pk(revoker_pk,revkey.fpr,&fprlen); fingerprint_from_pk(revoker_pk,revkey.fpr,&fprlen);
if(fprlen!=20) if(fprlen!=20)
@ -3452,13 +3452,13 @@ menu_addrevoker( KBNODE pub_keyblock, KBNODE sec_keyblock, int sensitive )
sk=NULL; sk=NULL;
/* insert into secret keyblock */ /* insert into secret keyblock */
pkt = m_alloc_clear( sizeof *pkt ); pkt = xmalloc_clear( sizeof *pkt );
pkt->pkttype = PKT_SIGNATURE; pkt->pkttype = PKT_SIGNATURE;
pkt->pkt.signature = copy_signature(NULL, sig); pkt->pkt.signature = copy_signature(NULL, sig);
insert_kbnode( sec_keyblock, new_kbnode(pkt), PKT_SIGNATURE ); insert_kbnode( sec_keyblock, new_kbnode(pkt), PKT_SIGNATURE );
/* insert into public keyblock */ /* insert into public keyblock */
pkt = m_alloc_clear( sizeof *pkt ); pkt = xmalloc_clear( sizeof *pkt );
pkt->pkttype = PKT_SIGNATURE; pkt->pkttype = PKT_SIGNATURE;
pkt->pkt.signature = sig; pkt->pkt.signature = sig;
insert_kbnode( pub_keyblock, new_kbnode(pkt), PKT_SIGNATURE ); insert_kbnode( pub_keyblock, new_kbnode(pkt), PKT_SIGNATURE );
@ -3580,18 +3580,18 @@ menu_expire( KBNODE pub_keyblock, KBNODE sec_keyblock )
return 0; return 0;
} }
/* replace the packet */ /* replace the packet */
newpkt = m_alloc_clear( sizeof *newpkt ); newpkt = xmalloc_clear( sizeof *newpkt );
newpkt->pkttype = PKT_SIGNATURE; newpkt->pkttype = PKT_SIGNATURE;
newpkt->pkt.signature = newsig; newpkt->pkt.signature = newsig;
free_packet( node->pkt ); free_packet( node->pkt );
m_free( node->pkt ); xfree( node->pkt );
node->pkt = newpkt; node->pkt = newpkt;
if( sn ) { if( sn ) {
newpkt = m_alloc_clear( sizeof *newpkt ); newpkt = xmalloc_clear( sizeof *newpkt );
newpkt->pkttype = PKT_SIGNATURE; newpkt->pkttype = PKT_SIGNATURE;
newpkt->pkt.signature = copy_signature( NULL, newsig ); newpkt->pkt.signature = copy_signature( NULL, newsig );
free_packet( sn->pkt ); free_packet( sn->pkt );
m_free( sn->pkt ); xfree( sn->pkt );
sn->pkt = newpkt; sn->pkt = newpkt;
} }
sub_pk = NULL; sub_pk = NULL;
@ -3686,7 +3686,7 @@ menu_set_primary_uid ( KBNODE pub_keyblock, KBNODE sec_keyblock )
log_info(_("skipping v3 self-signature on user ID \"%s\"\n"), log_info(_("skipping v3 self-signature on user ID \"%s\"\n"),
user); user);
m_free(user); xfree(user);
} }
else { else {
/* This is a selfsignature which is to be replaced. /* This is a selfsignature which is to be replaced.
@ -3730,11 +3730,11 @@ menu_set_primary_uid ( KBNODE pub_keyblock, KBNODE sec_keyblock )
return 0; return 0;
} }
/* replace the packet */ /* replace the packet */
newpkt = m_alloc_clear( sizeof *newpkt ); newpkt = xmalloc_clear( sizeof *newpkt );
newpkt->pkttype = PKT_SIGNATURE; newpkt->pkttype = PKT_SIGNATURE;
newpkt->pkt.signature = newsig; newpkt->pkt.signature = newsig;
free_packet( node->pkt ); free_packet( node->pkt );
m_free( node->pkt ); xfree( node->pkt );
node->pkt = newpkt; node->pkt = newpkt;
modified = 1; modified = 1;
} }
@ -3796,7 +3796,7 @@ menu_set_preferences (KBNODE pub_keyblock, KBNODE sec_keyblock )
log_info(_("skipping v3 self-signature on user ID \"%s\"\n"), log_info(_("skipping v3 self-signature on user ID \"%s\"\n"),
user); user);
m_free(user); xfree(user);
} }
else { else {
/* This is a selfsignature which is to be replaced /* This is a selfsignature which is to be replaced
@ -3818,11 +3818,11 @@ menu_set_preferences (KBNODE pub_keyblock, KBNODE sec_keyblock )
return 0; return 0;
} }
/* replace the packet */ /* replace the packet */
newpkt = m_alloc_clear( sizeof *newpkt ); newpkt = xmalloc_clear( sizeof *newpkt );
newpkt->pkttype = PKT_SIGNATURE; newpkt->pkttype = PKT_SIGNATURE;
newpkt->pkt.signature = newsig; newpkt->pkt.signature = newsig;
free_packet( node->pkt ); free_packet( node->pkt );
m_free( node->pkt ); xfree( node->pkt );
node->pkt = newpkt; node->pkt = newpkt;
modified = 1; modified = 1;
} }
@ -3851,14 +3851,14 @@ menu_set_keyserver_url (const char *url,
no_primary_warning(pub_keyblock); no_primary_warning(pub_keyblock);
if(url) if(url)
answer=m_strdup(url); answer=xstrdup(url);
else else
{ {
answer=cpr_get_utf8("keyedit.add_keyserver", answer=cpr_get_utf8("keyedit.add_keyserver",
_("Enter your preferred keyserver URL: ")); _("Enter your preferred keyserver URL: "));
if(answer[0]=='\0' || answer[0]=='\004') if(answer[0]=='\0' || answer[0]=='\004')
{ {
m_free(answer); xfree(answer);
return 0; return 0;
} }
} }
@ -3870,13 +3870,13 @@ menu_set_keyserver_url (const char *url,
struct keyserver_spec *keyserver=NULL; struct keyserver_spec *keyserver=NULL;
/* Sanity check the format */ /* Sanity check the format */
keyserver=parse_keyserver_uri(answer,1,NULL,0); keyserver=parse_keyserver_uri(answer,1,NULL,0);
m_free(answer); xfree(answer);
if(!keyserver) if(!keyserver)
{ {
log_info(_("could not parse keyserver URL\n")); log_info(_("could not parse keyserver URL\n"));
return 0; return 0;
} }
uri=m_strdup(keyserver->uri); uri=xstrdup(keyserver->uri);
free_keyserver_spec(keyserver); free_keyserver_spec(keyserver);
} }
@ -3955,25 +3955,25 @@ menu_set_keyserver_url (const char *url,
log_error ("update_keysig_packet failed: %s\n", log_error ("update_keysig_packet failed: %s\n",
g10_errstr(rc)); g10_errstr(rc));
free_secret_key( sk ); free_secret_key( sk );
m_free(uri); xfree(uri);
return 0; return 0;
} }
/* replace the packet */ /* replace the packet */
newpkt = m_alloc_clear( sizeof *newpkt ); newpkt = xmalloc_clear( sizeof *newpkt );
newpkt->pkttype = PKT_SIGNATURE; newpkt->pkttype = PKT_SIGNATURE;
newpkt->pkt.signature = newsig; newpkt->pkt.signature = newsig;
free_packet( node->pkt ); free_packet( node->pkt );
m_free( node->pkt ); xfree( node->pkt );
node->pkt = newpkt; node->pkt = newpkt;
modified = 1; modified = 1;
} }
m_free(user); xfree(user);
} }
} }
} }
m_free(uri); xfree(uri);
free_secret_key( sk ); free_secret_key( sk );
return modified; return modified;
} }
@ -4201,7 +4201,7 @@ ask_revoke_sig( KBNODE keyblock, KBNODE node )
p=utf8_to_native(unode->pkt->pkt.user_id->name, p=utf8_to_native(unode->pkt->pkt.user_id->name,
unode->pkt->pkt.user_id->len,0); unode->pkt->pkt.user_id->len,0);
tty_printf(_("user ID: \"%s\"\n"),p); tty_printf(_("user ID: \"%s\"\n"),p);
m_free(p); xfree(p);
tty_printf(_("signed by your key %s on %s%s%s\n"), tty_printf(_("signed by your key %s on %s%s%s\n"),
keystr(sig->keyid),datestr_from_sig(sig), keystr(sig->keyid),datestr_from_sig(sig),
@ -4347,7 +4347,7 @@ menu_revsig( KBNODE keyblock )
attrib.non_exportable=!node->pkt->pkt.signature->flags.exportable; attrib.non_exportable=!node->pkt->pkt.signature->flags.exportable;
node->flag &= ~NODFLG_MARK_A; node->flag &= ~NODFLG_MARK_A;
sk = m_alloc_secure_clear( sizeof *sk ); sk = xmalloc_secure_clear( sizeof *sk );
if( get_seckey( sk, node->pkt->pkt.signature->keyid ) ) { if( get_seckey( sk, node->pkt->pkt.signature->keyid ) ) {
log_info(_("no secret key\n")); log_info(_("no secret key\n"));
continue; continue;
@ -4371,7 +4371,7 @@ menu_revsig( KBNODE keyblock )
if(primary_pk->keyid[0]==sig->keyid[0] && if(primary_pk->keyid[0]==sig->keyid[0] &&
primary_pk->keyid[1]==sig->keyid[1]) primary_pk->keyid[1]==sig->keyid[1])
unode->pkt->pkt.user_id->is_revoked=1; unode->pkt->pkt.user_id->is_revoked=1;
pkt = m_alloc_clear( sizeof *pkt ); pkt = xmalloc_clear( sizeof *pkt );
pkt->pkttype = PKT_SIGNATURE; pkt->pkttype = PKT_SIGNATURE;
pkt->pkt.signature = sig; pkt->pkt.signature = sig;
insert_kbnode( unode, new_kbnode(pkt), 0 ); insert_kbnode( unode, new_kbnode(pkt), 0 );
@ -4420,7 +4420,7 @@ menu_revuid( KBNODE pub_keyblock, KBNODE sec_keyblock )
{ {
char *user=utf8_to_native(uid->name,uid->len,0); char *user=utf8_to_native(uid->name,uid->len,0);
log_info(_("user ID \"%s\" is already revoked\n"),user); log_info(_("user ID \"%s\" is already revoked\n"),user);
m_free(user); xfree(user);
} }
else else
{ {
@ -4457,7 +4457,7 @@ menu_revuid( KBNODE pub_keyblock, KBNODE sec_keyblock )
} }
else else
{ {
pkt = m_alloc_clear( sizeof *pkt ); pkt = xmalloc_clear( sizeof *pkt );
pkt->pkttype = PKT_SIGNATURE; pkt->pkttype = PKT_SIGNATURE;
pkt->pkt.signature = sig; pkt->pkt.signature = sig;
insert_kbnode( node, new_kbnode(pkt), 0 ); insert_kbnode( node, new_kbnode(pkt), 0 );
@ -4522,7 +4522,7 @@ menu_revkey( KBNODE pub_keyblock, KBNODE sec_keyblock )
changed = 1; /* we changed the keyblock */ changed = 1; /* we changed the keyblock */
pkt = m_alloc_clear( sizeof *pkt ); pkt = xmalloc_clear( sizeof *pkt );
pkt->pkttype = PKT_SIGNATURE; pkt->pkttype = PKT_SIGNATURE;
pkt->pkt.signature = sig; pkt->pkt.signature = sig;
insert_kbnode( pub_keyblock, new_kbnode(pkt), 0 ); insert_kbnode( pub_keyblock, new_kbnode(pkt), 0 );
@ -4583,7 +4583,7 @@ menu_revsubkey( KBNODE pub_keyblock, KBNODE sec_keyblock )
} }
changed = 1; /* we changed the keyblock */ changed = 1; /* we changed the keyblock */
pkt = m_alloc_clear( sizeof *pkt ); pkt = xmalloc_clear( sizeof *pkt );
pkt->pkttype = PKT_SIGNATURE; pkt->pkttype = PKT_SIGNATURE;
pkt->pkt.signature = sig; pkt->pkt.signature = sig;
insert_kbnode( node, new_kbnode(pkt), 0 ); insert_kbnode( node, new_kbnode(pkt), 0 );

226
g10/keygen.c
View File

@ -174,11 +174,11 @@ print_status_key_not_created (const char *handle)
static void static void
write_uid( KBNODE root, const char *s ) write_uid( KBNODE root, const char *s )
{ {
PACKET *pkt = m_alloc_clear(sizeof *pkt ); PACKET *pkt = xmalloc_clear(sizeof *pkt );
size_t n = strlen(s); size_t n = strlen(s);
pkt->pkttype = PKT_USER_ID; pkt->pkttype = PKT_USER_ID;
pkt->pkt.user_id = m_alloc_clear( sizeof *pkt->pkt.user_id + n - 1 ); pkt->pkt.user_id = xmalloc_clear( sizeof *pkt->pkt.user_id + n - 1 );
pkt->pkt.user_id->len = n; pkt->pkt.user_id->len = n;
pkt->pkt.user_id->ref = 1; pkt->pkt.user_id->ref = 1;
strcpy(pkt->pkt.user_id->name, s); strcpy(pkt->pkt.user_id->name, s);
@ -362,7 +362,7 @@ keygen_set_std_prefs (const char *string,int personal)
{ {
char *tok,*prefstring; char *tok,*prefstring;
prefstring=m_strdup(string); /* need a writable string! */ prefstring=xstrdup(string); /* need a writable string! */
while((tok=strsep(&prefstring," ,"))) while((tok=strsep(&prefstring," ,")))
{ {
@ -402,7 +402,7 @@ keygen_set_std_prefs (const char *string,int personal)
} }
} }
m_free(prefstring); xfree(prefstring);
} }
if(!rc) if(!rc)
@ -411,7 +411,7 @@ keygen_set_std_prefs (const char *string,int personal)
{ {
if(personal==PREFTYPE_SYM) if(personal==PREFTYPE_SYM)
{ {
m_free(opt.personal_cipher_prefs); xfree(opt.personal_cipher_prefs);
if(nsym==0) if(nsym==0)
opt.personal_cipher_prefs=NULL; opt.personal_cipher_prefs=NULL;
@ -420,7 +420,7 @@ keygen_set_std_prefs (const char *string,int personal)
int i; int i;
opt.personal_cipher_prefs= opt.personal_cipher_prefs=
m_alloc(sizeof(prefitem_t *)*(nsym+1)); xmalloc(sizeof(prefitem_t *)*(nsym+1));
for (i=0; i<nsym; i++) for (i=0; i<nsym; i++)
{ {
@ -434,7 +434,7 @@ keygen_set_std_prefs (const char *string,int personal)
} }
else if(personal==PREFTYPE_HASH) else if(personal==PREFTYPE_HASH)
{ {
m_free(opt.personal_digest_prefs); xfree(opt.personal_digest_prefs);
if(nhash==0) if(nhash==0)
opt.personal_digest_prefs=NULL; opt.personal_digest_prefs=NULL;
@ -443,7 +443,7 @@ keygen_set_std_prefs (const char *string,int personal)
int i; int i;
opt.personal_digest_prefs= opt.personal_digest_prefs=
m_alloc(sizeof(prefitem_t *)*(nhash+1)); xmalloc(sizeof(prefitem_t *)*(nhash+1));
for (i=0; i<nhash; i++) for (i=0; i<nhash; i++)
{ {
@ -457,7 +457,7 @@ keygen_set_std_prefs (const char *string,int personal)
} }
else if(personal==PREFTYPE_ZIP) else if(personal==PREFTYPE_ZIP)
{ {
m_free(opt.personal_compress_prefs); xfree(opt.personal_compress_prefs);
if(nzip==0) if(nzip==0)
opt.personal_compress_prefs=NULL; opt.personal_compress_prefs=NULL;
@ -466,7 +466,7 @@ keygen_set_std_prefs (const char *string,int personal)
int i; int i;
opt.personal_compress_prefs= opt.personal_compress_prefs=
m_alloc(sizeof(prefitem_t *)*(nzip+1)); xmalloc(sizeof(prefitem_t *)*(nzip+1));
for (i=0; i<nzip; i++) for (i=0; i<nzip; i++)
{ {
@ -498,14 +498,14 @@ keygen_set_std_prefs (const char *string,int personal)
PKT_user_id *keygen_get_std_prefs(void) PKT_user_id *keygen_get_std_prefs(void)
{ {
int i,j=0; int i,j=0;
PKT_user_id *uid=m_alloc_clear(sizeof(PKT_user_id)); PKT_user_id *uid=xmalloc_clear(sizeof(PKT_user_id));
if(!prefs_initialized) if(!prefs_initialized)
keygen_set_std_prefs(NULL,0); keygen_set_std_prefs(NULL,0);
uid->ref=1; uid->ref=1;
uid->prefs=m_alloc((sizeof(prefitem_t *)* uid->prefs=xmalloc((sizeof(prefitem_t *)*
(nsym_prefs+nhash_prefs+nzip_prefs+1))); (nsym_prefs+nhash_prefs+nzip_prefs+1)));
for(i=0;i<nsym_prefs;i++,j++) for(i=0;i<nsym_prefs;i++,j++)
@ -551,10 +551,10 @@ add_feature_mdc (PKT_signature *sig,int enabled)
if (!s || !n) { /* create a new one */ if (!s || !n) { /* create a new one */
n = 1; n = 1;
buf = m_alloc_clear (n); buf = xmalloc_clear (n);
} }
else { else {
buf = m_alloc (n); buf = xmalloc (n);
memcpy (buf, s, n); memcpy (buf, s, n);
} }
@ -573,7 +573,7 @@ add_feature_mdc (PKT_signature *sig,int enabled)
else else
build_sig_subpkt (sig, SIGSUBPKT_FEATURES, buf, n); build_sig_subpkt (sig, SIGSUBPKT_FEATURES, buf, n);
m_free (buf); xfree (buf);
} }
static void static void
@ -595,10 +595,10 @@ add_keyserver_modify (PKT_signature *sig,int enabled)
if (!s || !n) { /* create a new one */ if (!s || !n) { /* create a new one */
n = 1; n = 1;
buf = m_alloc_clear (n); buf = xmalloc_clear (n);
} }
else { else {
buf = m_alloc (n); buf = xmalloc (n);
memcpy (buf, s, n); memcpy (buf, s, n);
} }
@ -617,7 +617,7 @@ add_keyserver_modify (PKT_signature *sig,int enabled)
else else
build_sig_subpkt (sig, SIGSUBPKT_KS_FLAGS, buf, n); build_sig_subpkt (sig, SIGSUBPKT_KS_FLAGS, buf, n);
m_free (buf); xfree (buf);
} }
int int
@ -839,7 +839,7 @@ write_direct_sig( KBNODE root, KBNODE pub_root, PKT_secret_key *sk,
return rc; return rc;
} }
pkt = m_alloc_clear( sizeof *pkt ); pkt = xmalloc_clear( sizeof *pkt );
pkt->pkttype = PKT_SIGNATURE; pkt->pkttype = PKT_SIGNATURE;
pkt->pkt.signature = sig; pkt->pkt.signature = sig;
add_kbnode( root, new_kbnode( pkt ) ); add_kbnode( root, new_kbnode( pkt ) );
@ -883,12 +883,12 @@ write_selfsigs( KBNODE sec_root, KBNODE pub_root, PKT_secret_key *sk,
return rc; return rc;
} }
pkt = m_alloc_clear( sizeof *pkt ); pkt = xmalloc_clear( sizeof *pkt );
pkt->pkttype = PKT_SIGNATURE; pkt->pkttype = PKT_SIGNATURE;
pkt->pkt.signature = sig; pkt->pkt.signature = sig;
add_kbnode( sec_root, new_kbnode( pkt ) ); add_kbnode( sec_root, new_kbnode( pkt ) );
pkt = m_alloc_clear( sizeof *pkt ); pkt = xmalloc_clear( sizeof *pkt );
pkt->pkttype = PKT_SIGNATURE; pkt->pkttype = PKT_SIGNATURE;
pkt->pkt.signature = copy_signature(NULL,sig); pkt->pkt.signature = copy_signature(NULL,sig);
add_kbnode( pub_root, new_kbnode( pkt ) ); add_kbnode( pub_root, new_kbnode( pkt ) );
@ -947,7 +947,7 @@ write_keybinding( KBNODE root, KBNODE pub_root,
return rc; return rc;
} }
pkt = m_alloc_clear( sizeof *pkt ); pkt = xmalloc_clear( sizeof *pkt );
pkt->pkttype = PKT_SIGNATURE; pkt->pkttype = PKT_SIGNATURE;
pkt->pkt.signature = sig; pkt->pkt.signature = sig;
add_kbnode( root, new_kbnode( pkt ) ); add_kbnode( root, new_kbnode( pkt ) );
@ -984,8 +984,8 @@ gen_elg(int algo, unsigned nbits, KBNODE pub_root, KBNODE sec_root, DEK *dek,
return rc; return rc;
} }
sk = m_alloc_clear( sizeof *sk ); sk = xmalloc_clear( sizeof *sk );
pk = m_alloc_clear( sizeof *pk ); pk = xmalloc_clear( sizeof *pk );
sk->timestamp = pk->timestamp = make_timestamp(); sk->timestamp = pk->timestamp = make_timestamp();
sk->version = pk->version = 4; sk->version = pk->version = 4;
if( expireval ) { if( expireval ) {
@ -1018,14 +1018,14 @@ gen_elg(int algo, unsigned nbits, KBNODE pub_root, KBNODE sec_root, DEK *dek,
} }
} }
pkt = m_alloc_clear(sizeof *pkt); pkt = xmalloc_clear(sizeof *pkt);
pkt->pkttype = is_subkey ? PKT_PUBLIC_SUBKEY : PKT_PUBLIC_KEY; pkt->pkttype = is_subkey ? PKT_PUBLIC_SUBKEY : PKT_PUBLIC_KEY;
pkt->pkt.public_key = pk; pkt->pkt.public_key = pk;
add_kbnode(pub_root, new_kbnode( pkt )); add_kbnode(pub_root, new_kbnode( pkt ));
/* don't know whether it makes sense to have the factors, so for now /* don't know whether it makes sense to have the factors, so for now
* we store them in the secret keyring (but they are not secret) */ * we store them in the secret keyring (but they are not secret) */
pkt = m_alloc_clear(sizeof *pkt); pkt = xmalloc_clear(sizeof *pkt);
pkt->pkttype = is_subkey ? PKT_SECRET_SUBKEY : PKT_SECRET_KEY; pkt->pkttype = is_subkey ? PKT_SECRET_SUBKEY : PKT_SECRET_KEY;
pkt->pkt.secret_key = sk; pkt->pkt.secret_key = sk;
add_kbnode(sec_root, new_kbnode( pkt )); add_kbnode(sec_root, new_kbnode( pkt ));
@ -1064,8 +1064,8 @@ gen_dsa(unsigned int nbits, KBNODE pub_root, KBNODE sec_root, DEK *dek,
return rc; return rc;
} }
sk = m_alloc_clear( sizeof *sk ); sk = xmalloc_clear( sizeof *sk );
pk = m_alloc_clear( sizeof *pk ); pk = xmalloc_clear( sizeof *pk );
sk->timestamp = pk->timestamp = make_timestamp(); sk->timestamp = pk->timestamp = make_timestamp();
sk->version = pk->version = 4; sk->version = pk->version = 4;
if( expireval ) { if( expireval ) {
@ -1100,7 +1100,7 @@ gen_dsa(unsigned int nbits, KBNODE pub_root, KBNODE sec_root, DEK *dek,
} }
} }
pkt = m_alloc_clear(sizeof *pkt); pkt = xmalloc_clear(sizeof *pkt);
pkt->pkttype = is_subkey ? PKT_PUBLIC_SUBKEY : PKT_PUBLIC_KEY; pkt->pkttype = is_subkey ? PKT_PUBLIC_SUBKEY : PKT_PUBLIC_KEY;
pkt->pkt.public_key = pk; pkt->pkt.public_key = pk;
add_kbnode(pub_root, new_kbnode( pkt )); add_kbnode(pub_root, new_kbnode( pkt ));
@ -1111,7 +1111,7 @@ gen_dsa(unsigned int nbits, KBNODE pub_root, KBNODE sec_root, DEK *dek,
* We store only f1 to f_n-1; fn can be calculated because p and q * We store only f1 to f_n-1; fn can be calculated because p and q
* are known. * are known.
*/ */
pkt = m_alloc_clear(sizeof *pkt); pkt = xmalloc_clear(sizeof *pkt);
pkt->pkttype = is_subkey ? PKT_SECRET_SUBKEY : PKT_SECRET_KEY; pkt->pkttype = is_subkey ? PKT_SECRET_SUBKEY : PKT_SECRET_KEY;
pkt->pkt.secret_key = sk; pkt->pkt.secret_key = sk;
add_kbnode(sec_root, new_kbnode( pkt )); add_kbnode(sec_root, new_kbnode( pkt ));
@ -1152,8 +1152,8 @@ gen_rsa(int algo, unsigned nbits, KBNODE pub_root, KBNODE sec_root, DEK *dek,
return rc; return rc;
} }
sk = m_alloc_clear( sizeof *sk ); sk = xmalloc_clear( sizeof *sk );
pk = m_alloc_clear( sizeof *pk ); pk = xmalloc_clear( sizeof *pk );
sk->timestamp = pk->timestamp = make_timestamp(); sk->timestamp = pk->timestamp = make_timestamp();
sk->version = pk->version = 4; sk->version = pk->version = 4;
if( expireval ) { if( expireval ) {
@ -1190,12 +1190,12 @@ gen_rsa(int algo, unsigned nbits, KBNODE pub_root, KBNODE sec_root, DEK *dek,
} }
} }
pkt = m_alloc_clear(sizeof *pkt); pkt = xmalloc_clear(sizeof *pkt);
pkt->pkttype = is_subkey ? PKT_PUBLIC_SUBKEY : PKT_PUBLIC_KEY; pkt->pkttype = is_subkey ? PKT_PUBLIC_SUBKEY : PKT_PUBLIC_KEY;
pkt->pkt.public_key = pk; pkt->pkt.public_key = pk;
add_kbnode(pub_root, new_kbnode( pkt )); add_kbnode(pub_root, new_kbnode( pkt ));
pkt = m_alloc_clear(sizeof *pkt); pkt = xmalloc_clear(sizeof *pkt);
pkt->pkttype = is_subkey ? PKT_SECRET_SUBKEY : PKT_SECRET_KEY; pkt->pkttype = is_subkey ? PKT_SECRET_SUBKEY : PKT_SECRET_KEY;
pkt->pkt.secret_key = sk; pkt->pkt.secret_key = sk;
add_kbnode(sec_root, new_kbnode( pkt )); add_kbnode(sec_root, new_kbnode( pkt ));
@ -1286,7 +1286,7 @@ ask_key_flags(int algo)
tty_printf(_(" (%c) Finished\n"),togglers[6]); tty_printf(_(" (%c) Finished\n"),togglers[6]);
tty_printf("\n"); tty_printf("\n");
m_free(answer); xfree(answer);
answer = cpr_get("keygen.flags",_("Your selection? ")); answer = cpr_get("keygen.flags",_("Your selection? "));
cpr_kill_prompt(); cpr_kill_prompt();
@ -1320,7 +1320,7 @@ ask_key_flags(int algo)
} }
} }
m_free(answer); xfree(answer);
return current; return current;
} }
@ -1355,7 +1355,7 @@ ask_algo (int addmode, unsigned int *r_usage)
answer = cpr_get("keygen.algo",_("Your selection? ")); answer = cpr_get("keygen.algo",_("Your selection? "));
cpr_kill_prompt(); cpr_kill_prompt();
algo = *answer? atoi(answer): 1; algo = *answer? atoi(answer): 1;
m_free(answer); xfree(answer);
if( algo == 1 && !addmode ) { if( algo == 1 && !addmode ) {
algo = 0; /* create both keys */ algo = 0; /* create both keys */
break; break;
@ -1437,7 +1437,7 @@ ask_keysize( int algo )
#define PROMPTSTRING _("What keysize do you want? (%u) ") #define PROMPTSTRING _("What keysize do you want? (%u) ")
prompt=m_alloc(strlen(PROMPTSTRING)+20); prompt=xmalloc(strlen(PROMPTSTRING)+20);
sprintf(prompt,PROMPTSTRING,def); sprintf(prompt,PROMPTSTRING,def);
#undef PROMPTSTRING #undef PROMPTSTRING
@ -1445,8 +1445,8 @@ ask_keysize( int algo )
answer = cpr_get("keygen.size",prompt); answer = cpr_get("keygen.size",prompt);
cpr_kill_prompt(); cpr_kill_prompt();
nbits = *answer? atoi(answer): def; nbits = *answer? atoi(answer): def;
m_free(prompt); xfree(prompt);
m_free(answer); xfree(answer);
if(nbits<min || nbits>max) if(nbits<min || nbits>max)
tty_printf(_("%s keysizes must be in the range %u-%u\n"), tty_printf(_("%s keysizes must be in the range %u-%u\n"),
@ -1544,7 +1544,7 @@ ask_expire_interval(int object,const char *def_expire)
{ {
u32 curtime=make_timestamp(); u32 curtime=make_timestamp();
m_free(answer); xfree(answer);
if(object==0) if(object==0)
answer = cpr_get("keygen.valid",_("Key is valid for? (0) ")); answer = cpr_get("keygen.valid",_("Key is valid for? (0) "));
else else
@ -1554,15 +1554,15 @@ ask_expire_interval(int object,const char *def_expire)
#define PROMPTSTRING _("Signature is valid for? (%s) ") #define PROMPTSTRING _("Signature is valid for? (%s) ")
/* This will actually end up larger than necessary because /* This will actually end up larger than necessary because
of the 2 bytes for '%s' */ of the 2 bytes for '%s' */
prompt=m_alloc(strlen(PROMPTSTRING)+strlen(def_expire)+1); prompt=xmalloc(strlen(PROMPTSTRING)+strlen(def_expire)+1);
sprintf(prompt,PROMPTSTRING,def_expire); sprintf(prompt,PROMPTSTRING,def_expire);
#undef PROMPTSTRING #undef PROMPTSTRING
answer = cpr_get("siggen.valid",prompt); answer = cpr_get("siggen.valid",prompt);
m_free(prompt); xfree(prompt);
if(*answer=='\0') if(*answer=='\0')
answer=m_strdup(def_expire); answer=xstrdup(def_expire);
} }
cpr_kill_prompt(); cpr_kill_prompt();
trim_spaces(answer); trim_spaces(answer);
@ -1598,7 +1598,7 @@ ask_expire_interval(int object,const char *def_expire)
break; break;
} }
m_free(answer); xfree(answer);
return interval; return interval;
} }
@ -1650,7 +1650,7 @@ ask_user_id( int mode )
if( !aname ) { if( !aname ) {
for(;;) { for(;;) {
m_free(aname); xfree(aname);
aname = cpr_get("keygen.name",_("Real name: ")); aname = cpr_get("keygen.name",_("Real name: "));
trim_spaces(aname); trim_spaces(aname);
cpr_kill_prompt(); cpr_kill_prompt();
@ -1670,7 +1670,7 @@ ask_user_id( int mode )
} }
if( !amail ) { if( !amail ) {
for(;;) { for(;;) {
m_free(amail); xfree(amail);
amail = cpr_get("keygen.email",_("Email address: ")); amail = cpr_get("keygen.email",_("Email address: "));
trim_spaces(amail); trim_spaces(amail);
cpr_kill_prompt(); cpr_kill_prompt();
@ -1689,7 +1689,7 @@ ask_user_id( int mode )
} }
if( !acomment ) { if( !acomment ) {
for(;;) { for(;;) {
m_free(acomment); xfree(acomment);
acomment = cpr_get("keygen.comment",_("Comment: ")); acomment = cpr_get("keygen.comment",_("Comment: "));
trim_spaces(acomment); trim_spaces(acomment);
cpr_kill_prompt(); cpr_kill_prompt();
@ -1703,8 +1703,8 @@ ask_user_id( int mode )
} }
m_free(uid); xfree(uid);
uid = p = m_alloc(strlen(aname)+strlen(amail)+strlen(acomment)+12+10); uid = p = xmalloc(strlen(aname)+strlen(amail)+strlen(acomment)+12+10);
p = stpcpy(p, aname ); p = stpcpy(p, aname );
if( *acomment ) if( *acomment )
p = stpcpy(stpcpy(stpcpy(p," ("), acomment),")"); p = stpcpy(stpcpy(stpcpy(p," ("), acomment),")");
@ -1751,7 +1751,7 @@ ask_user_id( int mode )
if( strlen(ansstr) != 10 ) if( strlen(ansstr) != 10 )
BUG(); BUG();
if( cpr_enabled() ) { if( cpr_enabled() ) {
answer = m_strdup(ansstr+6); answer = xstrdup(ansstr+6);
answer[1] = 0; answer[1] = 0;
} }
else { else {
@ -1763,15 +1763,15 @@ ask_user_id( int mode )
if( strlen(answer) > 1 ) if( strlen(answer) > 1 )
; ;
else if( *answer == ansstr[0] || *answer == ansstr[1] ) { else if( *answer == ansstr[0] || *answer == ansstr[1] ) {
m_free(aname); aname = NULL; xfree(aname); aname = NULL;
break; break;
} }
else if( *answer == ansstr[2] || *answer == ansstr[3] ) { else if( *answer == ansstr[2] || *answer == ansstr[3] ) {
m_free(acomment); acomment = NULL; xfree(acomment); acomment = NULL;
break; break;
} }
else if( *answer == ansstr[4] || *answer == ansstr[5] ) { else if( *answer == ansstr[4] || *answer == ansstr[5] ) {
m_free(amail); amail = NULL; xfree(amail); amail = NULL;
break; break;
} }
else if( *answer == ansstr[6] || *answer == ansstr[7] ) { else if( *answer == ansstr[6] || *answer == ansstr[7] ) {
@ -1779,29 +1779,29 @@ ask_user_id( int mode )
tty_printf(_("Please correct the error first\n")); tty_printf(_("Please correct the error first\n"));
} }
else { else {
m_free(aname); aname = NULL; xfree(aname); aname = NULL;
m_free(acomment); acomment = NULL; xfree(acomment); acomment = NULL;
m_free(amail); amail = NULL; xfree(amail); amail = NULL;
break; break;
} }
} }
else if( *answer == ansstr[8] || *answer == ansstr[9] ) { else if( *answer == ansstr[8] || *answer == ansstr[9] ) {
m_free(aname); aname = NULL; xfree(aname); aname = NULL;
m_free(acomment); acomment = NULL; xfree(acomment); acomment = NULL;
m_free(amail); amail = NULL; xfree(amail); amail = NULL;
m_free(uid); uid = NULL; xfree(uid); uid = NULL;
break; break;
} }
m_free(answer); xfree(answer);
} }
m_free(answer); xfree(answer);
if( !amail && !acomment && !amail ) if( !amail && !acomment && !amail )
break; break;
m_free(uid); uid = NULL; xfree(uid); uid = NULL;
} }
if( uid ) { if( uid ) {
char *p = native_to_utf8( uid ); char *p = native_to_utf8( uid );
m_free( uid ); xfree( uid );
uid = p; uid = p;
} }
return uid; return uid;
@ -1818,7 +1818,7 @@ do_ask_passphrase( STRING2KEY **ret_s2k )
tty_printf(_("You need a Passphrase to protect your secret key.\n\n") ); tty_printf(_("You need a Passphrase to protect your secret key.\n\n") );
s2k = m_alloc_secure( sizeof *s2k ); s2k = xmalloc_secure( sizeof *s2k );
for(;;) { for(;;) {
s2k->mode = opt.s2k_mode; s2k->mode = opt.s2k_mode;
s2k->hash_algo = S2K_DIGEST_ALGO; s2k->hash_algo = S2K_DIGEST_ALGO;
@ -1829,8 +1829,8 @@ do_ask_passphrase( STRING2KEY **ret_s2k )
tty_printf(_("%s.\n"), _(errtext)); tty_printf(_("%s.\n"), _(errtext));
} }
else if( !dek->keylen ) { else if( !dek->keylen ) {
m_free(dek); dek = NULL; xfree(dek); dek = NULL;
m_free(s2k); s2k = NULL; xfree(s2k); s2k = NULL;
tty_printf(_( tty_printf(_(
"You don't want a passphrase - this is probably a *bad* idea!\n" "You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n" "I will do it anyway. You can change your passphrase at any time,\n"
@ -1889,7 +1889,7 @@ generate_user_id()
if( !p ) if( !p )
return NULL; return NULL;
n = strlen(p); n = strlen(p);
uid = m_alloc_clear( sizeof *uid + n - 1 ); uid = xmalloc_clear( sizeof *uid + n - 1 );
uid->len = n; uid->len = n;
strcpy(uid->name, p); strcpy(uid->name, p);
uid->ref = 1; uid->ref = 1;
@ -1905,11 +1905,11 @@ release_parameter_list( struct para_data_s *r )
for( ; r ; r = r2 ) { for( ; r ; r = r2 ) {
r2 = r->next; r2 = r->next;
if( r->key == pPASSPHRASE_DEK ) if( r->key == pPASSPHRASE_DEK )
m_free( r->u.dek ); xfree( r->u.dek );
else if( r->key == pPASSPHRASE_S2K ) else if( r->key == pPASSPHRASE_S2K )
m_free( r->u.s2k ); xfree( r->u.s2k );
m_free(r); xfree(r);
} }
} }
@ -2115,7 +2115,7 @@ proc_parameter_file( struct para_data_s *para, const char *fname,
s3 = get_parameter_value( para, pNAMEEMAIL ); s3 = get_parameter_value( para, pNAMEEMAIL );
if( s1 || s2 || s3 ) { if( s1 || s2 || s3 ) {
n = (s1?strlen(s1):0) + (s2?strlen(s2):0) + (s3?strlen(s3):0); n = (s1?strlen(s1):0) + (s2?strlen(s2):0) + (s3?strlen(s3):0);
r = m_alloc_clear( sizeof *r + n + 20 ); r = xmalloc_clear( sizeof *r + n + 20 );
r->key = pUSERID; r->key = pUSERID;
p = r->u.value; p = r->u.value;
if( s1 ) if( s1 )
@ -2145,7 +2145,7 @@ proc_parameter_file( struct para_data_s *para, const char *fname,
STRING2KEY *s2k; STRING2KEY *s2k;
DEK *dek; DEK *dek;
s2k = m_alloc_secure( sizeof *s2k ); s2k = xmalloc_secure( sizeof *s2k );
s2k->mode = opt.s2k_mode; s2k->mode = opt.s2k_mode;
s2k->hash_algo = S2K_DIGEST_ALGO; s2k->hash_algo = S2K_DIGEST_ALGO;
set_next_passphrase( r->u.value ); set_next_passphrase( r->u.value );
@ -2155,12 +2155,12 @@ proc_parameter_file( struct para_data_s *para, const char *fname,
assert( dek ); assert( dek );
memset( r->u.value, 0, strlen(r->u.value) ); memset( r->u.value, 0, strlen(r->u.value) );
r = m_alloc_clear( sizeof *r ); r = xmalloc_clear( sizeof *r );
r->key = pPASSPHRASE_S2K; r->key = pPASSPHRASE_S2K;
r->u.s2k = s2k; r->u.s2k = s2k;
r->next = para; r->next = para;
para = r; para = r;
r = m_alloc_clear( sizeof *r ); r = xmalloc_clear( sizeof *r );
r->key = pPASSPHRASE_DEK; r->key = pPASSPHRASE_DEK;
r->u.dek = dek; r->u.dek = dek;
r->next = para; r->next = para;
@ -2182,7 +2182,7 @@ proc_parameter_file( struct para_data_s *para, const char *fname,
r->u.expire = seconds; r->u.expire = seconds;
r->key = pKEYEXPIRE; /* change hat entry */ r->key = pKEYEXPIRE; /* change hat entry */
/* also set it for the subkey */ /* also set it for the subkey */
r = m_alloc_clear( sizeof *r + 20 ); r = xmalloc_clear( sizeof *r + 20 );
r->key = pSUBKEYEXPIRE; r->key = pSUBKEYEXPIRE;
r->u.expire = seconds; r->u.expire = seconds;
r->next = para; r->next = para;
@ -2297,8 +2297,8 @@ read_parameter_file( const char *fname )
if( outctrl.pub.fname && !strcmp( outctrl.pub.fname, value ) ) if( outctrl.pub.fname && !strcmp( outctrl.pub.fname, value ) )
; /* still the same file - ignore it */ ; /* still the same file - ignore it */
else { else {
m_free( outctrl.pub.newfname ); xfree( outctrl.pub.newfname );
outctrl.pub.newfname = m_strdup( value ); outctrl.pub.newfname = xstrdup( value );
outctrl.use_files = 1; outctrl.use_files = 1;
} }
} }
@ -2306,8 +2306,8 @@ read_parameter_file( const char *fname )
if( outctrl.sec.fname && !strcmp( outctrl.sec.fname, value ) ) if( outctrl.sec.fname && !strcmp( outctrl.sec.fname, value ) )
; /* still the same file - ignore it */ ; /* still the same file - ignore it */
else { else {
m_free( outctrl.sec.newfname ); xfree( outctrl.sec.newfname );
outctrl.sec.newfname = m_strdup( value ); outctrl.sec.newfname = xstrdup( value );
outctrl.use_files = 1; outctrl.use_files = 1;
} }
} }
@ -2365,7 +2365,7 @@ read_parameter_file( const char *fname )
break; break;
} }
} }
r = m_alloc_clear( sizeof *r + strlen( value ) ); r = xmalloc_clear( sizeof *r + strlen( value ) );
r->lnr = lnr; r->lnr = lnr;
r->key = keywords[i].key; r->key = keywords[i].key;
strcpy( r->u.value, value ); strcpy( r->u.value, value );
@ -2393,10 +2393,10 @@ read_parameter_file( const char *fname )
if (outctrl.sec.fname) if (outctrl.sec.fname)
iobuf_ioctl (NULL, 2, 0, (char*)outctrl.sec.fname); iobuf_ioctl (NULL, 2, 0, (char*)outctrl.sec.fname);
m_free( outctrl.pub.fname ); xfree( outctrl.pub.fname );
m_free( outctrl.pub.newfname ); xfree( outctrl.pub.newfname );
m_free( outctrl.sec.fname ); xfree( outctrl.sec.fname );
m_free( outctrl.sec.newfname ); xfree( outctrl.sec.newfname );
} }
release_parameter_list( para ); release_parameter_list( para );
@ -2498,30 +2498,30 @@ generate_keypair (const char *fname, const char *card_serialno,
if( !algo ) if( !algo )
{ /* default: DSA with ElG subkey of the specified size */ { /* default: DSA with ElG subkey of the specified size */
both = 1; both = 1;
r = m_alloc_clear( sizeof *r + 20 ); r = xmalloc_clear( sizeof *r + 20 );
r->key = pKEYTYPE; r->key = pKEYTYPE;
sprintf( r->u.value, "%d", PUBKEY_ALGO_DSA ); sprintf( r->u.value, "%d", PUBKEY_ALGO_DSA );
r->next = para; r->next = para;
para = r; para = r;
tty_printf(_("DSA keypair will have %u bits.\n"),1024); tty_printf(_("DSA keypair will have %u bits.\n"),1024);
r = m_alloc_clear( sizeof *r + 20 ); r = xmalloc_clear( sizeof *r + 20 );
r->key = pKEYLENGTH; r->key = pKEYLENGTH;
strcpy( r->u.value, "1024" ); strcpy( r->u.value, "1024" );
r->next = para; r->next = para;
para = r; para = r;
r = m_alloc_clear( sizeof *r + 20 ); r = xmalloc_clear( sizeof *r + 20 );
r->key = pKEYUSAGE; r->key = pKEYUSAGE;
strcpy( r->u.value, "sign" ); strcpy( r->u.value, "sign" );
r->next = para; r->next = para;
para = r; para = r;
algo = PUBKEY_ALGO_ELGAMAL_E; algo = PUBKEY_ALGO_ELGAMAL_E;
r = m_alloc_clear( sizeof *r + 20 ); r = xmalloc_clear( sizeof *r + 20 );
r->key = pSUBKEYTYPE; r->key = pSUBKEYTYPE;
sprintf( r->u.value, "%d", algo ); sprintf( r->u.value, "%d", algo );
r->next = para; r->next = para;
para = r; para = r;
r = m_alloc_clear( sizeof *r + 20 ); r = xmalloc_clear( sizeof *r + 20 );
r->key = pSUBKEYUSAGE; r->key = pSUBKEYUSAGE;
strcpy( r->u.value, "encrypt" ); strcpy( r->u.value, "encrypt" );
r->next = para; r->next = para;
@ -2529,7 +2529,7 @@ generate_keypair (const char *fname, const char *card_serialno,
} }
else else
{ {
r = m_alloc_clear( sizeof *r + 20 ); r = xmalloc_clear( sizeof *r + 20 );
r->key = pKEYTYPE; r->key = pKEYTYPE;
sprintf( r->u.value, "%d", algo ); sprintf( r->u.value, "%d", algo );
r->next = para; r->next = para;
@ -2537,7 +2537,7 @@ generate_keypair (const char *fname, const char *card_serialno,
if (use) if (use)
{ {
r = m_alloc_clear( sizeof *r + 25 ); r = xmalloc_clear( sizeof *r + 25 );
r->key = pKEYUSAGE; r->key = pKEYUSAGE;
sprintf( r->u.value, "%s%s%s", sprintf( r->u.value, "%s%s%s",
(use & PUBKEY_USAGE_SIG)? "sign ":"", (use & PUBKEY_USAGE_SIG)? "sign ":"",
@ -2550,7 +2550,7 @@ generate_keypair (const char *fname, const char *card_serialno,
} }
nbits = ask_keysize( algo ); nbits = ask_keysize( algo );
r = m_alloc_clear( sizeof *r + 20 ); r = xmalloc_clear( sizeof *r + 20 );
r->key = both? pSUBKEYLENGTH : pKEYLENGTH; r->key = both? pSUBKEYLENGTH : pKEYLENGTH;
sprintf( r->u.value, "%u", nbits); sprintf( r->u.value, "%u", nbits);
r->next = para; r->next = para;
@ -2558,12 +2558,12 @@ generate_keypair (const char *fname, const char *card_serialno,
} }
expire = ask_expire_interval(0,NULL); expire = ask_expire_interval(0,NULL);
r = m_alloc_clear( sizeof *r + 20 ); r = xmalloc_clear( sizeof *r + 20 );
r->key = pKEYEXPIRE; r->key = pKEYEXPIRE;
r->u.expire = expire; r->u.expire = expire;
r->next = para; r->next = para;
para = r; para = r;
r = m_alloc_clear( sizeof *r + 20 ); r = xmalloc_clear( sizeof *r + 20 );
r->key = pSUBKEYEXPIRE; r->key = pSUBKEYEXPIRE;
r->u.expire = expire; r->u.expire = expire;
r->next = para; r->next = para;
@ -2576,7 +2576,7 @@ generate_keypair (const char *fname, const char *card_serialno,
release_parameter_list( para ); release_parameter_list( para );
return; return;
} }
r = m_alloc_clear( sizeof *r + strlen(uid) ); r = xmalloc_clear( sizeof *r + strlen(uid) );
r->key = pUSERID; r->key = pUSERID;
strcpy( r->u.value, uid ); strcpy( r->u.value, uid );
r->next = para; r->next = para;
@ -2585,12 +2585,12 @@ generate_keypair (const char *fname, const char *card_serialno,
dek = card_serialno? NULL : do_ask_passphrase( &s2k ); dek = card_serialno? NULL : do_ask_passphrase( &s2k );
if( dek ) if( dek )
{ {
r = m_alloc_clear( sizeof *r ); r = xmalloc_clear( sizeof *r );
r->key = pPASSPHRASE_DEK; r->key = pPASSPHRASE_DEK;
r->u.dek = dek; r->u.dek = dek;
r->next = para; r->next = para;
para = r; para = r;
r = m_alloc_clear( sizeof *r ); r = xmalloc_clear( sizeof *r );
r->key = pPASSPHRASE_S2K; r->key = pPASSPHRASE_S2K;
r->u.s2k = s2k; r->u.s2k = s2k;
r->next = para; r->next = para;
@ -2637,7 +2637,7 @@ generate_raw_key (int algo, unsigned int nbits, u32 created_at,
dek = do_ask_passphrase (&s2k); dek = do_ask_passphrase (&s2k);
sk = m_alloc_clear (sizeof *sk); sk = xmalloc_clear (sizeof *sk);
sk->timestamp = created_at; sk->timestamp = created_at;
sk->version = 4; sk->version = 4;
sk->pubkey_algo = algo; sk->pubkey_algo = algo;
@ -2675,8 +2675,8 @@ generate_raw_key (int algo, unsigned int nbits, u32 created_at,
leave: leave:
if (sk) if (sk)
free_secret_key (sk); free_secret_key (sk);
m_free (dek); xfree (dek);
m_free (s2k); xfree (s2k);
return rc; return rc;
} }
#endif /* ENABLE_CARD_SUPPORT */ #endif /* ENABLE_CARD_SUPPORT */
@ -2687,7 +2687,7 @@ start_tree(KBNODE *tree)
{ {
PACKET *pkt; PACKET *pkt;
pkt=m_alloc_clear(sizeof(*pkt)); pkt=xmalloc_clear(sizeof(*pkt));
pkt->pkttype=PKT_NONE; pkt->pkttype=PKT_NONE;
*tree=new_kbnode(pkt); *tree=new_kbnode(pkt);
delete_kbnode(*tree); delete_kbnode(*tree);
@ -2717,7 +2717,7 @@ do_generate_keypair( struct para_data_s *para,
outctrl->pub.stream = NULL; outctrl->pub.stream = NULL;
if (outctrl->pub.fname) if (outctrl->pub.fname)
iobuf_ioctl (NULL, 2, 0, (char*)outctrl->pub.fname); iobuf_ioctl (NULL, 2, 0, (char*)outctrl->pub.fname);
m_free( outctrl->pub.fname ); xfree( outctrl->pub.fname );
outctrl->pub.fname = outctrl->pub.newfname; outctrl->pub.fname = outctrl->pub.newfname;
outctrl->pub.newfname = NULL; outctrl->pub.newfname = NULL;
@ -2745,7 +2745,7 @@ do_generate_keypair( struct para_data_s *para,
outctrl->sec.stream = NULL; outctrl->sec.stream = NULL;
if (outctrl->sec.fname) if (outctrl->sec.fname)
iobuf_ioctl (NULL, 2, 0, (char*)outctrl->sec.fname); iobuf_ioctl (NULL, 2, 0, (char*)outctrl->sec.fname);
m_free( outctrl->sec.fname ); xfree( outctrl->sec.fname );
outctrl->sec.fname = outctrl->sec.newfname; outctrl->sec.fname = outctrl->sec.newfname;
outctrl->sec.newfname = NULL; outctrl->sec.newfname = NULL;
@ -3089,7 +3089,7 @@ generate_subkeypair( KBNODE pub_keyblock, KBNODE sec_keyblock )
if (ask_pass) if (ask_pass)
dek = do_ask_passphrase (&s2k); dek = do_ask_passphrase (&s2k);
else if (passphrase) { else if (passphrase) {
s2k = m_alloc_secure( sizeof *s2k ); s2k = xmalloc_secure( sizeof *s2k );
s2k->mode = opt.s2k_mode; s2k->mode = opt.s2k_mode;
s2k->hash_algo = S2K_DIGEST_ALGO; s2k->hash_algo = S2K_DIGEST_ALGO;
set_next_passphrase( passphrase ); set_next_passphrase( passphrase );
@ -3111,9 +3111,9 @@ generate_subkeypair( KBNODE pub_keyblock, KBNODE sec_keyblock )
leave: leave:
if( rc ) if( rc )
log_error(_("Key generation failed: %s\n"), g10_errstr(rc) ); log_error(_("Key generation failed: %s\n"), g10_errstr(rc) );
m_free( passphrase ); xfree( passphrase );
m_free( dek ); xfree( dek );
m_free( s2k ); xfree( s2k );
/* release the copy of the (now unprotected) secret keys */ /* release the copy of the (now unprotected) secret keys */
if( pri_sk ) if( pri_sk )
free_secret_key(pri_sk); free_secret_key(pri_sk);
@ -3226,7 +3226,7 @@ generate_card_subkeypair (KBNODE pub_keyblock, KBNODE sec_keyblock,
leave: leave:
if (rc) if (rc)
log_error (_("Key generation failed: %s\n"), g10_errstr(rc) ); log_error (_("Key generation failed: %s\n"), g10_errstr(rc) );
m_free (passphrase); xfree (passphrase);
/* Release the copy of the (now unprotected) secret keys. */ /* Release the copy of the (now unprotected) secret keys. */
if (pri_sk) if (pri_sk)
free_secret_key (pri_sk); free_secret_key (pri_sk);
@ -3409,7 +3409,7 @@ gen_card_key_with_backup (int algo, int keyno, int is_primary,
{ {
log_error (_("can't create backup file `%s': %s\n"), log_error (_("can't create backup file `%s': %s\n"),
fname, strerror(errno) ); fname, strerror(errno) );
m_free (fname); xfree (fname);
free_secret_key (sk_unprotected); free_secret_key (sk_unprotected);
free_secret_key (sk_protected); free_secret_key (sk_protected);
return G10ERR_OPEN_FILE; return G10ERR_OPEN_FILE;
@ -3449,8 +3449,8 @@ gen_card_key_with_backup (int algo, int keyno, int is_primary,
xfree (fprbuf); xfree (fprbuf);
} }
free_packet (pkt); free_packet (pkt);
m_free (pkt); xfree (pkt);
m_free (fname); xfree (fname);
if (rc) if (rc)
{ {
free_secret_key (sk_unprotected); free_secret_key (sk_unprotected);

26
g10/keyid.c
View File

@ -109,7 +109,7 @@ hash_public_key( MD_HANDLE md, PKT_public_key *pk )
md_putc( md, nb[i]>>8); md_putc( md, nb[i]>>8);
md_putc( md, nb[i] ); md_putc( md, nb[i] );
md_write( md, pp[i], nn[i] ); md_write( md, pp[i], nn[i] );
m_free(pp[i]); xfree(pp[i]);
} }
} }
@ -412,7 +412,7 @@ namehash_from_uid(PKT_user_id *uid)
{ {
if(uid->namehash==NULL) if(uid->namehash==NULL)
{ {
uid->namehash=m_alloc(20); uid->namehash=xmalloc(20);
if(uid->attrib_data) if(uid->attrib_data)
rmd160_hash_buffer(uid->namehash,uid->attrib_data,uid->attrib_len); rmd160_hash_buffer(uid->namehash,uid->attrib_data,uid->attrib_len);
@ -650,14 +650,14 @@ fingerprint_from_pk( PKT_public_key *pk, byte *array, size_t *ret_len )
if( pubkey_get_npkey( pk->pubkey_algo ) > 1 ) { if( pubkey_get_npkey( pk->pubkey_algo ) > 1 ) {
p = buf = mpi_get_buffer( pk->pkey[0], &n, NULL ); p = buf = mpi_get_buffer( pk->pkey[0], &n, NULL );
md_write( md, p, n ); md_write( md, p, n );
m_free(buf); xfree(buf);
p = buf = mpi_get_buffer( pk->pkey[1], &n, NULL ); p = buf = mpi_get_buffer( pk->pkey[1], &n, NULL );
md_write( md, p, n ); md_write( md, p, n );
m_free(buf); xfree(buf);
} }
md_final(md); md_final(md);
if( !array ) if( !array )
array = m_alloc( 16 ); array = xmalloc( 16 );
len = 16; len = 16;
memcpy(array, md_read(md, DIGEST_ALGO_MD5), 16 ); memcpy(array, md_read(md, DIGEST_ALGO_MD5), 16 );
md_close(md); md_close(md);
@ -665,7 +665,7 @@ fingerprint_from_pk( PKT_public_key *pk, byte *array, size_t *ret_len )
else else
{ {
if(!array) if(!array)
array=m_alloc(16); array=xmalloc(16);
len=16; len=16;
memset(array,0,16); memset(array,0,16);
} }
@ -677,7 +677,7 @@ fingerprint_from_pk( PKT_public_key *pk, byte *array, size_t *ret_len )
len = md_digest_length( md_get_algo( md ) ); len = md_digest_length( md_get_algo( md ) );
assert( len <= MAX_FINGERPRINT_LEN ); assert( len <= MAX_FINGERPRINT_LEN );
if( !array ) if( !array )
array = m_alloc( len ); array = xmalloc( len );
memcpy(array, dp, len ); memcpy(array, dp, len );
pk->keyid[0] = dp[12] << 24 | dp[13] << 16 | dp[14] << 8 | dp[15] ; pk->keyid[0] = dp[12] << 24 | dp[13] << 16 | dp[14] << 8 | dp[15] ;
pk->keyid[1] = dp[16] << 24 | dp[17] << 16 | dp[18] << 8 | dp[19] ; pk->keyid[1] = dp[16] << 24 | dp[17] << 16 | dp[18] << 8 | dp[19] ;
@ -707,14 +707,14 @@ fingerprint_from_sk( PKT_secret_key *sk, byte *array, size_t *ret_len )
if( pubkey_get_npkey( sk->pubkey_algo ) > 1 ) { if( pubkey_get_npkey( sk->pubkey_algo ) > 1 ) {
p = buf = mpi_get_buffer( sk->skey[0], &n, NULL ); p = buf = mpi_get_buffer( sk->skey[0], &n, NULL );
md_write( md, p, n ); md_write( md, p, n );
m_free(buf); xfree(buf);
p = buf = mpi_get_buffer( sk->skey[1], &n, NULL ); p = buf = mpi_get_buffer( sk->skey[1], &n, NULL );
md_write( md, p, n ); md_write( md, p, n );
m_free(buf); xfree(buf);
} }
md_final(md); md_final(md);
if( !array ) if( !array )
array = m_alloc( 16 ); array = xmalloc( 16 );
len = 16; len = 16;
memcpy(array, md_read(md, DIGEST_ALGO_MD5), 16 ); memcpy(array, md_read(md, DIGEST_ALGO_MD5), 16 );
md_close(md); md_close(md);
@ -722,7 +722,7 @@ fingerprint_from_sk( PKT_secret_key *sk, byte *array, size_t *ret_len )
else else
{ {
if(!array) if(!array)
array=m_alloc(16); array=xmalloc(16);
len=16; len=16;
memset(array,0,16); memset(array,0,16);
} }
@ -736,7 +736,7 @@ fingerprint_from_sk( PKT_secret_key *sk, byte *array, size_t *ret_len )
len = md_digest_length( md_get_algo( md ) ); len = md_digest_length( md_get_algo( md ) );
assert( len <= MAX_FINGERPRINT_LEN ); assert( len <= MAX_FINGERPRINT_LEN );
if( !array ) if( !array )
array = m_alloc( len ); array = xmalloc( len );
memcpy(array, dp, len ); memcpy(array, dp, len );
md_close(md); md_close(md);
} }
@ -744,7 +744,7 @@ fingerprint_from_sk( PKT_secret_key *sk, byte *array, size_t *ret_len )
{ {
len=MAX_FINGERPRINT_LEN; len=MAX_FINGERPRINT_LEN;
if(!array) if(!array)
array=m_alloc(len); array=xmalloc(len);
memset(array,0,len); memset(array,0,len);
} }
} }

14
g10/keylist.c
View File

@ -134,7 +134,7 @@ print_seckey_info (PKT_secret_key *sk)
pubkey_letter (sk->pubkey_algo), pubkey_letter (sk->pubkey_algo),
keystr(keyid), datestr_from_sk (sk), p); keystr(keyid), datestr_from_sk (sk), p);
m_free (p); xfree (p);
} }
/* Print information about the public key. With FP passed as NULL, /* Print information about the public key. With FP passed as NULL,
@ -165,7 +165,7 @@ print_pubkey_info (FILE *fp, PKT_public_key *pk)
nbits_from_pk (pk), pubkey_letter (pk->pubkey_algo), nbits_from_pk (pk), pubkey_letter (pk->pubkey_algo),
keystr(keyid), datestr_from_pk (pk), p); keystr(keyid), datestr_from_pk (pk), p);
m_free (p); xfree (p);
} }
@ -986,7 +986,7 @@ list_keyblock_print ( KBNODE keyblock, int secret, int fpr, void *opaque )
size_t n; size_t n;
char *p = get_user_id( sig->keyid, &n ); char *p = get_user_id( sig->keyid, &n );
print_utf8_string( stdout, p, n ); print_utf8_string( stdout, p, n );
m_free(p); xfree(p);
} }
putchar('\n'); putchar('\n');
@ -1293,7 +1293,7 @@ list_keyblock_colon( KBNODE keyblock, int secret, int fpr )
fflush(stdout); fflush(stdout);
if(opt.no_sig_cache) if(opt.no_sig_cache)
signer_pk=m_alloc_clear(sizeof(PKT_public_key)); signer_pk=xmalloc_clear(sizeof(PKT_public_key));
rc = check_key_signature2( keyblock, node, NULL, signer_pk, rc = check_key_signature2( keyblock, node, NULL, signer_pk,
NULL, NULL, NULL ); NULL, NULL, NULL );
@ -1345,7 +1345,7 @@ list_keyblock_colon( KBNODE keyblock, int secret, int fpr )
size_t n; size_t n;
char *p = get_user_id( sig->keyid, &n ); char *p = get_user_id( sig->keyid, &n );
print_string( stdout, p, n, ':' ); print_string( stdout, p, n, ':' );
m_free(p); xfree(p);
} }
printf(":%02x%c:", sig->sig_class,sig->flags.exportable?'x':'l'); printf(":%02x%c:", sig->sig_class,sig->flags.exportable?'x':'l');
@ -1469,14 +1469,14 @@ print_fingerprint (PKT_public_key *pk, PKT_secret_key *sk, int mode )
{ {
if(sk) if(sk)
{ {
PKT_secret_key *primary_sk=m_alloc_clear(sizeof(*primary_sk)); PKT_secret_key *primary_sk=xmalloc_clear(sizeof(*primary_sk));
get_seckey(primary_sk,sk->main_keyid); get_seckey(primary_sk,sk->main_keyid);
print_fingerprint(NULL,primary_sk,mode|0x80); print_fingerprint(NULL,primary_sk,mode|0x80);
free_secret_key(primary_sk); free_secret_key(primary_sk);
} }
else else
{ {
PKT_public_key *primary_pk=m_alloc_clear(sizeof(*primary_pk)); PKT_public_key *primary_pk=xmalloc_clear(sizeof(*primary_pk));
get_pubkey(primary_pk,pk->main_keyid); get_pubkey(primary_pk,pk->main_keyid);
print_fingerprint(primary_pk,NULL,mode|0x80); print_fingerprint(primary_pk,NULL,mode|0x80);
free_public_key(primary_pk); free_public_key(primary_pk);

64
g10/keyring.c
View File

@ -102,7 +102,7 @@ new_offset_item (void)
{ {
struct off_item *k; struct off_item *k;
k = m_alloc_clear (sizeof *k); k = xmalloc_clear (sizeof *k);
return k; return k;
} }
@ -115,7 +115,7 @@ release_offset_items (struct off_item *k)
for (; k; k = k2) for (; k; k = k2)
{ {
k2 = k->next; k2 = k->next;
m_free (k); xfree (k);
} }
} }
#endif #endif
@ -125,7 +125,7 @@ new_offset_hash_table (void)
{ {
struct off_item **tbl; struct off_item **tbl;
tbl = m_alloc_clear (2048 * sizeof *tbl); tbl = xmalloc_clear (2048 * sizeof *tbl);
return tbl; return tbl;
} }
@ -139,7 +139,7 @@ release_offset_hash_table (OffsetHashTable tbl)
return; return;
for (i=0; i < 2048; i++) for (i=0; i < 2048; i++)
release_offset_items (tbl[i]); release_offset_items (tbl[i]);
m_free (tbl); xfree (tbl);
} }
#endif #endif
@ -217,7 +217,7 @@ keyring_register_filename (const char *fname, int secret, void **ptr)
if (secret) if (secret)
register_secured_file (fname); register_secured_file (fname);
kr = m_alloc (sizeof *kr + strlen (fname)); kr = xmalloc (sizeof *kr + strlen (fname));
strcpy (kr->fname, fname); strcpy (kr->fname, fname);
kr->secret = !!secret; kr->secret = !!secret;
kr->lockhd = NULL; kr->lockhd = NULL;
@ -258,7 +258,7 @@ keyring_new (void *token, int secret)
assert (resource && !resource->secret == !secret); assert (resource && !resource->secret == !secret);
hd = m_alloc_clear (sizeof *hd); hd = xmalloc_clear (sizeof *hd);
hd->resource = resource; hd->resource = resource;
hd->secret = !!secret; hd->secret = !!secret;
active_handles++; active_handles++;
@ -272,10 +272,10 @@ keyring_release (KEYRING_HANDLE hd)
return; return;
assert (active_handles > 0); assert (active_handles > 0);
active_handles--; active_handles--;
m_free (hd->word_match.name); xfree (hd->word_match.name);
m_free (hd->word_match.pattern); xfree (hd->word_match.pattern);
iobuf_close (hd->current.iobuf); iobuf_close (hd->current.iobuf);
m_free (hd); xfree (hd);
} }
@ -384,7 +384,7 @@ keyring_get_keyblock (KEYRING_HANDLE hd, KBNODE *ret_kb)
return G10ERR_KEYRING_OPEN; return G10ERR_KEYRING_OPEN;
} }
pkt = m_alloc (sizeof *pkt); pkt = xmalloc (sizeof *pkt);
init_packet (pkt); init_packet (pkt);
hd->found.n_packets = 0;; hd->found.n_packets = 0;;
lastnode = NULL; lastnode = NULL;
@ -453,7 +453,7 @@ keyring_get_keyblock (KEYRING_HANDLE hd, KBNODE *ret_kb)
} }
} }
pkt = m_alloc (sizeof *pkt); pkt = xmalloc (sizeof *pkt);
init_packet(pkt); init_packet(pkt);
} }
set_packet_list_mode(save_mode); set_packet_list_mode(save_mode);
@ -476,7 +476,7 @@ keyring_get_keyblock (KEYRING_HANDLE hd, KBNODE *ret_kb)
*ret_kb = keyblock; *ret_kb = keyblock;
} }
free_packet (pkt); free_packet (pkt);
m_free (pkt); xfree (pkt);
iobuf_close(a); iobuf_close(a);
/* Make sure that future search operations fail immediately when /* Make sure that future search operations fail immediately when
@ -780,7 +780,7 @@ prepare_word_match (const byte *name)
int c; int c;
/* the original length is always enough for the pattern */ /* the original length is always enough for the pattern */
p = pattern = m_alloc(strlen(name)+1); p = pattern = xmalloc(strlen(name)+1);
do { do {
/* skip leading delimiters */ /* skip leading delimiters */
while( *name && !word_match_chars[*name] ) while( *name && !word_match_chars[*name] )
@ -957,9 +957,9 @@ keyring_search (KEYRING_HANDLE hd, KEYDB_SEARCH_DESC *desc,
if ( !hd->word_match.name || strcmp (hd->word_match.name, name) ) if ( !hd->word_match.name || strcmp (hd->word_match.name, name) )
{ {
/* name changed */ /* name changed */
m_free (hd->word_match.name); xfree (hd->word_match.name);
m_free (hd->word_match.pattern); xfree (hd->word_match.pattern);
hd->word_match.name = m_strdup (name); hd->word_match.name = xstrdup (name);
hd->word_match.pattern = prepare_word_match (name); hd->word_match.pattern = prepare_word_match (name);
} }
name = hd->word_match.pattern; name = hd->word_match.pattern;
@ -1162,27 +1162,27 @@ create_tmp_file (const char *template,
if (strlen (template) > 4 if (strlen (template) > 4
&& !strcmp (template+strlen(template)-4, EXTSEP_S "gpg") ) && !strcmp (template+strlen(template)-4, EXTSEP_S "gpg") )
{ {
bakfname = m_alloc (strlen (template) + 1); bakfname = xmalloc (strlen (template) + 1);
strcpy (bakfname, template); strcpy (bakfname, template);
strcpy (bakfname+strlen(template)-4, EXTSEP_S "bak"); strcpy (bakfname+strlen(template)-4, EXTSEP_S "bak");
tmpfname = m_alloc (strlen( template ) + 1 ); tmpfname = xmalloc (strlen( template ) + 1 );
strcpy (tmpfname,template); strcpy (tmpfname,template);
strcpy (tmpfname+strlen(template)-4, EXTSEP_S "tmp"); strcpy (tmpfname+strlen(template)-4, EXTSEP_S "tmp");
} }
else else
{ /* file does not end with gpg; hmmm */ { /* file does not end with gpg; hmmm */
bakfname = m_alloc (strlen( template ) + 5); bakfname = xmalloc (strlen( template ) + 5);
strcpy (stpcpy(bakfname, template), EXTSEP_S "bak"); strcpy (stpcpy(bakfname, template), EXTSEP_S "bak");
tmpfname = m_alloc (strlen( template ) + 5); tmpfname = xmalloc (strlen( template ) + 5);
strcpy (stpcpy(tmpfname, template), EXTSEP_S "tmp"); strcpy (stpcpy(tmpfname, template), EXTSEP_S "tmp");
} }
# else /* Posix file names */ # else /* Posix file names */
bakfname = m_alloc (strlen( template ) + 2); bakfname = xmalloc (strlen( template ) + 2);
strcpy (stpcpy (bakfname,template),"~"); strcpy (stpcpy (bakfname,template),"~");
tmpfname = m_alloc (strlen( template ) + 5); tmpfname = xmalloc (strlen( template ) + 5);
strcpy (stpcpy(tmpfname,template), EXTSEP_S "tmp"); strcpy (stpcpy(tmpfname,template), EXTSEP_S "tmp");
# endif /* Posix filename */ # endif /* Posix filename */
@ -1199,8 +1199,8 @@ create_tmp_file (const char *template,
if (!*r_fp) if (!*r_fp)
{ {
log_error(_("can't create `%s': %s\n"), tmpfname, strerror(errno) ); log_error(_("can't create `%s': %s\n"), tmpfname, strerror(errno) );
m_free (tmpfname); xfree (tmpfname);
m_free (bakfname); xfree (bakfname);
return G10ERR_OPEN_FILE; return G10ERR_OPEN_FILE;
} }
@ -1367,8 +1367,8 @@ keyring_rebuild_cache (void *token,int noisy)
} }
rc = lastresname? rename_tmp_file (bakfilename, tmpfilename, rc = lastresname? rename_tmp_file (bakfilename, tmpfilename,
lastresname, 0) : 0; lastresname, 0) : 0;
m_free (tmpfilename); tmpfilename = NULL; xfree (tmpfilename); tmpfilename = NULL;
m_free (bakfilename); bakfilename = NULL; xfree (bakfilename); bakfilename = NULL;
if (rc) if (rc)
goto leave; goto leave;
lastresname = resname; lastresname = resname;
@ -1447,14 +1447,14 @@ keyring_rebuild_cache (void *token,int noisy)
} }
rc = lastresname? rename_tmp_file (bakfilename, tmpfilename, rc = lastresname? rename_tmp_file (bakfilename, tmpfilename,
lastresname, 0) : 0; lastresname, 0) : 0;
m_free (tmpfilename); tmpfilename = NULL; xfree (tmpfilename); tmpfilename = NULL;
m_free (bakfilename); bakfilename = NULL; xfree (bakfilename); bakfilename = NULL;
leave: leave:
if (tmpfp) if (tmpfp)
iobuf_cancel (tmpfp); iobuf_cancel (tmpfp);
m_free (tmpfilename); xfree (tmpfilename);
m_free (bakfilename); xfree (bakfilename);
release_kbnode (keyblock); release_kbnode (keyblock);
keyring_lock (hd, 0); keyring_lock (hd, 0);
keyring_release (hd); keyring_release (hd);
@ -1618,7 +1618,7 @@ do_copy (int mode, const char *fname, KBNODE root, int secret,
rc = rename_tmp_file (bakfname, tmpfname, fname, secret); rc = rename_tmp_file (bakfname, tmpfname, fname, secret);
leave: leave:
m_free(bakfname); xfree(bakfname);
m_free(tmpfname); xfree(tmpfname);
return rc; return rc;
} }

114
g10/keyserver.c
View File

@ -128,14 +128,14 @@ parse_keyserver_options(char *options)
{ {
char *joined; char *joined;
joined=m_alloc(strlen(tok)+1+strlen(arg)+1); joined=xmalloc(strlen(tok)+1+strlen(arg)+1);
/* Make a canonical name=value form with no /* Make a canonical name=value form with no
spaces */ spaces */
strcpy(joined,tok); strcpy(joined,tok);
strcat(joined,"="); strcat(joined,"=");
strcat(joined,arg); strcat(joined,arg);
add_to_strlist(&opt.keyserver_options.other,joined); add_to_strlist(&opt.keyserver_options.other,joined);
m_free(joined); xfree(joined);
} }
else else
add_to_strlist(&opt.keyserver_options.other,tok); add_to_strlist(&opt.keyserver_options.other,tok);
@ -148,14 +148,14 @@ parse_keyserver_options(char *options)
void void
free_keyserver_spec(struct keyserver_spec *keyserver) free_keyserver_spec(struct keyserver_spec *keyserver)
{ {
m_free(keyserver->uri); xfree(keyserver->uri);
m_free(keyserver->scheme); xfree(keyserver->scheme);
m_free(keyserver->auth); xfree(keyserver->auth);
m_free(keyserver->host); xfree(keyserver->host);
m_free(keyserver->port); xfree(keyserver->port);
m_free(keyserver->path); xfree(keyserver->path);
m_free(keyserver->opaque); xfree(keyserver->opaque);
m_free(keyserver); xfree(keyserver);
} }
/* TODO: once we cut over to an all-curl world, we don't need this /* TODO: once we cut over to an all-curl world, we don't need this
@ -173,9 +173,9 @@ parse_keyserver_uri(const char *uri,int require_scheme,
assert(uri!=NULL); assert(uri!=NULL);
keyserver=m_alloc_clear(sizeof(struct keyserver_spec)); keyserver=xmalloc_clear(sizeof(struct keyserver_spec));
keyserver->uri=m_strdup(uri); keyserver->uri=xstrdup(uri);
/* Get the scheme */ /* Get the scheme */
@ -206,13 +206,13 @@ parse_keyserver_uri(const char *uri,int require_scheme,
/* Assume HKP if there is no scheme */ /* Assume HKP if there is no scheme */
assume_hkp=1; assume_hkp=1;
keyserver->scheme=m_strdup("hkp"); keyserver->scheme=xstrdup("hkp");
} }
else else
{ {
int i; int i;
keyserver->scheme=m_alloc(count+1); keyserver->scheme=xmalloc(count+1);
/* Force to lowercase */ /* Force to lowercase */
for(i=0;i<count;i++) for(i=0;i<count;i++)
@ -228,16 +228,16 @@ parse_keyserver_uri(const char *uri,int require_scheme,
{ {
deprecated_warning(configname,configlineno,"x-broken-hkp", deprecated_warning(configname,configlineno,"x-broken-hkp",
"--keyserver-options ","broken-http-proxy"); "--keyserver-options ","broken-http-proxy");
m_free(keyserver->scheme); xfree(keyserver->scheme);
keyserver->scheme=m_strdup("hkp"); keyserver->scheme=xstrdup("hkp");
add_to_strlist(&opt.keyserver_options.other,"broken-http-proxy"); add_to_strlist(&opt.keyserver_options.other,"broken-http-proxy");
} }
else if(ascii_strcasecmp(keyserver->scheme,"x-hkp")==0) else if(ascii_strcasecmp(keyserver->scheme,"x-hkp")==0)
{ {
/* Canonicalize this to "hkp" so it works with both the internal /* Canonicalize this to "hkp" so it works with both the internal
and external keyserver interface. */ and external keyserver interface. */
m_free(keyserver->scheme); xfree(keyserver->scheme);
keyserver->scheme=m_strdup("hkp"); keyserver->scheme=xstrdup("hkp");
} }
if(assume_hkp || (uri[0]=='/' && uri[1]=='/')) if(assume_hkp || (uri[0]=='/' && uri[1]=='/'))
@ -259,7 +259,7 @@ parse_keyserver_uri(const char *uri,int require_scheme,
if(count==0) if(count==0)
goto fail; goto fail;
keyserver->auth=m_alloc(count+1); keyserver->auth=xmalloc(count+1);
strncpy(keyserver->auth,uri,count); strncpy(keyserver->auth,uri,count);
keyserver->auth[count]='\0'; keyserver->auth[count]='\0';
uri+=count+1; uri+=count+1;
@ -286,7 +286,7 @@ parse_keyserver_uri(const char *uri,int require_scheme,
if(count==0) if(count==0)
goto fail; goto fail;
keyserver->host=m_alloc(count+1); keyserver->host=xmalloc(count+1);
strncpy(keyserver->host,uri,count); strncpy(keyserver->host,uri,count);
keyserver->host[count]='\0'; keyserver->host[count]='\0';
@ -309,7 +309,7 @@ parse_keyserver_uri(const char *uri,int require_scheme,
goto fail; goto fail;
} }
keyserver->port=m_alloc(count+1); keyserver->port=xmalloc(count+1);
strncpy(keyserver->port,uri+1,count); strncpy(keyserver->port,uri+1,count);
keyserver->port[count]='\0'; keyserver->port[count]='\0';
@ -319,15 +319,15 @@ parse_keyserver_uri(const char *uri,int require_scheme,
/* Everything else is the path */ /* Everything else is the path */
if(*uri) if(*uri)
keyserver->path=m_strdup(uri); keyserver->path=xstrdup(uri);
else else
keyserver->path=m_strdup("/"); keyserver->path=xstrdup("/");
} }
else if(uri[0]!='/') else if(uri[0]!='/')
{ {
/* No slash means opaque. Just record the opaque blob and get /* No slash means opaque. Just record the opaque blob and get
out. */ out. */
keyserver->opaque=m_strdup(uri); keyserver->opaque=xstrdup(uri);
} }
else else
{ {
@ -354,12 +354,12 @@ parse_preferred_keyserver(PKT_signature *sig)
p=parse_sig_subpkt(sig->hashed,SIGSUBPKT_PREF_KS,&plen); p=parse_sig_subpkt(sig->hashed,SIGSUBPKT_PREF_KS,&plen);
if(p && plen) if(p && plen)
{ {
byte *dupe=m_alloc(plen+1); byte *dupe=xmalloc(plen+1);
memcpy(dupe,p,plen); memcpy(dupe,p,plen);
dupe[plen]='\0'; dupe[plen]='\0';
spec=parse_keyserver_uri(dupe,1,NULL,0); spec=parse_keyserver_uri(dupe,1,NULL,0);
m_free(dupe); xfree(dupe);
} }
return spec; return spec;
@ -461,7 +461,7 @@ parse_keyrec(char *keystring)
return NULL; return NULL;
else if(work->desc.mode==KEYDB_SEARCH_MODE_NONE) else if(work->desc.mode==KEYDB_SEARCH_MODE_NONE)
{ {
m_free(work); xfree(work);
return NULL; return NULL;
} }
else else
@ -474,7 +474,7 @@ parse_keyrec(char *keystring)
if(work==NULL) if(work==NULL)
{ {
work=m_alloc_clear(sizeof(struct keyrec)); work=xmalloc_clear(sizeof(struct keyrec));
work->uidbuf=iobuf_temp(); work->uidbuf=iobuf_temp();
} }
@ -495,7 +495,7 @@ parse_keyrec(char *keystring)
if(work->desc.mode) if(work->desc.mode)
{ {
ret=work; ret=work;
work=m_alloc_clear(sizeof(struct keyrec)); work=xmalloc_clear(sizeof(struct keyrec));
work->uidbuf=iobuf_temp(); work->uidbuf=iobuf_temp();
} }
@ -610,7 +610,7 @@ parse_keyrec(char *keystring)
if(strlen(decoded)>opt.screen_columns-10) if(strlen(decoded)>opt.screen_columns-10)
decoded[opt.screen_columns-10]='\0'; decoded[opt.screen_columns-10]='\0';
iobuf_writestr(work->uidbuf,decoded); iobuf_writestr(work->uidbuf,decoded);
m_free(decoded); xfree(decoded);
iobuf_writestr(work->uidbuf,"\n\t"); iobuf_writestr(work->uidbuf,"\n\t");
work->lines++; work->lines++;
} }
@ -648,7 +648,7 @@ show_prompt(KEYDB_SEARCH_DESC *desc,int numdesc,int count,const char *search)
if(answer[0]=='q' || answer[0]=='Q') if(answer[0]=='q' || answer[0]=='Q')
{ {
m_free(answer); xfree(answer);
return 1; return 1;
} }
else if(atoi(answer)>=1 && atoi(answer)<=numdesc) else if(atoi(answer)>=1 && atoi(answer)<=numdesc)
@ -659,7 +659,7 @@ show_prompt(KEYDB_SEARCH_DESC *desc,int numdesc,int count,const char *search)
if(atoi(num)>=1 && atoi(num)<=numdesc) if(atoi(num)>=1 && atoi(num)<=numdesc)
keyserver_work(GET,NULL,&desc[atoi(num)-1],1,opt.keyserver); keyserver_work(GET,NULL,&desc[atoi(num)-1],1,opt.keyserver);
m_free(answer); xfree(answer);
return 1; return 1;
} }
@ -681,7 +681,7 @@ keyserver_search_prompt(IOBUF buffer,const char *searchstr)
if(searchstr) if(searchstr)
localstr=utf8_to_native(searchstr,strlen(searchstr),0); localstr=utf8_to_native(searchstr,strlen(searchstr),0);
desc=m_alloc(count*sizeof(KEYDB_SEARCH_DESC)); desc=xmalloc(count*sizeof(KEYDB_SEARCH_DESC));
for(;;) for(;;)
{ {
@ -736,7 +736,7 @@ keyserver_search_prompt(IOBUF buffer,const char *searchstr)
else else
validcount=1; validcount=1;
desc=m_realloc(desc,count*sizeof(KEYDB_SEARCH_DESC)); desc=xrealloc(desc,count*sizeof(KEYDB_SEARCH_DESC));
} }
started=1; started=1;
@ -776,7 +776,7 @@ keyserver_search_prompt(IOBUF buffer,const char *searchstr)
/* keyserver helper sent more keys than they claimed in the /* keyserver helper sent more keys than they claimed in the
info: line. */ info: line. */
count+=10; count+=10;
desc=m_realloc(desc,count*sizeof(KEYDB_SEARCH_DESC)); desc=xrealloc(desc,count*sizeof(KEYDB_SEARCH_DESC));
validcount=0; validcount=0;
} }
@ -800,7 +800,7 @@ keyserver_search_prompt(IOBUF buffer,const char *searchstr)
numlines+=keyrec->lines; numlines+=keyrec->lines;
iobuf_close(keyrec->uidbuf); iobuf_close(keyrec->uidbuf);
m_free(keyrec); xfree(keyrec);
started=1; started=1;
i++; i++;
@ -824,9 +824,9 @@ keyserver_search_prompt(IOBUF buffer,const char *searchstr)
log_info(_("key not found on keyserver\n")); log_info(_("key not found on keyserver\n"));
} }
m_free(localstr); xfree(localstr);
m_free(desc); xfree(desc);
m_free(line); xfree(line);
} }
static int static int
@ -922,14 +922,14 @@ keyserver_spawn(int action,STRLIST list,KEYDB_SEARCH_DESC *desc,
/* If exec-path was set, and DISABLE_KEYSERVER_PATH is /* If exec-path was set, and DISABLE_KEYSERVER_PATH is
undefined, then don't specify a full path to gpgkeys_foo, so undefined, then don't specify a full path to gpgkeys_foo, so
that the PATH can work. */ that the PATH can work. */
command=m_alloc(strlen(GPGKEYS_PREFIX)+strlen(scheme)+1); command=xmalloc(strlen(GPGKEYS_PREFIX)+strlen(scheme)+1);
command[0]='\0'; command[0]='\0';
} }
else else
#endif #endif
{ {
/* Specify a full path to gpgkeys_foo. */ /* Specify a full path to gpgkeys_foo. */
command=m_alloc(strlen(libexecdir)+strlen(DIRSEP_S)+ command=xmalloc(strlen(libexecdir)+strlen(DIRSEP_S)+
strlen(GPGKEYS_PREFIX)+strlen(scheme)+1); strlen(GPGKEYS_PREFIX)+strlen(scheme)+1);
strcpy(command,libexecdir); strcpy(command,libexecdir);
strcat(command,DIRSEP_S); strcat(command,DIRSEP_S);
@ -942,13 +942,13 @@ keyserver_spawn(int action,STRLIST list,KEYDB_SEARCH_DESC *desc,
{ {
if(opt.keyserver_options.options&KEYSERVER_KEEP_TEMP_FILES) if(opt.keyserver_options.options&KEYSERVER_KEEP_TEMP_FILES)
{ {
command=m_realloc(command,strlen(command)+ command=xrealloc(command,strlen(command)+
strlen(KEYSERVER_ARGS_KEEP)+1); strlen(KEYSERVER_ARGS_KEEP)+1);
strcat(command,KEYSERVER_ARGS_KEEP); strcat(command,KEYSERVER_ARGS_KEEP);
} }
else else
{ {
command=m_realloc(command,strlen(command)+ command=xrealloc(command,strlen(command)+
strlen(KEYSERVER_ARGS_NOKEEP)+1); strlen(KEYSERVER_ARGS_NOKEEP)+1);
strcat(command,KEYSERVER_ARGS_NOKEEP); strcat(command,KEYSERVER_ARGS_NOKEEP);
} }
@ -958,7 +958,7 @@ keyserver_spawn(int action,STRLIST list,KEYDB_SEARCH_DESC *desc,
else else
ret=exec_write(&spawn,command,NULL,NULL,0,0); ret=exec_write(&spawn,command,NULL,NULL,0,0);
m_free(command); xfree(command);
if(ret) if(ret)
return ret; return ret;
@ -1227,13 +1227,13 @@ keyserver_spawn(int action,STRLIST list,KEYDB_SEARCH_DESC *desc,
fprintf(spawn->tochild,"%s\n",key->d); fprintf(spawn->tochild,"%s\n",key->d);
if(key!=list) if(key!=list)
{ {
searchstr=m_realloc(searchstr, searchstr=xrealloc(searchstr,
strlen(searchstr)+strlen(key->d)+2); strlen(searchstr)+strlen(key->d)+2);
strcat(searchstr," "); strcat(searchstr," ");
} }
else else
{ {
searchstr=m_alloc(strlen(key->d)+1); searchstr=xmalloc(strlen(key->d)+1);
searchstr[0]='\0'; searchstr[0]='\0';
} }
@ -1471,7 +1471,7 @@ keyserver_import(STRLIST users)
int rc=0; int rc=0;
/* Build a list of key ids */ /* Build a list of key ids */
desc=m_alloc(sizeof(KEYDB_SEARCH_DESC)*num); desc=xmalloc(sizeof(KEYDB_SEARCH_DESC)*num);
for(;users;users=users->next) for(;users;users=users->next)
{ {
@ -1489,14 +1489,14 @@ keyserver_import(STRLIST users)
if(count==num) if(count==num)
{ {
num+=100; num+=100;
desc=m_realloc(desc,sizeof(KEYDB_SEARCH_DESC)*num); desc=xrealloc(desc,sizeof(KEYDB_SEARCH_DESC)*num);
} }
} }
if(count>0) if(count>0)
rc=keyserver_work(GET,NULL,desc,count,opt.keyserver); rc=keyserver_work(GET,NULL,desc,count,opt.keyserver);
m_free(desc); xfree(desc);
return rc; return rc;
} }
@ -1547,21 +1547,21 @@ keyidlist(STRLIST users,KEYDB_SEARCH_DESC **klist,int *count,int fakev3)
*count=0; *count=0;
*klist=m_alloc(sizeof(KEYDB_SEARCH_DESC)*num); *klist=xmalloc(sizeof(KEYDB_SEARCH_DESC)*num);
kdbhd=keydb_new(0); kdbhd=keydb_new(0);
if(!users) if(!users)
{ {
ndesc = 1; ndesc = 1;
desc = m_alloc_clear ( ndesc * sizeof *desc); desc = xmalloc_clear ( ndesc * sizeof *desc);
desc[0].mode = KEYDB_SEARCH_MODE_FIRST; desc[0].mode = KEYDB_SEARCH_MODE_FIRST;
} }
else else
{ {
for (ndesc=0, sl=users; sl; sl = sl->next, ndesc++) for (ndesc=0, sl=users; sl; sl = sl->next, ndesc++)
; ;
desc = m_alloc ( ndesc * sizeof *desc); desc = xmalloc ( ndesc * sizeof *desc);
for (ndesc=0, sl=users; sl; sl = sl->next) for (ndesc=0, sl=users; sl; sl = sl->next)
{ {
@ -1606,7 +1606,7 @@ keyidlist(STRLIST users,KEYDB_SEARCH_DESC **klist,int *count,int fakev3)
if(*count==num) if(*count==num)
{ {
num+=100; num+=100;
*klist=m_realloc(*klist,sizeof(KEYDB_SEARCH_DESC)*num); *klist=xrealloc(*klist,sizeof(KEYDB_SEARCH_DESC)*num);
} }
} }
@ -1671,7 +1671,7 @@ keyidlist(STRLIST users,KEYDB_SEARCH_DESC **klist,int *count,int fakev3)
if(*count==num) if(*count==num)
{ {
num+=100; num+=100;
*klist=m_realloc(*klist,sizeof(KEYDB_SEARCH_DESC)*num); *klist=xrealloc(*klist,sizeof(KEYDB_SEARCH_DESC)*num);
} }
} }
} }
@ -1681,8 +1681,8 @@ keyidlist(STRLIST users,KEYDB_SEARCH_DESC **klist,int *count,int fakev3)
leave: leave:
if(rc) if(rc)
m_free(*klist); xfree(*klist);
m_free(desc); xfree(desc);
keydb_release(kdbhd); keydb_release(kdbhd);
release_kbnode(keyblock); release_kbnode(keyblock);
@ -1769,7 +1769,7 @@ keyserver_refresh(STRLIST users)
rc=keyserver_work(GET,NULL,desc,numdesc,opt.keyserver); rc=keyserver_work(GET,NULL,desc,numdesc,opt.keyserver);
} }
m_free(desc); xfree(desc);
opt.keyserver_options.import_options=options; opt.keyserver_options.import_options=options;

64
g10/mainproc.c
View File

@ -95,7 +95,7 @@ release_list( CTX c )
release_kbnode( c->list ); release_kbnode( c->list );
while( c->pkenc_list ) { while( c->pkenc_list ) {
struct kidlist_item *tmp = c->pkenc_list->next; struct kidlist_item *tmp = c->pkenc_list->next;
m_free( c->pkenc_list ); xfree( c->pkenc_list );
c->pkenc_list = tmp; c->pkenc_list = tmp;
} }
c->pkenc_list = NULL; c->pkenc_list = NULL;
@ -104,7 +104,7 @@ release_list( CTX c )
c->last_was_session_key = 0; c->last_was_session_key = 0;
c->pipemode.op = 0; c->pipemode.op = 0;
c->pipemode.stop_now = 0; c->pipemode.stop_now = 0;
m_free(c->dek); c->dek = NULL; xfree(c->dek); c->dek = NULL;
} }
@ -318,10 +318,10 @@ proc_symkey_enc( CTX c, PACKET *pkt )
if(opt.override_session_key) if(opt.override_session_key)
{ {
c->dek = m_alloc_clear( sizeof *c->dek ); c->dek = xmalloc_clear( sizeof *c->dek );
if(get_override_session_key(c->dek, opt.override_session_key)) if(get_override_session_key(c->dek, opt.override_session_key))
{ {
m_free(c->dek); xfree(c->dek);
c->dek = NULL; c->dek = NULL;
} }
} }
@ -345,7 +345,7 @@ proc_symkey_enc( CTX c, PACKET *pkt )
if(symkey_decrypt_seskey(c->dek, enc->seskey, if(symkey_decrypt_seskey(c->dek, enc->seskey,
enc->seskeylen)) enc->seskeylen))
{ {
m_free(c->dek); xfree(c->dek);
c->dek=NULL; c->dek=NULL;
} }
} }
@ -386,10 +386,10 @@ proc_pubkey_enc( CTX c, PACKET *pkt )
/* It does not make much sense to store the session key in /* It does not make much sense to store the session key in
* secure memory because it has already been passed on the * secure memory because it has already been passed on the
* command line and the GCHQ knows about it */ * command line and the GCHQ knows about it */
c->dek = m_alloc_clear( sizeof *c->dek ); c->dek = xmalloc_clear( sizeof *c->dek );
result = get_override_session_key ( c->dek, opt.override_session_key ); result = get_override_session_key ( c->dek, opt.override_session_key );
if ( result ) { if ( result ) {
m_free(c->dek); c->dek = NULL; xfree(c->dek); c->dek = NULL;
} }
} }
else if( is_ELGAMAL(enc->pubkey_algo) else if( is_ELGAMAL(enc->pubkey_algo)
@ -401,10 +401,10 @@ proc_pubkey_enc( CTX c, PACKET *pkt )
if( opt.list_only ) if( opt.list_only )
result = -1; result = -1;
else { else {
c->dek = m_alloc_secure_clear( sizeof *c->dek ); c->dek = xmalloc_secure_clear( sizeof *c->dek );
if( (result = get_session_key( enc, c->dek )) ) { if( (result = get_session_key( enc, c->dek )) ) {
/* error: delete the DEK */ /* error: delete the DEK */
m_free(c->dek); c->dek = NULL; xfree(c->dek); c->dek = NULL;
} }
} }
} }
@ -419,7 +419,7 @@ proc_pubkey_enc( CTX c, PACKET *pkt )
else else
{ {
/* store it for later display */ /* store it for later display */
struct kidlist_item *x = m_alloc( sizeof *x ); struct kidlist_item *x = xmalloc( sizeof *x );
x->kid[0] = enc->keyid[0]; x->kid[0] = enc->keyid[0];
x->kid[1] = enc->keyid[1]; x->kid[1] = enc->keyid[1];
x->pubkey_algo = enc->pubkey_algo; x->pubkey_algo = enc->pubkey_algo;
@ -453,7 +453,7 @@ print_pkenc_list( struct kidlist_item *list, int failed )
continue; continue;
algstr = pubkey_algo_to_string( list->pubkey_algo ); algstr = pubkey_algo_to_string( list->pubkey_algo );
pk = m_alloc_clear( sizeof *pk ); pk = xmalloc_clear( sizeof *pk );
if( !algstr ) if( !algstr )
algstr = "[?]"; algstr = "[?]";
@ -466,7 +466,7 @@ print_pkenc_list( struct kidlist_item *list, int failed )
strtimestamp(pk->timestamp) ); strtimestamp(pk->timestamp) );
p=get_user_id_native(list->kid); p=get_user_id_native(list->kid);
fprintf(log_stream(),_(" \"%s\"\n"),p); fprintf(log_stream(),_(" \"%s\"\n"),p);
m_free(p); xfree(p);
} }
else else
log_info(_("encrypted with %s key, ID %s\n"), log_info(_("encrypted with %s key, ID %s\n"),
@ -515,11 +515,11 @@ proc_encrypted( CTX c, PACKET *pkt )
if(opt.override_session_key) if(opt.override_session_key)
{ {
c->dek = m_alloc_clear( sizeof *c->dek ); c->dek = xmalloc_clear( sizeof *c->dek );
result=get_override_session_key(c->dek, opt.override_session_key); result=get_override_session_key(c->dek, opt.override_session_key);
if(result) if(result)
{ {
m_free(c->dek); xfree(c->dek);
c->dek = NULL; c->dek = NULL;
} }
} }
@ -575,7 +575,7 @@ proc_encrypted( CTX c, PACKET *pkt )
if(opt.show_session_key) if(opt.show_session_key)
{ {
int i; int i;
char *buf = m_alloc ( c->dek->keylen*2 + 20 ); char *buf = xmalloc ( c->dek->keylen*2 + 20 );
sprintf ( buf, "%d:", c->dek->algo ); sprintf ( buf, "%d:", c->dek->algo );
for(i=0; i < c->dek->keylen; i++ ) for(i=0; i < c->dek->keylen; i++ )
sprintf(buf+strlen(buf), "%02X", c->dek->key[i] ); sprintf(buf+strlen(buf), "%02X", c->dek->key[i] );
@ -594,7 +594,7 @@ proc_encrypted( CTX c, PACKET *pkt )
/* Hmmm: does this work when we have encrypted using multiple /* Hmmm: does this work when we have encrypted using multiple
* ways to specify the session key (symmmetric and PK)*/ * ways to specify the session key (symmmetric and PK)*/
} }
m_free(c->dek); c->dek = NULL; xfree(c->dek); c->dek = NULL;
free_packet(pkt); free_packet(pkt);
c->last_was_session_key = 0; c->last_was_session_key = 0;
write_status( STATUS_END_DECRYPTION ); write_status( STATUS_END_DECRYPTION );
@ -1099,7 +1099,7 @@ list_node( CTX c, KBNODE node )
else if( !opt.fast_list_mode ) { else if( !opt.fast_list_mode ) {
p = get_user_id( sig->keyid, &n ); p = get_user_id( sig->keyid, &n );
print_string( stdout, p, n, opt.with_colons ); print_string( stdout, p, n, opt.with_colons );
m_free(p); xfree(p);
} }
if( opt.with_colons ) if( opt.with_colons )
printf(":%02x%c:", sig->sig_class, sig->flags.exportable?'x':'l'); printf(":%02x%c:", sig->sig_class, sig->flags.exportable?'x':'l');
@ -1115,11 +1115,11 @@ int
proc_packets( void *anchor, IOBUF a ) proc_packets( void *anchor, IOBUF a )
{ {
int rc; int rc;
CTX c = m_alloc_clear( sizeof *c ); CTX c = xmalloc_clear( sizeof *c );
c->anchor = anchor; c->anchor = anchor;
rc = do_proc_packets( c, a ); rc = do_proc_packets( c, a );
m_free( c ); xfree( c );
return rc; return rc;
} }
@ -1129,7 +1129,7 @@ int
proc_signature_packets( void *anchor, IOBUF a, proc_signature_packets( void *anchor, IOBUF a,
STRLIST signedfiles, const char *sigfilename ) STRLIST signedfiles, const char *sigfilename )
{ {
CTX c = m_alloc_clear( sizeof *c ); CTX c = xmalloc_clear( sizeof *c );
int rc; int rc;
c->anchor = anchor; c->anchor = anchor;
@ -1137,20 +1137,20 @@ proc_signature_packets( void *anchor, IOBUF a,
c->signed_data = signedfiles; c->signed_data = signedfiles;
c->sigfilename = sigfilename; c->sigfilename = sigfilename;
rc = do_proc_packets( c, a ); rc = do_proc_packets( c, a );
m_free( c ); xfree( c );
return rc; return rc;
} }
int int
proc_encryption_packets( void *anchor, IOBUF a ) proc_encryption_packets( void *anchor, IOBUF a )
{ {
CTX c = m_alloc_clear( sizeof *c ); CTX c = xmalloc_clear( sizeof *c );
int rc; int rc;
c->anchor = anchor; c->anchor = anchor;
c->encrypt_only = 1; c->encrypt_only = 1;
rc = do_proc_packets( c, a ); rc = do_proc_packets( c, a );
m_free( c ); xfree( c );
return rc; return rc;
} }
@ -1158,7 +1158,7 @@ proc_encryption_packets( void *anchor, IOBUF a )
int int
do_proc_packets( CTX c, IOBUF a ) do_proc_packets( CTX c, IOBUF a )
{ {
PACKET *pkt = m_alloc( sizeof *pkt ); PACKET *pkt = xmalloc( sizeof *pkt );
int rc=0; int rc=0;
int any_data=0; int any_data=0;
int newpkt; int newpkt;
@ -1266,7 +1266,7 @@ do_proc_packets( CTX c, IOBUF a )
if( newpkt == -1 ) if( newpkt == -1 )
; ;
else if( newpkt ) { else if( newpkt ) {
pkt = m_alloc( sizeof *pkt ); pkt = xmalloc( sizeof *pkt );
init_packet(pkt); init_packet(pkt);
} }
else else
@ -1288,9 +1288,9 @@ do_proc_packets( CTX c, IOBUF a )
leave: leave:
release_list( c ); release_list( c );
m_free(c->dek); xfree(c->dek);
free_packet( pkt ); free_packet( pkt );
m_free( pkt ); xfree( pkt );
free_md_filter_context( &c->mfx ); free_md_filter_context( &c->mfx );
return rc; return rc;
} }
@ -1502,7 +1502,7 @@ check_sig_and_print( CTX c, KBNODE node )
else else
log_info(_("Good signature from \"%s\""),p); log_info(_("Good signature from \"%s\""),p);
m_free(p); xfree(p);
if(opt.verify_options&VERIFY_SHOW_UID_VALIDITY) if(opt.verify_options&VERIFY_SHOW_UID_VALIDITY)
fprintf(log_stream()," [%s]\n",trust_value_to_string(valid)); fprintf(log_stream()," [%s]\n",trust_value_to_string(valid));
@ -1541,7 +1541,7 @@ check_sig_and_print( CTX c, KBNODE node )
p=utf8_to_native(un->pkt->pkt.user_id->name, p=utf8_to_native(un->pkt->pkt.user_id->name,
un->pkt->pkt.user_id->len,0); un->pkt->pkt.user_id->len,0);
else else
p=m_strdup("[?]"); p=xstrdup("[?]");
if(rc) if(rc)
log_info(_("BAD signature from \"%s\""),p); log_info(_("BAD signature from \"%s\""),p);
@ -1585,7 +1585,7 @@ check_sig_and_print( CTX c, KBNODE node )
p=utf8_to_native(un->pkt->pkt.user_id->name, p=utf8_to_native(un->pkt->pkt.user_id->name,
un->pkt->pkt.user_id->len,0); un->pkt->pkt.user_id->len,0);
log_info(_(" aka \"%s\""),p); log_info(_(" aka \"%s\""),p);
m_free(p); xfree(p);
if(opt.verify_options&VERIFY_SHOW_UID_VALIDITY) if(opt.verify_options&VERIFY_SHOW_UID_VALIDITY)
{ {
@ -1628,7 +1628,7 @@ check_sig_and_print( CTX c, KBNODE node )
if( !rc && is_status_enabled() ) { if( !rc && is_status_enabled() ) {
/* print a status response with the fingerprint */ /* print a status response with the fingerprint */
PKT_public_key *vpk = m_alloc_clear( sizeof *vpk ); PKT_public_key *vpk = xmalloc_clear( sizeof *vpk );
if( !get_pubkey( vpk, sig->keyid ) ) { if( !get_pubkey( vpk, sig->keyid ) ) {
byte array[MAX_FINGERPRINT_LEN], *p; byte array[MAX_FINGERPRINT_LEN], *p;
@ -1656,7 +1656,7 @@ check_sig_and_print( CTX c, KBNODE node )
akid[0] = vpk->main_keyid[0]; akid[0] = vpk->main_keyid[0];
akid[1] = vpk->main_keyid[1]; akid[1] = vpk->main_keyid[1];
free_public_key (vpk); free_public_key (vpk);
vpk = m_alloc_clear( sizeof *vpk ); vpk = xmalloc_clear( sizeof *vpk );
if (get_pubkey (vpk, akid)) { if (get_pubkey (vpk, akid)) {
/* impossible error, we simply return a zeroed out fpr */ /* impossible error, we simply return a zeroed out fpr */
n = MAX_FINGERPRINT_LEN < 20? MAX_FINGERPRINT_LEN : 20; n = MAX_FINGERPRINT_LEN < 20? MAX_FINGERPRINT_LEN : 20;

10
g10/misc.c
View File

@ -289,7 +289,7 @@ checksum_mpi( MPI a )
nbits = mpi_get_nbits(a); nbits = mpi_get_nbits(a);
csum = checksum_u16( nbits ); csum = checksum_u16( nbits );
csum += checksum( buffer, nbytes ); csum += checksum( buffer, nbytes );
m_free( buffer ); xfree( buffer );
return csum; return csum;
} }
@ -468,7 +468,7 @@ static unsigned long get_signature_count(PKT_secret_key *sk)
return 0; return 0;
} }
/* Expand %-strings. Returns a string which must be m_freed. Returns /* Expand %-strings. Returns a string which must be xfreed. Returns
NULL if the string cannot be expanded (too large). */ NULL if the string cannot be expanded (too large). */
char * char *
pct_expando(const char *string,struct expando_args *args) pct_expando(const char *string,struct expando_args *args)
@ -500,7 +500,7 @@ pct_expando(const char *string,struct expando_args *args)
goto fail; goto fail;
maxlen+=1024; maxlen+=1024;
ret=m_realloc(ret,maxlen); ret=xrealloc(ret,maxlen);
} }
done=0; done=0;
@ -571,7 +571,7 @@ pct_expando(const char *string,struct expando_args *args)
else if(args->sk->main_keyid[0] || args->sk->main_keyid[1]) else if(args->sk->main_keyid[0] || args->sk->main_keyid[1])
{ {
PKT_public_key *pk= PKT_public_key *pk=
m_alloc_clear(sizeof(PKT_public_key)); xmalloc_clear(sizeof(PKT_public_key));
if(get_pubkey_fast(pk,args->sk->main_keyid)==0) if(get_pubkey_fast(pk,args->sk->main_keyid)==0)
fingerprint_from_pk(pk,array,&len); fingerprint_from_pk(pk,array,&len);
@ -662,7 +662,7 @@ pct_expando(const char *string,struct expando_args *args)
return ret; return ret;
fail: fail:
m_free(ret); xfree(ret);
return NULL; return NULL;
} }

36
g10/openfile.c
View File

@ -101,19 +101,19 @@ make_outfile_name( const char *iname )
size_t n; size_t n;
if ( iobuf_is_pipe_filename (iname) ) if ( iobuf_is_pipe_filename (iname) )
return m_strdup("-"); return xstrdup("-");
n = strlen(iname); n = strlen(iname);
if( n > 4 && ( !CMP_FILENAME(iname+n-4, EXTSEP_S "gpg") if( n > 4 && ( !CMP_FILENAME(iname+n-4, EXTSEP_S "gpg")
|| !CMP_FILENAME(iname+n-4, EXTSEP_S "pgp") || !CMP_FILENAME(iname+n-4, EXTSEP_S "pgp")
|| !CMP_FILENAME(iname+n-4, EXTSEP_S "sig") || !CMP_FILENAME(iname+n-4, EXTSEP_S "sig")
|| !CMP_FILENAME(iname+n-4, EXTSEP_S "asc") ) ) { || !CMP_FILENAME(iname+n-4, EXTSEP_S "asc") ) ) {
char *buf = m_strdup( iname ); char *buf = xstrdup( iname );
buf[n-4] = 0; buf[n-4] = 0;
return buf; return buf;
} }
else if( n > 5 && !CMP_FILENAME(iname+n-5, EXTSEP_S "sign") ) { else if( n > 5 && !CMP_FILENAME(iname+n-5, EXTSEP_S "sign") ) {
char *buf = m_strdup( iname ); char *buf = xstrdup( iname );
buf[n-5] = 0; buf[n-5] = 0;
return buf; return buf;
} }
@ -144,7 +144,7 @@ ask_outfile_name( const char *name, size_t namelen )
n = strlen(s) + namelen + 10; n = strlen(s) + namelen + 10;
defname = name && namelen? make_printable_string( name, namelen, 0): NULL; defname = name && namelen? make_printable_string( name, namelen, 0): NULL;
prompt = m_alloc(n); prompt = xmalloc(n);
if( defname ) if( defname )
sprintf(prompt, "%s [%s]: ", s, defname ); sprintf(prompt, "%s [%s]: ", s, defname );
else else
@ -153,12 +153,12 @@ ask_outfile_name( const char *name, size_t namelen )
fname = cpr_get("openfile.askoutname", prompt ); fname = cpr_get("openfile.askoutname", prompt );
cpr_kill_prompt(); cpr_kill_prompt();
tty_disable_completion(); tty_disable_completion();
m_free(prompt); xfree(prompt);
if( !*fname ) { if( !*fname ) {
m_free( fname ); fname = NULL; xfree( fname ); fname = NULL;
fname = defname; defname = NULL; fname = defname; defname = NULL;
} }
m_free(defname); xfree(defname);
if (fname) if (fname)
trim_spaces (fname); trim_spaces (fname);
return fname; return fname;
@ -210,7 +210,7 @@ open_outfile( const char *iname, int mode, IOBUF *a )
const char *newsfx = mode==1 ? ".asc" : const char *newsfx = mode==1 ? ".asc" :
mode==2 ? ".sig" : ".gpg"; mode==2 ? ".sig" : ".gpg";
buf = m_alloc(strlen(iname)+4+1); buf = xmalloc(strlen(iname)+4+1);
strcpy(buf,iname); strcpy(buf,iname);
dot = strchr(buf, '.' ); dot = strchr(buf, '.' );
if ( dot && dot > buf && dot[1] && strlen(dot) <= 4 if ( dot && dot > buf && dot[1] && strlen(dot) <= 4
@ -226,7 +226,7 @@ open_outfile( const char *iname, int mode, IOBUF *a )
if (!buf) if (!buf)
#endif /* USE_ONLY_8DOT3 */ #endif /* USE_ONLY_8DOT3 */
{ {
buf = m_alloc(strlen(iname)+4+1); buf = xmalloc(strlen(iname)+4+1);
strcpy(stpcpy(buf,iname), mode==1 ? EXTSEP_S "asc" : strcpy(stpcpy(buf,iname), mode==1 ? EXTSEP_S "asc" :
mode==2 ? EXTSEP_S "sig" : EXTSEP_S "gpg"); mode==2 ? EXTSEP_S "sig" : EXTSEP_S "gpg");
} }
@ -239,11 +239,11 @@ open_outfile( const char *iname, int mode, IOBUF *a )
char *tmp = ask_outfile_name (NULL, 0); char *tmp = ask_outfile_name (NULL, 0);
if ( !tmp || !*tmp ) if ( !tmp || !*tmp )
{ {
m_free (tmp); xfree (tmp);
rc = G10ERR_FILE_EXISTS; rc = G10ERR_FILE_EXISTS;
break; break;
} }
m_free (buf); xfree (buf);
name = buf = tmp; name = buf = tmp;
} }
@ -264,7 +264,7 @@ open_outfile( const char *iname, int mode, IOBUF *a )
else if( opt.verbose ) else if( opt.verbose )
log_info(_("writing to `%s'\n"), name ); log_info(_("writing to `%s'\n"), name );
} }
m_free(buf); xfree(buf);
} }
if (*a) if (*a)
@ -290,7 +290,7 @@ open_sigfile( const char *iname, progress_filter_context_t *pfx )
|| ( len > 5 && !strcmp(iname + len - 5, EXTSEP_S "sign") ) || ( len > 5 && !strcmp(iname + len - 5, EXTSEP_S "sign") )
|| !strcmp(iname + len - 4, EXTSEP_S "asc")) ) { || !strcmp(iname + len - 4, EXTSEP_S "asc")) ) {
char *buf; char *buf;
buf = m_strdup(iname); buf = xstrdup(iname);
buf[len-(buf[len-1]=='n'?5:4)] = 0 ; buf[len-(buf[len-1]=='n'?5:4)] = 0 ;
a = iobuf_open( buf ); a = iobuf_open( buf );
if (a && is_secured_file (iobuf_get_fd (a))) if (a && is_secured_file (iobuf_get_fd (a)))
@ -303,7 +303,7 @@ open_sigfile( const char *iname, progress_filter_context_t *pfx )
log_info(_("assuming signed data in `%s'\n"), buf ); log_info(_("assuming signed data in `%s'\n"), buf );
if (a && pfx) if (a && pfx)
handle_progress (pfx, a, buf); handle_progress (pfx, a, buf);
m_free(buf); xfree(buf);
} }
} }
return a; return a;
@ -327,7 +327,7 @@ copy_options_file( const char *destdir )
if( opt.dry_run ) if( opt.dry_run )
return; return;
fname = m_alloc( strlen(datadir) + strlen(destdir) + 15 ); fname = xmalloc( strlen(datadir) + strlen(destdir) + 15 );
strcpy(stpcpy(fname, datadir), DIRSEP_S "options" SKELEXT ); strcpy(stpcpy(fname, datadir), DIRSEP_S "options" SKELEXT );
src = fopen( fname, "r" ); src = fopen( fname, "r" );
if (src && is_secured_file (fileno (src))) if (src && is_secured_file (fileno (src)))
@ -338,7 +338,7 @@ copy_options_file( const char *destdir )
} }
if( !src ) { if( !src ) {
log_error(_("can't open `%s': %s\n"), fname, strerror(errno) ); log_error(_("can't open `%s': %s\n"), fname, strerror(errno) );
m_free(fname); xfree(fname);
return; return;
} }
strcpy(stpcpy(fname, destdir), DIRSEP_S "gpg" EXTSEP_S "conf" ); strcpy(stpcpy(fname, destdir), DIRSEP_S "gpg" EXTSEP_S "conf" );
@ -354,7 +354,7 @@ copy_options_file( const char *destdir )
if( !dst ) { if( !dst ) {
log_error(_("can't create `%s': %s\n"), fname, strerror(errno) ); log_error(_("can't create `%s': %s\n"), fname, strerror(errno) );
fclose( src ); fclose( src );
m_free(fname); xfree(fname);
return; return;
} }
@ -384,7 +384,7 @@ copy_options_file( const char *destdir )
log_info (_("WARNING: options in `%s'" log_info (_("WARNING: options in `%s'"
" are not yet active during this run\n"), " are not yet active during this run\n"),
fname); fname);
m_free(fname); xfree(fname);
} }

54
g10/parse-packet.c
View File

@ -473,12 +473,12 @@ parse( IOBUF inp, PACKET *pkt, int onlykeypkts, off_t *retpos,
switch( pkttype ) { switch( pkttype ) {
case PKT_PUBLIC_KEY: case PKT_PUBLIC_KEY:
case PKT_PUBLIC_SUBKEY: case PKT_PUBLIC_SUBKEY:
pkt->pkt.public_key = m_alloc_clear(sizeof *pkt->pkt.public_key ); pkt->pkt.public_key = xmalloc_clear(sizeof *pkt->pkt.public_key );
rc = parse_key(inp, pkttype, pktlen, hdr, hdrlen, pkt ); rc = parse_key(inp, pkttype, pktlen, hdr, hdrlen, pkt );
break; break;
case PKT_SECRET_KEY: case PKT_SECRET_KEY:
case PKT_SECRET_SUBKEY: case PKT_SECRET_SUBKEY:
pkt->pkt.secret_key = m_alloc_clear(sizeof *pkt->pkt.secret_key ); pkt->pkt.secret_key = xmalloc_clear(sizeof *pkt->pkt.secret_key );
rc = parse_key(inp, pkttype, pktlen, hdr, hdrlen, pkt ); rc = parse_key(inp, pkttype, pktlen, hdr, hdrlen, pkt );
break; break;
case PKT_SYMKEY_ENC: case PKT_SYMKEY_ENC:
@ -488,11 +488,11 @@ parse( IOBUF inp, PACKET *pkt, int onlykeypkts, off_t *retpos,
rc = parse_pubkeyenc(inp, pkttype, pktlen, pkt ); rc = parse_pubkeyenc(inp, pkttype, pktlen, pkt );
break; break;
case PKT_SIGNATURE: case PKT_SIGNATURE:
pkt->pkt.signature = m_alloc_clear(sizeof *pkt->pkt.signature ); pkt->pkt.signature = xmalloc_clear(sizeof *pkt->pkt.signature );
rc = parse_signature(inp, pkttype, pktlen, pkt->pkt.signature ); rc = parse_signature(inp, pkttype, pktlen, pkt->pkt.signature );
break; break;
case PKT_ONEPASS_SIG: case PKT_ONEPASS_SIG:
pkt->pkt.onepass_sig = m_alloc_clear(sizeof *pkt->pkt.onepass_sig ); pkt->pkt.onepass_sig = xmalloc_clear(sizeof *pkt->pkt.onepass_sig );
rc = parse_onepass_sig(inp, pkttype, pktlen, pkt->pkt.onepass_sig ); rc = parse_onepass_sig(inp, pkttype, pktlen, pkt->pkt.onepass_sig );
break; break;
case PKT_USER_ID: case PKT_USER_ID:
@ -627,7 +627,7 @@ read_rest( IOBUF inp, size_t pktlen, int partial )
p = NULL; p = NULL;
} }
else { else {
p = m_alloc( pktlen ); p = xmalloc( pktlen );
for(i=0; pktlen; pktlen--, i++ ) for(i=0; pktlen; pktlen--, i++ )
p[i] = iobuf_get(inp); p[i] = iobuf_get(inp);
} }
@ -682,7 +682,7 @@ parse_symkeyenc( IOBUF inp, int pkttype, unsigned long pktlen, PACKET *packet )
goto leave; goto leave;
} }
seskeylen = pktlen - minlen; seskeylen = pktlen - minlen;
k = packet->pkt.symkey_enc = m_alloc_clear( sizeof *packet->pkt.symkey_enc k = packet->pkt.symkey_enc = xmalloc_clear( sizeof *packet->pkt.symkey_enc
+ seskeylen - 1 ); + seskeylen - 1 );
k->version = version; k->version = version;
k->cipher_algo = cipher_algo; k->cipher_algo = cipher_algo;
@ -739,7 +739,7 @@ parse_pubkeyenc( IOBUF inp, int pkttype, unsigned long pktlen, PACKET *packet )
int i, ndata; int i, ndata;
PKT_pubkey_enc *k; PKT_pubkey_enc *k;
k = packet->pkt.pubkey_enc = m_alloc_clear(sizeof *packet->pkt.pubkey_enc); k = packet->pkt.pubkey_enc = xmalloc_clear(sizeof *packet->pkt.pubkey_enc);
if( pktlen < 12 ) { if( pktlen < 12 ) {
log_error("packet(%d) too short\n", pkttype); log_error("packet(%d) too short\n", pkttype);
rc = G10ERR_INVALID_PACKET; rc = G10ERR_INVALID_PACKET;
@ -1228,7 +1228,7 @@ void parse_revkeys(PKT_signature *sig)
if(len==sizeof(struct revocation_key) && if(len==sizeof(struct revocation_key) &&
(revkey->class&0x80)) /* 0x80 bit must be set */ (revkey->class&0x80)) /* 0x80 bit must be set */
{ {
sig->revkey=m_realloc(sig->revkey, sig->revkey=xrealloc(sig->revkey,
sizeof(struct revocation_key *)*(sig->numrevkeys+1)); sizeof(struct revocation_key *)*(sig->numrevkeys+1));
sig->revkey[sig->numrevkeys]=revkey; sig->revkey[sig->numrevkeys]=revkey;
sig->numrevkeys++; sig->numrevkeys++;
@ -1280,7 +1280,7 @@ parse_signature( IOBUF inp, int pkttype, unsigned long pktlen,
goto leave; goto leave;
} }
if( n ) { if( n ) {
sig->hashed = m_alloc (sizeof (*sig->hashed) + n - 1 ); sig->hashed = xmalloc (sizeof (*sig->hashed) + n - 1 );
sig->hashed->size = n; sig->hashed->size = n;
sig->hashed->len = n; sig->hashed->len = n;
if( iobuf_read (inp, sig->hashed->data, n ) != n ) { if( iobuf_read (inp, sig->hashed->data, n ) != n ) {
@ -1298,7 +1298,7 @@ parse_signature( IOBUF inp, int pkttype, unsigned long pktlen,
goto leave; goto leave;
} }
if( n ) { if( n ) {
sig->unhashed = m_alloc (sizeof(*sig->unhashed) + n - 1 ); sig->unhashed = xmalloc (sizeof(*sig->unhashed) + n - 1 );
sig->unhashed->size = n; sig->unhashed->size = n;
sig->unhashed->len = n; sig->unhashed->len = n;
if( iobuf_read(inp, sig->unhashed->data, n ) != n ) { if( iobuf_read(inp, sig->unhashed->data, n ) != n ) {
@ -1514,7 +1514,7 @@ read_protected_v3_mpi (IOBUF inp, unsigned long *length)
return NULL; return NULL;
} }
nbytes = (nbits+7) / 8; nbytes = (nbits+7) / 8;
buf = p = m_alloc (2 + nbytes); buf = p = xmalloc (2 + nbytes);
*p++ = nbits >> 8; *p++ = nbits >> 8;
*p++ = nbits; *p++ = nbits;
for (; nbytes && length; nbytes--, --*length) for (; nbytes && length; nbytes--, --*length)
@ -1522,7 +1522,7 @@ read_protected_v3_mpi (IOBUF inp, unsigned long *length)
if (nbytes) if (nbytes)
{ {
log_error ("packet shorter tham mpi\n"); log_error ("packet shorter tham mpi\n");
m_free (buf); xfree (buf);
return NULL; return NULL;
} }
@ -1825,7 +1825,7 @@ parse_key( IOBUF inp, int pkttype, unsigned long pktlen,
if( sk->protect.s2k.mode == 1001 if( sk->protect.s2k.mode == 1001
|| sk->protect.s2k.mode == 1002 ) { || sk->protect.s2k.mode == 1002 ) {
/* better set some dummy stuff here */ /* better set some dummy stuff here */
sk->skey[npkey] = mpi_set_opaque(NULL, m_strdup("dummydata"), 10); sk->skey[npkey] = mpi_set_opaque(NULL, xstrdup("dummydata"), 10);
pktlen = 0; pktlen = 0;
} }
else if( is_v4 && sk->is_protected ) { else if( is_v4 && sk->is_protected ) {
@ -1911,7 +1911,7 @@ parse_attribute_subpkts(PKT_user_id *uid)
int buflen=uid->attrib_len; int buflen=uid->attrib_len;
byte type; byte type;
m_free(uid->attribs); xfree(uid->attribs);
while(buflen) while(buflen)
{ {
@ -1934,7 +1934,7 @@ parse_attribute_subpkts(PKT_user_id *uid)
if( buflen < n ) if( buflen < n )
goto too_short; goto too_short;
attribs=m_realloc(attribs,(count+1)*sizeof(struct user_attribute)); attribs=xrealloc(attribs,(count+1)*sizeof(struct user_attribute));
memset(&attribs[count],0,sizeof(struct user_attribute)); memset(&attribs[count],0,sizeof(struct user_attribute));
type=*buffer; type=*buffer;
@ -1983,7 +1983,7 @@ parse_user_id( IOBUF inp, int pkttype, unsigned long pktlen, PACKET *packet )
{ {
byte *p; byte *p;
packet->pkt.user_id = m_alloc(sizeof *packet->pkt.user_id + pktlen); packet->pkt.user_id = xmalloc(sizeof *packet->pkt.user_id + pktlen);
packet->pkt.user_id->len = pktlen; packet->pkt.user_id->len = pktlen;
setup_user_id(packet); setup_user_id(packet);
@ -2047,12 +2047,12 @@ parse_attribute( IOBUF inp, int pkttype, unsigned long pktlen, PACKET *packet )
byte *p; byte *p;
#define EXTRA_UID_NAME_SPACE 71 #define EXTRA_UID_NAME_SPACE 71
packet->pkt.user_id = m_alloc(sizeof *packet->pkt.user_id packet->pkt.user_id = xmalloc(sizeof *packet->pkt.user_id
+ EXTRA_UID_NAME_SPACE); + EXTRA_UID_NAME_SPACE);
setup_user_id(packet); setup_user_id(packet);
packet->pkt.user_id->attrib_data = m_alloc(pktlen); packet->pkt.user_id->attrib_data = xmalloc(pktlen);
packet->pkt.user_id->attrib_len = pktlen; packet->pkt.user_id->attrib_len = pktlen;
p = packet->pkt.user_id->attrib_data; p = packet->pkt.user_id->attrib_data;
for( ; pktlen; pktlen--, p++ ) for( ; pktlen; pktlen--, p++ )
@ -2077,7 +2077,7 @@ parse_comment( IOBUF inp, int pkttype, unsigned long pktlen, PACKET *packet )
{ {
byte *p; byte *p;
packet->pkt.comment = m_alloc(sizeof *packet->pkt.comment + pktlen - 1); packet->pkt.comment = xmalloc(sizeof *packet->pkt.comment + pktlen - 1);
packet->pkt.comment->len = pktlen; packet->pkt.comment->len = pktlen;
p = packet->pkt.comment->data; p = packet->pkt.comment->data;
for( ; pktlen; pktlen--, p++ ) for( ; pktlen; pktlen--, p++ )
@ -2108,7 +2108,7 @@ parse_trust( IOBUF inp, int pkttype, unsigned long pktlen, PACKET *pkt )
{ {
c = iobuf_get_noeof(inp); c = iobuf_get_noeof(inp);
pktlen--; pktlen--;
pkt->pkt.ring_trust = m_alloc( sizeof *pkt->pkt.ring_trust ); pkt->pkt.ring_trust = xmalloc( sizeof *pkt->pkt.ring_trust );
pkt->pkt.ring_trust->trustval = c; pkt->pkt.ring_trust->trustval = c;
pkt->pkt.ring_trust->sigcache = 0; pkt->pkt.ring_trust->sigcache = 0;
if (!c && pktlen==1) if (!c && pktlen==1)
@ -2150,7 +2150,7 @@ parse_plaintext( IOBUF inp, int pkttype, unsigned long pktlen,
} }
mode = iobuf_get_noeof(inp); if( pktlen ) pktlen--; mode = iobuf_get_noeof(inp); if( pktlen ) pktlen--;
namelen = iobuf_get_noeof(inp); if( pktlen ) pktlen--; namelen = iobuf_get_noeof(inp); if( pktlen ) pktlen--;
pt = pkt->pkt.plaintext = m_alloc(sizeof *pkt->pkt.plaintext + namelen -1); pt = pkt->pkt.plaintext = xmalloc(sizeof *pkt->pkt.plaintext + namelen -1);
pt->new_ctb = new_ctb; pt->new_ctb = new_ctb;
pt->mode = mode; pt->mode = mode;
pt->namelen = namelen; pt->namelen = namelen;
@ -2204,7 +2204,7 @@ parse_compressed( IOBUF inp, int pkttype, unsigned long pktlen,
* (this should be the last object in a file or * (this should be the last object in a file or
* the compress algorithm should know the length) * the compress algorithm should know the length)
*/ */
zd = pkt->pkt.compressed = m_alloc(sizeof *pkt->pkt.compressed ); zd = pkt->pkt.compressed = xmalloc(sizeof *pkt->pkt.compressed );
zd->algorithm = iobuf_get_noeof(inp); zd->algorithm = iobuf_get_noeof(inp);
zd->len = 0; /* not used */ zd->len = 0; /* not used */
zd->new_ctb = new_ctb; zd->new_ctb = new_ctb;
@ -2223,7 +2223,7 @@ parse_encrypted( IOBUF inp, int pkttype, unsigned long pktlen,
PKT_encrypted *ed; PKT_encrypted *ed;
unsigned long orig_pktlen = pktlen; unsigned long orig_pktlen = pktlen;
ed = pkt->pkt.encrypted = m_alloc(sizeof *pkt->pkt.encrypted ); ed = pkt->pkt.encrypted = xmalloc(sizeof *pkt->pkt.encrypted );
ed->len = pktlen; ed->len = pktlen;
/* we don't know the extralen which is (cipher_blocksize+2) /* we don't know the extralen which is (cipher_blocksize+2)
because the algorithm ist not specified in this packet. because the algorithm ist not specified in this packet.
@ -2282,7 +2282,7 @@ parse_mdc( IOBUF inp, int pkttype, unsigned long pktlen,
PKT_mdc *mdc; PKT_mdc *mdc;
byte *p; byte *p;
mdc = pkt->pkt.mdc= m_alloc(sizeof *pkt->pkt.mdc ); mdc = pkt->pkt.mdc= xmalloc(sizeof *pkt->pkt.mdc );
if( list_mode ) if( list_mode )
fprintf (listfp, ":mdc packet: length=%lu\n", pktlen); fprintf (listfp, ":mdc packet: length=%lu\n", pktlen);
if( !new_ctb || pktlen != 20 ) { if( !new_ctb || pktlen != 20 ) {
@ -2332,7 +2332,7 @@ parse_gpg_control( IOBUF inp, int pkttype,
if ( list_mode ) if ( list_mode )
puts ("- gpg control packet"); puts ("- gpg control packet");
packet->pkt.gpg_control = m_alloc(sizeof *packet->pkt.gpg_control packet->pkt.gpg_control = xmalloc(sizeof *packet->pkt.gpg_control
+ pktlen - 1); + pktlen - 1);
packet->pkt.gpg_control->control = iobuf_get_noeof(inp); pktlen--; packet->pkt.gpg_control->control = iobuf_get_noeof(inp); pktlen--;
packet->pkt.gpg_control->datalen = pktlen; packet->pkt.gpg_control->datalen = pktlen;
@ -2369,10 +2369,10 @@ create_gpg_control( ctrlpkttype_t type, const byte *data, size_t datalen )
PACKET *packet; PACKET *packet;
byte *p; byte *p;
packet = m_alloc( sizeof *packet ); packet = xmalloc( sizeof *packet );
init_packet(packet); init_packet(packet);
packet->pkttype = PKT_GPG_CONTROL; packet->pkttype = PKT_GPG_CONTROL;
packet->pkt.gpg_control = m_alloc(sizeof *packet->pkt.gpg_control packet->pkt.gpg_control = xmalloc(sizeof *packet->pkt.gpg_control
+ datalen - 1); + datalen - 1);
packet->pkt.gpg_control->control = type; packet->pkt.gpg_control->control = type;
packet->pkt.gpg_control->datalen = datalen; packet->pkt.gpg_control->datalen = datalen;

68
g10/passphrase.c
View File

@ -94,10 +94,10 @@ have_static_passphrase()
void void
set_next_passphrase( const char *s ) set_next_passphrase( const char *s )
{ {
m_free(next_pw); xfree(next_pw);
next_pw = NULL; next_pw = NULL;
if( s ) { if( s ) {
next_pw = m_alloc_secure( strlen(s)+1 ); next_pw = xmalloc_secure( strlen(s)+1 );
strcpy(next_pw, s ); strcpy(next_pw, s );
} }
} }
@ -142,11 +142,11 @@ read_passphrase_from_fd( int fd )
{ {
char *pw2 = pw; char *pw2 = pw;
len += 100; len += 100;
pw = m_alloc_secure( len ); pw = xmalloc_secure( len );
if( pw2 ) if( pw2 )
{ {
memcpy(pw, pw2, i ); memcpy(pw, pw2, i );
m_free (pw2); xfree (pw2);
} }
else else
i=0; i=0;
@ -158,7 +158,7 @@ read_passphrase_from_fd( int fd )
if (!opt.batch) if (!opt.batch)
tty_printf("\b\b\b \n" ); tty_printf("\b\b\b \n" );
m_free( fd_passwd ); xfree( fd_passwd );
fd_passwd = pw; fd_passwd = pw;
} }
@ -229,7 +229,7 @@ agent_send_all_options (assuan_context_t ctx)
#if defined(HAVE_SETLOCALE) && defined(LC_CTYPE) #if defined(HAVE_SETLOCALE) && defined(LC_CTYPE)
old_lc = setlocale (LC_CTYPE, NULL); old_lc = setlocale (LC_CTYPE, NULL);
if (old_lc) if (old_lc)
old_lc = m_strdup (old_lc); old_lc = xstrdup (old_lc);
dft_lc = setlocale (LC_CTYPE, ""); dft_lc = setlocale (LC_CTYPE, "");
#endif #endif
if (opt.lc_ctype || (dft_ttyname && dft_lc)) if (opt.lc_ctype || (dft_ttyname && dft_lc))
@ -241,7 +241,7 @@ agent_send_all_options (assuan_context_t ctx)
if (old_lc) if (old_lc)
{ {
setlocale (LC_CTYPE, old_lc); setlocale (LC_CTYPE, old_lc);
m_free (old_lc); xfree (old_lc);
} }
#endif #endif
if (rc) if (rc)
@ -250,7 +250,7 @@ agent_send_all_options (assuan_context_t ctx)
#if defined(HAVE_SETLOCALE) && defined(LC_MESSAGES) #if defined(HAVE_SETLOCALE) && defined(LC_MESSAGES)
old_lc = setlocale (LC_MESSAGES, NULL); old_lc = setlocale (LC_MESSAGES, NULL);
if (old_lc) if (old_lc)
old_lc = m_strdup (old_lc); old_lc = xstrdup (old_lc);
dft_lc = setlocale (LC_MESSAGES, ""); dft_lc = setlocale (LC_MESSAGES, "");
#endif #endif
if (opt.lc_messages || (dft_ttyname && dft_lc)) if (opt.lc_messages || (dft_ttyname && dft_lc))
@ -262,7 +262,7 @@ agent_send_all_options (assuan_context_t ctx)
if (old_lc) if (old_lc)
{ {
setlocale (LC_MESSAGES, old_lc); setlocale (LC_MESSAGES, old_lc);
m_free (old_lc); xfree (old_lc);
} }
#endif #endif
return rc; return rc;
@ -472,7 +472,7 @@ agent_get_passphrase ( u32 *keyid, int mode, const char *cacheid,
char *atext = NULL; char *atext = NULL;
assuan_context_t ctx = NULL; assuan_context_t ctx = NULL;
char *pw = NULL; char *pw = NULL;
PKT_public_key *pk = m_alloc_clear( sizeof *pk ); PKT_public_key *pk = xmalloc_clear( sizeof *pk );
byte fpr[MAX_FINGERPRINT_LEN]; byte fpr[MAX_FINGERPRINT_LEN];
int have_fpr = 0; int have_fpr = 0;
char *orig_codeset = NULL; char *orig_codeset = NULL;
@ -501,7 +501,7 @@ agent_get_passphrase ( u32 *keyid, int mode, const char *cacheid,
#endif #endif
if (orig_codeset) if (orig_codeset)
{ /* We only switch when we are able to restore the codeset later. */ { /* We only switch when we are able to restore the codeset later. */
orig_codeset = m_strdup (orig_codeset); orig_codeset = xstrdup (orig_codeset);
if (!bind_textdomain_codeset (PACKAGE, "utf-8")) if (!bind_textdomain_codeset (PACKAGE, "utf-8"))
orig_codeset = NULL; orig_codeset = NULL;
} }
@ -525,7 +525,7 @@ agent_get_passphrase ( u32 *keyid, int mode, const char *cacheid,
#define KEYIDSTRING _(" (main key ID %s)") #define KEYIDSTRING _(" (main key ID %s)")
maink = m_alloc ( strlen (KEYIDSTRING) + keystrlen() + 20 ); maink = xmalloc ( strlen (KEYIDSTRING) + keystrlen() + 20 );
if( keyid[2] && keyid[3] && keyid[0] != keyid[2] if( keyid[2] && keyid[3] && keyid[0] != keyid[2]
&& keyid[1] != keyid[3] ) && keyid[1] != keyid[3] )
sprintf( maink, KEYIDSTRING, keystr(&keyid[2]) ); sprintf( maink, KEYIDSTRING, keystr(&keyid[2]) );
@ -542,15 +542,15 @@ agent_get_passphrase ( u32 *keyid, int mode, const char *cacheid,
"\"%.*s\"\n" \ "\"%.*s\"\n" \
"%u-bit %s key, ID %s, created %s%s\n" ) "%u-bit %s key, ID %s, created %s%s\n" )
atext = m_alloc ( 100 + strlen (PROMPTSTRING) atext = xmalloc ( 100 + strlen (PROMPTSTRING)
+ uidlen + 15 + strlen(algo_name) + keystrlen() + uidlen + 15 + strlen(algo_name) + keystrlen()
+ strlen (timestr) + strlen (maink) ); + strlen (timestr) + strlen (maink) );
sprintf (atext, PROMPTSTRING, sprintf (atext, PROMPTSTRING,
(int)uidlen, uid, (int)uidlen, uid,
nbits_from_pk (pk), algo_name, keystr(&keyid[0]), timestr, nbits_from_pk (pk), algo_name, keystr(&keyid[0]), timestr,
maink ); maink );
m_free (uid); xfree (uid);
m_free (maink); xfree (maink);
#undef PROMPTSTRING #undef PROMPTSTRING
@ -562,9 +562,9 @@ agent_get_passphrase ( u32 *keyid, int mode, const char *cacheid,
} }
else if (mode == 2 ) else if (mode == 2 )
atext = m_strdup ( _("Repeat passphrase\n") ); atext = xstrdup ( _("Repeat passphrase\n") );
else else
atext = m_strdup ( _("Enter passphrase\n") ); atext = xstrdup ( _("Enter passphrase\n") );
{ {
char *line, *p; char *line, *p;
@ -791,7 +791,7 @@ ask_passphrase (const char *description,
} }
else if (fd_passwd) else if (fd_passwd)
{ {
pw = m_alloc_secure (strlen(fd_passwd)+1); pw = xmalloc_secure (strlen(fd_passwd)+1);
strcpy (pw, fd_passwd); strcpy (pw, fd_passwd);
} }
else if (opt.batch) else if (opt.batch)
@ -861,7 +861,7 @@ passphrase_to_dek( u32 *keyid, int pubkey_algo,
us = get_long_user_id_string( keyid ); us = get_long_user_id_string( keyid );
write_status_text( STATUS_USERID_HINT, us ); write_status_text( STATUS_USERID_HINT, us );
m_free(us); xfree(us);
sprintf( buf, "%08lX%08lX %08lX%08lX %d 0", sprintf( buf, "%08lX%08lX %08lX%08lX %d 0",
(ulong)keyid[0], (ulong)keyid[1], (ulong)keyid[0], (ulong)keyid[1],
@ -881,14 +881,14 @@ passphrase_to_dek( u32 *keyid, int pubkey_algo,
ignore the passphrase cache (mode!=1), print a prompt with ignore the passphrase cache (mode!=1), print a prompt with
information on that key. */ information on that key. */
if( keyid && !opt.batch && !next_pw && mode!=1 ) { if( keyid && !opt.batch && !next_pw && mode!=1 ) {
PKT_public_key *pk = m_alloc_clear( sizeof *pk ); PKT_public_key *pk = xmalloc_clear( sizeof *pk );
char *p; char *p;
p=get_user_id_native(keyid); p=get_user_id_native(keyid);
tty_printf("\n"); tty_printf("\n");
tty_printf(_("You need a passphrase to unlock the secret key for\n" tty_printf(_("You need a passphrase to unlock the secret key for\n"
"user: \"%s\"\n"),p); "user: \"%s\"\n"),p);
m_free(p); xfree(p);
if( !get_pubkey( pk, keyid ) ) { if( !get_pubkey( pk, keyid ) ) {
const char *s = pubkey_algo_to_string( pk->pubkey_algo ); const char *s = pubkey_algo_to_string( pk->pubkey_algo );
@ -929,7 +929,7 @@ passphrase_to_dek( u32 *keyid, int pubkey_algo,
{ {
if (!opt.use_agent) if (!opt.use_agent)
goto agent_died; goto agent_died;
pw = m_strdup (""); pw = xstrdup ("");
} }
if( *pw && mode == 2 ) { if( *pw && mode == 2 ) {
char *pw2 = agent_get_passphrase ( keyid, 2, NULL, NULL, NULL, char *pw2 = agent_get_passphrase ( keyid, 2, NULL, NULL, NULL,
@ -938,29 +938,29 @@ passphrase_to_dek( u32 *keyid, int pubkey_algo,
{ {
if (!opt.use_agent) if (!opt.use_agent)
{ {
m_free (pw); xfree (pw);
pw = NULL; pw = NULL;
goto agent_died; goto agent_died;
} }
pw2 = m_strdup (""); pw2 = xstrdup ("");
} }
if( strcmp(pw, pw2) ) { if( strcmp(pw, pw2) ) {
m_free(pw2); xfree(pw2);
m_free(pw); xfree(pw);
return NULL; return NULL;
} }
m_free(pw2); xfree(pw2);
} }
} }
else if( fd_passwd ) { else if( fd_passwd ) {
/* Return the passphrase we have store in FD_PASSWD. */ /* Return the passphrase we have store in FD_PASSWD. */
pw = m_alloc_secure( strlen(fd_passwd)+1 ); pw = xmalloc_secure( strlen(fd_passwd)+1 );
strcpy( pw, fd_passwd ); strcpy( pw, fd_passwd );
} }
else if( opt.batch ) else if( opt.batch )
{ {
log_error(_("can't query passphrase in batch mode\n")); log_error(_("can't query passphrase in batch mode\n"));
pw = m_strdup( "" ); /* return an empty passphrase */ pw = xstrdup( "" ); /* return an empty passphrase */
} }
else { else {
/* Read the passphrase from the tty or the command-fd. */ /* Read the passphrase from the tty or the command-fd. */
@ -971,11 +971,11 @@ passphrase_to_dek( u32 *keyid, int pubkey_algo,
_("Repeat passphrase: ") ); _("Repeat passphrase: ") );
tty_kill_prompt(); tty_kill_prompt();
if( strcmp(pw, pw2) ) { if( strcmp(pw, pw2) ) {
m_free(pw2); xfree(pw2);
m_free(pw); xfree(pw);
return NULL; return NULL;
} }
m_free(pw2); xfree(pw2);
} }
} }
@ -985,13 +985,13 @@ passphrase_to_dek( u32 *keyid, int pubkey_algo,
/* Hash the passphrase and store it in a newly allocated DEK /* Hash the passphrase and store it in a newly allocated DEK
object. Keep a copy of the passphrase in LAST_PW for use by object. Keep a copy of the passphrase in LAST_PW for use by
get_last_passphrase(). */ get_last_passphrase(). */
dek = m_alloc_secure_clear ( sizeof *dek ); dek = xmalloc_secure_clear ( sizeof *dek );
dek->algo = cipher_algo; dek->algo = cipher_algo;
if( !*pw && mode == 2 ) if( !*pw && mode == 2 )
dek->keylen = 0; dek->keylen = 0;
else else
hash_passphrase( dek, pw, s2k, mode==2 ); hash_passphrase( dek, pw, s2k, mode==2 );
m_free(last_pw); xfree(last_pw);
last_pw = pw; last_pw = pw;
return dek; return dek;
} }

22
g10/photoid.c
View File

@ -62,7 +62,7 @@ PKT_user_id *generate_photo_id(PKT_public_key *pk)
header[i]=0; header[i]=0;
#define EXTRA_UID_NAME_SPACE 71 #define EXTRA_UID_NAME_SPACE 71
uid=m_alloc_clear(sizeof(*uid)+71); uid=xmalloc_clear(sizeof(*uid)+71);
tty_printf(_("\nPick an image to use for your photo ID. " tty_printf(_("\nPick an image to use for your photo ID. "
"The image must be a JPEG file.\n" "The image must be a JPEG file.\n"
@ -75,7 +75,7 @@ PKT_user_id *generate_photo_id(PKT_public_key *pk)
{ {
tty_printf("\n"); tty_printf("\n");
m_free(filename); xfree(filename);
filename=cpr_get("photoid.jpeg.add", filename=cpr_get("photoid.jpeg.add",
_("Enter JPEG filename for photo ID: ")); _("Enter JPEG filename for photo ID: "));
@ -109,7 +109,7 @@ PKT_user_id *generate_photo_id(PKT_public_key *pk)
} }
} }
photo=m_alloc(len); photo=xmalloc(len);
iobuf_read(file,photo,len); iobuf_read(file,photo,len);
iobuf_close(file); iobuf_close(file);
@ -118,7 +118,7 @@ PKT_user_id *generate_photo_id(PKT_public_key *pk)
photo[6]!='J' || photo[7]!='F' || photo[8]!='I' || photo[9]!='F') photo[6]!='J' || photo[7]!='F' || photo[8]!='I' || photo[9]!='F')
{ {
log_error(_("`%s' is not a JPEG file\n"),filename); log_error(_("`%s' is not a JPEG file\n"),filename);
m_free(photo); xfree(photo);
photo=NULL; photo=NULL;
continue; continue;
} }
@ -140,7 +140,7 @@ PKT_user_id *generate_photo_id(PKT_public_key *pk)
goto scram; goto scram;
case 0: case 0:
free_attributes(uid); free_attributes(uid);
m_free(photo); xfree(photo);
photo=NULL; photo=NULL;
continue; continue;
} }
@ -151,13 +151,13 @@ PKT_user_id *generate_photo_id(PKT_public_key *pk)
uid->ref=1; uid->ref=1;
scram: scram:
m_free(filename); xfree(filename);
m_free(photo); xfree(photo);
if(error) if(error)
{ {
free_attributes(uid); free_attributes(uid);
m_free(uid); xfree(uid);
return NULL; return NULL;
} }
@ -291,7 +291,7 @@ void show_photos(const struct user_attribute *attrs,
if(!command) if(!command)
goto fail; goto fail;
name=m_alloc(16+strlen(EXTSEP_S)+ name=xmalloc(16+strlen(EXTSEP_S)+
strlen(image_type_to_string(args.imagetype,0))+1); strlen(image_type_to_string(args.imagetype,0))+1);
/* Make the filename. Notice we are not using the image /* Make the filename. Notice we are not using the image
@ -310,7 +310,7 @@ void show_photos(const struct user_attribute *attrs,
if(exec_write(&spawn,NULL,command,name,1,1)!=0) if(exec_write(&spawn,NULL,command,name,1,1)!=0)
{ {
m_free(name); xfree(name);
goto fail; goto fail;
} }
@ -319,7 +319,7 @@ void show_photos(const struct user_attribute *attrs,
image_type_to_string(args.imagetype,2)); image_type_to_string(args.imagetype,2));
#endif #endif
m_free(name); xfree(name);
fwrite(&attrs[i].data[offset],attrs[i].len-offset,1,spawn->tochild); fwrite(&attrs[i].data[offset],attrs[i].len-offset,1,spawn->tochild);

44
g10/pkclist.c
View File

@ -217,7 +217,7 @@ do_edit_ownertrust (PKT_public_key *pk, int mode,
keystr(keyid), datestr_from_pk( pk ) ); keystr(keyid), datestr_from_pk( pk ) );
p=get_user_id_native(keyid); p=get_user_id_native(keyid);
tty_printf(_(" \"%s\"\n"),p); tty_printf(_(" \"%s\"\n"),p);
m_free(p); xfree(p);
keyblock = get_pubkeyblock (keyid); keyblock = get_pubkeyblock (keyid);
if (!keyblock) if (!keyblock)
@ -349,9 +349,9 @@ do_edit_ownertrust (PKT_public_key *pk, int mode,
quit = 1; quit = 1;
break ; /* back to the menu */ break ; /* back to the menu */
} }
m_free(p); p = NULL; xfree(p); p = NULL;
} }
m_free(p); xfree(p);
return show? -2: quit? -1 : changed; return show? -2: quit? -1 : changed;
} }
@ -484,7 +484,7 @@ do_we_trust_pre( PKT_public_key *pk, unsigned int trustlevel )
int int
check_signatures_trust( PKT_signature *sig ) check_signatures_trust( PKT_signature *sig )
{ {
PKT_public_key *pk = m_alloc_clear( sizeof *pk ); PKT_public_key *pk = xmalloc_clear( sizeof *pk );
unsigned int trustlevel; unsigned int trustlevel;
int rc=0; int rc=0;
@ -599,7 +599,7 @@ release_pk_list( PK_LIST pk_list )
for( ; pk_list; pk_list = pk_rover ) { for( ; pk_list; pk_list = pk_rover ) {
pk_rover = pk_list->next; pk_rover = pk_list->next;
free_public_key( pk_list->pk ); free_public_key( pk_list->pk );
m_free( pk_list ); xfree( pk_list );
} }
} }
@ -628,10 +628,10 @@ default_recipient(void)
int i; int i;
if( opt.def_recipient ) if( opt.def_recipient )
return m_strdup( opt.def_recipient ); return xstrdup( opt.def_recipient );
if( !opt.def_recipient_self ) if( !opt.def_recipient_self )
return NULL; return NULL;
sk = m_alloc_clear( sizeof *sk ); sk = xmalloc_clear( sizeof *sk );
i = get_seckey_byname( sk, NULL, 0 ); i = get_seckey_byname( sk, NULL, 0 );
if( i ) { if( i ) {
free_secret_key( sk ); free_secret_key( sk );
@ -640,7 +640,7 @@ default_recipient(void)
n = MAX_FINGERPRINT_LEN; n = MAX_FINGERPRINT_LEN;
fingerprint_from_sk( sk, fpr, &n ); fingerprint_from_sk( sk, fpr, &n );
free_secret_key( sk ); free_secret_key( sk );
p = m_alloc( 2*n+3 ); p = xmalloc( 2*n+3 );
*p++ = '0'; *p++ = '0';
*p++ = 'x'; *p++ = 'x';
for(i=0; i < n; i++ ) for(i=0; i < n; i++ )
@ -727,7 +727,7 @@ build_pk_list( STRLIST rcpts, PK_LIST *ret_pk_list, unsigned use )
} }
} }
else if( (use & PUBKEY_USAGE_ENC) && !opt.no_encrypt_to ) { else if( (use & PUBKEY_USAGE_ENC) && !opt.no_encrypt_to ) {
pk = m_alloc_clear( sizeof *pk ); pk = xmalloc_clear( sizeof *pk );
pk->req_usage = use; pk->req_usage = use;
/* We can encrypt-to a disabled key */ /* We can encrypt-to a disabled key */
if( (rc = get_pubkey_byname( pk, rov->d, NULL, NULL, 1 )) ) { if( (rc = get_pubkey_byname( pk, rov->d, NULL, NULL, 1 )) ) {
@ -747,7 +747,7 @@ build_pk_list( STRLIST rcpts, PK_LIST *ret_pk_list, unsigned use )
} }
else { else {
PK_LIST r; PK_LIST r;
r = m_alloc( sizeof *r ); r = xmalloc( sizeof *r );
r->pk = pk; pk = NULL; r->pk = pk; pk = NULL;
r->next = pk_list; r->next = pk_list;
r->flags = (rov->flags&2)?1:0; r->flags = (rov->flags&2)?1:0;
@ -787,7 +787,7 @@ build_pk_list( STRLIST rcpts, PK_LIST *ret_pk_list, unsigned use )
"You did not specify a user ID. (you may use \"-r\")\n")); "You did not specify a user ID. (you may use \"-r\")\n"));
for(;;) { for(;;) {
rc = 0; rc = 0;
m_free(answer); xfree(answer);
if( have_def_rec ) { if( have_def_rec ) {
answer = def_rec; answer = def_rec;
def_rec = NULL; def_rec = NULL;
@ -820,7 +820,7 @@ build_pk_list( STRLIST rcpts, PK_LIST *ret_pk_list, unsigned use )
size_t n; size_t n;
char *p = get_user_id( keyid, &n ); char *p = get_user_id( keyid, &n );
tty_print_utf8_string( p, n ); tty_print_utf8_string( p, n );
m_free(p); xfree(p);
} }
tty_printf("\"\n"); tty_printf("\"\n");
} }
@ -831,14 +831,14 @@ build_pk_list( STRLIST rcpts, PK_LIST *ret_pk_list, unsigned use )
cpr_kill_prompt(); cpr_kill_prompt();
} }
if( !answer || !*answer ) { if( !answer || !*answer ) {
m_free(answer); xfree(answer);
break; break;
} }
if(expand_id(answer,&backlog,0)) if(expand_id(answer,&backlog,0))
continue; continue;
if( pk ) if( pk )
free_public_key( pk ); free_public_key( pk );
pk = m_alloc_clear( sizeof *pk ); pk = xmalloc_clear( sizeof *pk );
pk->req_usage = use; pk->req_usage = use;
rc = get_pubkey_byname( pk, answer, NULL, NULL, 0 ); rc = get_pubkey_byname( pk, answer, NULL, NULL, 0 );
if( rc ) if( rc )
@ -851,7 +851,7 @@ build_pk_list( STRLIST rcpts, PK_LIST *ret_pk_list, unsigned use )
"already set as default recipient\n") ); "already set as default recipient\n") );
} }
else { else {
PK_LIST r = m_alloc( sizeof *r ); PK_LIST r = xmalloc( sizeof *r );
r->pk = pk; pk = NULL; r->pk = pk; pk = NULL;
r->next = pk_list; r->next = pk_list;
r->flags = 0; /* no throwing default ids */ r->flags = 0; /* no throwing default ids */
@ -876,7 +876,7 @@ build_pk_list( STRLIST rcpts, PK_LIST *ret_pk_list, unsigned use )
} }
else { else {
PK_LIST r; PK_LIST r;
r = m_alloc( sizeof *r ); r = xmalloc( sizeof *r );
r->pk = pk; pk = NULL; r->pk = pk; pk = NULL;
r->next = pk_list; r->next = pk_list;
r->flags = 0; /* no throwing interactive ids */ r->flags = 0; /* no throwing interactive ids */
@ -887,7 +887,7 @@ build_pk_list( STRLIST rcpts, PK_LIST *ret_pk_list, unsigned use )
} }
} }
} }
m_free(def_rec); def_rec = NULL; xfree(def_rec); def_rec = NULL;
have_def_rec = 0; have_def_rec = 0;
} }
if( pk ) { if( pk ) {
@ -896,7 +896,7 @@ build_pk_list( STRLIST rcpts, PK_LIST *ret_pk_list, unsigned use )
} }
} }
else if( !any_recipients && (def_rec = default_recipient()) ) { else if( !any_recipients && (def_rec = default_recipient()) ) {
pk = m_alloc_clear( sizeof *pk ); pk = xmalloc_clear( sizeof *pk );
pk->req_usage = use; pk->req_usage = use;
/* The default recipient may be disabled */ /* The default recipient may be disabled */
rc = get_pubkey_byname( pk, def_rec, NULL, NULL, 1 ); rc = get_pubkey_byname( pk, def_rec, NULL, NULL, 1 );
@ -911,7 +911,7 @@ build_pk_list( STRLIST rcpts, PK_LIST *ret_pk_list, unsigned use )
if (key_present_in_pk_list(pk_list, pk) == 0) if (key_present_in_pk_list(pk_list, pk) == 0)
log_info(_("skipped: public key already set as default recipient\n")); log_info(_("skipped: public key already set as default recipient\n"));
else { else {
PK_LIST r = m_alloc( sizeof *r ); PK_LIST r = xmalloc( sizeof *r );
r->pk = pk; pk = NULL; r->pk = pk; pk = NULL;
r->next = pk_list; r->next = pk_list;
r->flags = 0; /* no throwing default ids */ r->flags = 0; /* no throwing default ids */
@ -922,7 +922,7 @@ build_pk_list( STRLIST rcpts, PK_LIST *ret_pk_list, unsigned use )
free_public_key( pk ); free_public_key( pk );
pk = NULL; pk = NULL;
} }
m_free(def_rec); def_rec = NULL; xfree(def_rec); def_rec = NULL;
} }
else { else {
any_recipients = 0; any_recipients = 0;
@ -930,7 +930,7 @@ build_pk_list( STRLIST rcpts, PK_LIST *ret_pk_list, unsigned use )
if( (remusr->flags & 1) ) if( (remusr->flags & 1) )
continue; /* encrypt-to keys are already handled */ continue; /* encrypt-to keys are already handled */
pk = m_alloc_clear( sizeof *pk ); pk = xmalloc_clear( sizeof *pk );
pk->req_usage = use; pk->req_usage = use;
if( (rc = get_pubkey_byname( pk, remusr->d, NULL, NULL, 0 )) ) { if( (rc = get_pubkey_byname( pk, remusr->d, NULL, NULL, 0 )) ) {
free_public_key( pk ); pk = NULL; free_public_key( pk ); pk = NULL;
@ -971,7 +971,7 @@ build_pk_list( STRLIST rcpts, PK_LIST *ret_pk_list, unsigned use )
} }
else { else {
PK_LIST r; PK_LIST r;
r = m_alloc( sizeof *r ); r = xmalloc( sizeof *r );
r->pk = pk; pk = NULL; r->pk = pk; pk = NULL;
r->next = pk_list; r->next = pk_list;
r->flags = (remusr->flags&2)?1:0; r->flags = (remusr->flags&2)?1:0;

30
g10/plaintext.c
View File

@ -84,7 +84,7 @@ handle_plaintext( PKT_plaintext *pt, md_filter_context_t *mfx,
if( nooutput ) if( nooutput )
; ;
else if( opt.outfile ) { else if( opt.outfile ) {
fname = m_alloc( strlen( opt.outfile ) + 1); fname = xmalloc( strlen( opt.outfile ) + 1);
strcpy(fname, opt.outfile ); strcpy(fname, opt.outfile );
} }
else if( pt->namelen == 8 && !memcmp( pt->name, "_CONSOLE", 8 ) ) { else if( pt->namelen == 8 && !memcmp( pt->name, "_CONSOLE", 8 ) ) {
@ -118,11 +118,11 @@ handle_plaintext( PKT_plaintext *pt, md_filter_context_t *mfx,
while( !overwrite_filep (fname) ) { while( !overwrite_filep (fname) ) {
char *tmp = ask_outfile_name (NULL, 0); char *tmp = ask_outfile_name (NULL, 0);
if ( !tmp || !*tmp ) { if ( !tmp || !*tmp ) {
m_free (tmp); xfree (tmp);
rc = G10ERR_CREATE_FILE; rc = G10ERR_CREATE_FILE;
goto leave; goto leave;
} }
m_free (fname); xfree (fname);
fname = tmp; fname = tmp;
} }
} }
@ -213,7 +213,7 @@ handle_plaintext( PKT_plaintext *pt, md_filter_context_t *mfx,
} }
} }
else { /* binary mode */ else { /* binary mode */
byte *buffer = m_alloc( 32768 ); byte *buffer = xmalloc( 32768 );
while( pt->len ) { while( pt->len ) {
int len = pt->len > 32768 ? 32768 : pt->len; int len = pt->len > 32768 ? 32768 : pt->len;
len = iobuf_read( pt->buf, buffer, len ); len = iobuf_read( pt->buf, buffer, len );
@ -221,7 +221,7 @@ handle_plaintext( PKT_plaintext *pt, md_filter_context_t *mfx,
log_error("Problem reading source (%u bytes remaining)\n", log_error("Problem reading source (%u bytes remaining)\n",
(unsigned)pt->len); (unsigned)pt->len);
rc = G10ERR_READ_FILE; rc = G10ERR_READ_FILE;
m_free( buffer ); xfree( buffer );
goto leave; goto leave;
} }
if( mfx->md ) if( mfx->md )
@ -233,7 +233,7 @@ handle_plaintext( PKT_plaintext *pt, md_filter_context_t *mfx,
log_error("Error writing to `%s': %s\n", log_error("Error writing to `%s': %s\n",
fname,"exceeded --max-output limit\n"); fname,"exceeded --max-output limit\n");
rc = G10ERR_WRITE_FILE; rc = G10ERR_WRITE_FILE;
m_free( buffer ); xfree( buffer );
goto leave; goto leave;
} }
else if( fwrite( buffer, 1, len, fp ) != len ) else if( fwrite( buffer, 1, len, fp ) != len )
@ -241,13 +241,13 @@ handle_plaintext( PKT_plaintext *pt, md_filter_context_t *mfx,
log_error("Error writing to `%s': %s\n", log_error("Error writing to `%s': %s\n",
fname, strerror(errno) ); fname, strerror(errno) );
rc = G10ERR_WRITE_FILE; rc = G10ERR_WRITE_FILE;
m_free( buffer ); xfree( buffer );
goto leave; goto leave;
} }
} }
pt->len -= len; pt->len -= len;
} }
m_free( buffer ); xfree( buffer );
} }
} }
else if( !clearsig ) { else if( !clearsig ) {
@ -279,7 +279,7 @@ handle_plaintext( PKT_plaintext *pt, md_filter_context_t *mfx,
} }
} }
else { /* binary mode */ else { /* binary mode */
byte *buffer = m_alloc( 32768 ); byte *buffer = xmalloc( 32768 );
int eof; int eof;
for( eof=0; !eof; ) { for( eof=0; !eof; ) {
/* Why do we check for len < 32768: /* Why do we check for len < 32768:
@ -302,19 +302,19 @@ handle_plaintext( PKT_plaintext *pt, md_filter_context_t *mfx,
log_error("Error writing to `%s': %s\n", log_error("Error writing to `%s': %s\n",
fname,"exceeded --max-output limit\n"); fname,"exceeded --max-output limit\n");
rc = G10ERR_WRITE_FILE; rc = G10ERR_WRITE_FILE;
m_free( buffer ); xfree( buffer );
goto leave; goto leave;
} }
else if( fwrite( buffer, 1, len, fp ) != len ) { else if( fwrite( buffer, 1, len, fp ) != len ) {
log_error("Error writing to `%s': %s\n", log_error("Error writing to `%s': %s\n",
fname, strerror(errno) ); fname, strerror(errno) );
rc = G10ERR_WRITE_FILE; rc = G10ERR_WRITE_FILE;
m_free( buffer ); xfree( buffer );
goto leave; goto leave;
} }
} }
} }
m_free( buffer ); xfree( buffer );
} }
pt->buf = NULL; pt->buf = NULL;
} }
@ -382,7 +382,7 @@ handle_plaintext( PKT_plaintext *pt, md_filter_context_t *mfx,
leave: leave:
if( fp && fp != stdout ) if( fp && fp != stdout )
fclose(fp); fclose(fp);
m_free(fname); xfree(fname);
return rc; return rc;
} }
@ -446,7 +446,7 @@ ask_for_detached_datafile( MD_HANDLE md, MD_HANDLE md2,
int any=0; int any=0;
tty_printf(_("Detached signature.\n")); tty_printf(_("Detached signature.\n"));
do { do {
m_free(answer); xfree(answer);
tty_enable_completion(NULL); tty_enable_completion(NULL);
answer = cpr_get("detached_signature.filename", answer = cpr_get("detached_signature.filename",
_("Please enter name of data file: ")); _("Please enter name of data file: "));
@ -486,7 +486,7 @@ ask_for_detached_datafile( MD_HANDLE md, MD_HANDLE md2,
iobuf_close(fp); iobuf_close(fp);
leave: leave:
m_free(answer); xfree(answer);
return rc; return rc;
} }

4
g10/progress.c
View File

@ -87,7 +87,7 @@ progress_filter (void *opaque, int control,
/* Note, that we must always dealloc resources of a filter /* Note, that we must always dealloc resources of a filter
within the filter handler and not anywhere else. (We set it within the filter handler and not anywhere else. (We set it
to NULL and check all uses just in case.) */ to NULL and check all uses just in case.) */
m_free (pfx->what); xfree (pfx->what);
pfx->what = NULL; pfx->what = NULL;
} }
else if (control == IOBUFCTRL_DESC) else if (control == IOBUFCTRL_DESC)
@ -112,7 +112,7 @@ handle_progress (progress_filter_context_t *pfx, IOBUF inp, const char *name)
filesize = opt.set_filesize; filesize = opt.set_filesize;
/* register the progress filter */ /* register the progress filter */
pfx->what = m_strdup (name ? name : "stdin"); pfx->what = xstrdup (name ? name : "stdin");
pfx->total = filesize; pfx->total = filesize;
iobuf_push_filter (inp, progress_filter, pfx); iobuf_push_filter (inp, progress_filter, pfx);
} }

8
g10/pubkey-enc.c
View File

@ -79,7 +79,7 @@ get_session_key( PKT_pubkey_enc *k, DEK *dek )
goto leave; goto leave;
if( (k->keyid[0] || k->keyid[1]) && !opt.try_all_secrets ) { if( (k->keyid[0] || k->keyid[1]) && !opt.try_all_secrets ) {
sk = m_alloc_clear( sizeof *sk ); sk = xmalloc_clear( sizeof *sk );
sk->pubkey_algo = k->pubkey_algo; /* we want a pubkey with this algo*/ sk->pubkey_algo = k->pubkey_algo; /* we want a pubkey with this algo*/
if( !(rc = get_seckey( sk, k->keyid )) ) if( !(rc = get_seckey( sk, k->keyid )) )
rc = get_it( k, dek, sk, k->keyid ); rc = get_it( k, dek, sk, k->keyid );
@ -92,7 +92,7 @@ get_session_key( PKT_pubkey_enc *k, DEK *dek )
for(;;) { for(;;) {
if( sk ) if( sk )
free_secret_key( sk ); free_secret_key( sk );
sk = m_alloc_clear( sizeof *sk ); sk = xmalloc_clear( sizeof *sk );
rc=enum_secret_keys( &enum_context, sk, 1, 0); rc=enum_secret_keys( &enum_context, sk, 1, 0);
if( rc ) { if( rc ) {
rc = G10ERR_NO_SECKEY; rc = G10ERR_NO_SECKEY;
@ -108,7 +108,7 @@ get_session_key( PKT_pubkey_enc *k, DEK *dek )
{ {
p=get_last_passphrase(); p=get_last_passphrase();
set_next_passphrase(p); set_next_passphrase(p);
m_free(p); xfree(p);
} }
rc = check_secret_key( sk, opt.try_all_secrets?1:-1 ); /* ask rc = check_secret_key( sk, opt.try_all_secrets?1:-1 ); /* ask
@ -302,7 +302,7 @@ get_it( PKT_pubkey_enc *enc, DEK *dek, PKT_secret_key *sk, u32 *keyid )
leave: leave:
mpi_free(plain_dek); mpi_free(plain_dek);
m_free(frame); xfree(frame);
return rc; return rc;
} }

32
g10/revoke.c
View File

@ -61,15 +61,15 @@ revocation_reason_build_cb( PKT_signature *sig, void *opaque )
ud = native_to_utf8( reason->desc ); ud = native_to_utf8( reason->desc );
buflen += strlen(ud); buflen += strlen(ud);
} }
buffer = m_alloc( buflen ); buffer = xmalloc( buflen );
*buffer = reason->code; *buffer = reason->code;
if( ud ) { if( ud ) {
memcpy(buffer+1, ud, strlen(ud) ); memcpy(buffer+1, ud, strlen(ud) );
m_free( ud ); xfree( ud );
} }
build_sig_subpkt( sig, SIGSUBPKT_REVOC_REASON, buffer, buflen ); build_sig_subpkt( sig, SIGSUBPKT_REVOC_REASON, buffer, buflen );
m_free( buffer ); xfree( buffer );
return 0; return 0;
} }
@ -256,7 +256,7 @@ gen_desig_revoke( const char *uname )
if(sk) if(sk)
free_secret_key(sk); free_secret_key(sk);
sk=m_alloc_clear(sizeof(*sk)); sk=xmalloc_clear(sizeof(*sk));
rc=get_seckey_byfprint(sk,pk->revkey[i].fpr,MAX_FINGERPRINT_LEN); rc=get_seckey_byfprint(sk,pk->revkey[i].fpr,MAX_FINGERPRINT_LEN);
@ -452,7 +452,7 @@ gen_revoke( const char *uname )
keyid_from_sk( sk, sk_keyid ); keyid_from_sk( sk, sk_keyid );
print_seckey_info (sk); print_seckey_info (sk);
pk = m_alloc_clear( sizeof *pk ); pk = xmalloc_clear( sizeof *pk );
/* FIXME: We should get the public key direct from the secret one */ /* FIXME: We should get the public key direct from the secret one */
@ -587,7 +587,7 @@ ask_revocation_reason( int key_rev, int cert_rev, int hint )
do { do {
code=-1; code=-1;
m_free(description); xfree(description);
description = NULL; description = NULL;
tty_printf(_("Please select the reason for the revocation:\n")); tty_printf(_("Please select the reason for the revocation:\n"));
@ -618,7 +618,7 @@ ask_revocation_reason( int key_rev, int cert_rev, int hint )
n = -1; n = -1;
else else
n = atoi(answer); n = atoi(answer);
m_free(answer); xfree(answer);
if( n == 0 ) { if( n == 0 ) {
code = 0x00; /* no particular reason */ code = 0x00; /* no particular reason */
code_text = text_0; code_text = text_0;
@ -650,25 +650,25 @@ ask_revocation_reason( int key_rev, int cert_rev, int hint )
trim_trailing_ws( answer, strlen(answer) ); trim_trailing_ws( answer, strlen(answer) );
cpr_kill_prompt(); cpr_kill_prompt();
if( !*answer ) { if( !*answer ) {
m_free(answer); xfree(answer);
break; break;
} }
{ {
char *p = make_printable_string( answer, strlen(answer), 0 ); char *p = make_printable_string( answer, strlen(answer), 0 );
m_free(answer); xfree(answer);
answer = p; answer = p;
} }
if( !description ) if( !description )
description = m_strdup(answer); description = xstrdup(answer);
else { else {
char *p = m_alloc( strlen(description) + strlen(answer) + 2 ); char *p = xmalloc( strlen(description) + strlen(answer) + 2 );
strcpy(stpcpy(stpcpy( p, description),"\n"),answer); strcpy(stpcpy(stpcpy( p, description),"\n"),answer);
m_free(description); xfree(description);
description = p; description = p;
} }
m_free(answer); xfree(answer);
} }
tty_printf(_("Reason for revocation: %s\n"), code_text ); tty_printf(_("Reason for revocation: %s\n"), code_text );
@ -680,7 +680,7 @@ ask_revocation_reason( int key_rev, int cert_rev, int hint )
} while( !cpr_get_answer_is_yes("ask_revocation_reason.okay", } while( !cpr_get_answer_is_yes("ask_revocation_reason.okay",
_("Is this okay? (y/N) ")) ); _("Is this okay? (y/N) ")) );
reason = m_alloc( sizeof *reason ); reason = xmalloc( sizeof *reason );
reason->code = code; reason->code = code;
reason->desc = description; reason->desc = description;
return reason; return reason;
@ -690,7 +690,7 @@ void
release_revocation_reason_info( struct revocation_reason_info *reason ) release_revocation_reason_info( struct revocation_reason_info *reason )
{ {
if( reason ) { if( reason ) {
m_free( reason->desc ); xfree( reason->desc );
m_free( reason ); xfree( reason );
} }
} }

18
g10/seckey-cert.c
View File

@ -88,7 +88,7 @@ do_check( PKT_secret_key *sk, const char *tryagain_text, int mode,
cipher_hd = cipher_open( sk->protect.algo, cipher_hd = cipher_open( sk->protect.algo,
CIPHER_MODE_AUTO_CFB, 1); CIPHER_MODE_AUTO_CFB, 1);
cipher_setkey( cipher_hd, dek->key, dek->keylen ); cipher_setkey( cipher_hd, dek->key, dek->keylen );
m_free(dek); xfree(dek);
save_sk = copy_secret_key( NULL, sk ); save_sk = copy_secret_key( NULL, sk );
cipher_setiv( cipher_hd, sk->protect.iv, sk->protect.ivlen ); cipher_setiv( cipher_hd, sk->protect.iv, sk->protect.ivlen );
csum = 0; csum = 0;
@ -102,7 +102,7 @@ do_check( PKT_secret_key *sk, const char *tryagain_text, int mode,
p = mpi_get_opaque( sk->skey[i], &ndata ); p = mpi_get_opaque( sk->skey[i], &ndata );
if ( ndata > 1 ) if ( ndata > 1 )
csumc = p[ndata-2] << 8 | p[ndata-1]; csumc = p[ndata-2] << 8 | p[ndata-1];
data = m_alloc_secure( ndata ); data = xmalloc_secure( ndata );
cipher_decrypt( cipher_hd, data, p, ndata ); cipher_decrypt( cipher_hd, data, p, ndata );
mpi_free( sk->skey[i] ); sk->skey[i] = NULL ; mpi_free( sk->skey[i] ); sk->skey[i] = NULL ;
p = data; p = data;
@ -168,7 +168,7 @@ do_check( PKT_secret_key *sk, const char *tryagain_text, int mode,
/* Note: at this point ndata should be 2 for a simple /* Note: at this point ndata should be 2 for a simple
checksum or 20 for the sha1 digest */ checksum or 20 for the sha1 digest */
} }
m_free(data); xfree(data);
} }
else { else {
for(i=pubkey_get_npkey(sk->pubkey_algo); for(i=pubkey_get_npkey(sk->pubkey_algo);
@ -180,7 +180,7 @@ do_check( PKT_secret_key *sk, const char *tryagain_text, int mode,
p = mpi_get_opaque (sk->skey[i], &ndata); p = mpi_get_opaque (sk->skey[i], &ndata);
assert (ndata >= 2); assert (ndata >= 2);
assert (ndata == ((p[0] << 8 | p[1]) + 7)/8 + 2); assert (ndata == ((p[0] << 8 | p[1]) + 7)/8 + 2);
buffer = m_alloc_secure (ndata); buffer = xmalloc_secure (ndata);
cipher_sync (cipher_hd); cipher_sync (cipher_hd);
buffer[0] = p[0]; buffer[0] = p[0];
buffer[1] = p[1]; buffer[1] = p[1];
@ -188,7 +188,7 @@ do_check( PKT_secret_key *sk, const char *tryagain_text, int mode,
csum += checksum (buffer, ndata); csum += checksum (buffer, ndata);
mpi_free (sk->skey[i]); mpi_free (sk->skey[i]);
sk->skey[i] = mpi_read_from_buffer (buffer, &ndata, 1); sk->skey[i] = mpi_read_from_buffer (buffer, &ndata, 1);
m_free (buffer); xfree (buffer);
if (!sk->skey[i]) if (!sk->skey[i])
{ {
/* Checksum was okay, but not correctly /* Checksum was okay, but not correctly
@ -350,7 +350,7 @@ protect_secret_key( PKT_secret_key *sk, DEK *dek )
bufarr[j] = NULL; bufarr[j] = NULL;
ndata += opt.simple_sk_checksum? 2 : 20; /* for checksum */ ndata += opt.simple_sk_checksum? 2 : 20; /* for checksum */
data = m_alloc_secure( ndata ); data = xmalloc_secure( ndata );
p = data; p = data;
for(j=0; j < PUBKEY_MAX_NSKEY && bufarr[j]; j++ ) { for(j=0; j < PUBKEY_MAX_NSKEY && bufarr[j]; j++ ) {
p[0] = nbits[j] >> 8 ; p[0] = nbits[j] >> 8 ;
@ -358,7 +358,7 @@ protect_secret_key( PKT_secret_key *sk, DEK *dek )
p += 2; p += 2;
memcpy(p, bufarr[j], narr[j] ); memcpy(p, bufarr[j], narr[j] );
p += narr[j]; p += narr[j];
m_free(bufarr[j]); xfree(bufarr[j]);
} }
if (opt.simple_sk_checksum) { if (opt.simple_sk_checksum) {
@ -404,13 +404,13 @@ protect_secret_key( PKT_secret_key *sk, DEK *dek )
buffer = mpi_get_buffer( sk->skey[i], &nbytes, NULL ); buffer = mpi_get_buffer( sk->skey[i], &nbytes, NULL );
cipher_sync (cipher_hd); cipher_sync (cipher_hd);
assert ( !mpi_is_opaque (sk->skey[i]) ); assert ( !mpi_is_opaque (sk->skey[i]) );
data = m_alloc (nbytes+2); data = xmalloc (nbytes+2);
nbits = mpi_get_nbits (sk->skey[i]); nbits = mpi_get_nbits (sk->skey[i]);
assert (nbytes == (nbits + 7)/8); assert (nbytes == (nbits + 7)/8);
data[0] = nbits >> 8; data[0] = nbits >> 8;
data[1] = nbits; data[1] = nbits;
cipher_encrypt (cipher_hd, data+2, buffer, nbytes); cipher_encrypt (cipher_hd, data+2, buffer, nbytes);
m_free( buffer ); xfree( buffer );
mpi_free (sk->skey[i]); mpi_free (sk->skey[i]);
sk->skey[i] = mpi_set_opaque (NULL, data, nbytes+2); sk->skey[i] = mpi_set_opaque (NULL, data, nbytes+2);

12
g10/seskey.c
View File

@ -100,7 +100,7 @@ encode_session_key( DEK *dek, unsigned nbits )
for( p = dek->key, i=0; i < dek->keylen; i++ ) for( p = dek->key, i=0; i < dek->keylen; i++ )
csum += *p++; csum += *p++;
frame = m_alloc_secure( nframe ); frame = xmalloc_secure( nframe );
n = 0; n = 0;
frame[n++] = 0; frame[n++] = 0;
frame[n++] = 2; frame[n++] = 2;
@ -126,10 +126,10 @@ encode_session_key( DEK *dek, unsigned nbits )
if (p[j]) if (p[j])
j++; j++;
} }
m_free(pp); xfree(pp);
} }
memcpy( frame+n, p, i ); memcpy( frame+n, p, i );
m_free(p); xfree(p);
n += i; n += i;
frame[n++] = 0; frame[n++] = 0;
frame[n++] = dek->algo; frame[n++] = dek->algo;
@ -139,7 +139,7 @@ encode_session_key( DEK *dek, unsigned nbits )
assert( n == nframe ); assert( n == nframe );
a = mpi_alloc_secure( (nframe+BYTES_PER_MPI_LIMB-1) / BYTES_PER_MPI_LIMB ); a = mpi_alloc_secure( (nframe+BYTES_PER_MPI_LIMB-1) / BYTES_PER_MPI_LIMB );
mpi_set_buffer( a, frame, nframe, 0 ); mpi_set_buffer( a, frame, nframe, 0 );
m_free(frame); xfree(frame);
return a; return a;
} }
@ -163,7 +163,7 @@ do_encode_md( MD_HANDLE md, int algo, size_t len, unsigned nbits,
* *
* PAD consists of FF bytes. * PAD consists of FF bytes.
*/ */
frame = md_is_secure(md)? m_alloc_secure( nframe ) : m_alloc( nframe ); frame = md_is_secure(md)? xmalloc_secure( nframe ) : xmalloc( nframe );
n = 0; n = 0;
frame[n++] = 0; frame[n++] = 0;
frame[n++] = 1; /* block type */ frame[n++] = 1; /* block type */
@ -178,7 +178,7 @@ do_encode_md( MD_HANDLE md, int algo, size_t len, unsigned nbits,
mpi_alloc_secure( (nframe+BYTES_PER_MPI_LIMB-1) / BYTES_PER_MPI_LIMB ) mpi_alloc_secure( (nframe+BYTES_PER_MPI_LIMB-1) / BYTES_PER_MPI_LIMB )
: mpi_alloc( (nframe+BYTES_PER_MPI_LIMB-1) / BYTES_PER_MPI_LIMB ); : mpi_alloc( (nframe+BYTES_PER_MPI_LIMB-1) / BYTES_PER_MPI_LIMB );
mpi_set_buffer( a, frame, nframe, 0 ); mpi_set_buffer( a, frame, nframe, 0 );
m_free(frame); xfree(frame);
/* Note that PGP before version 2.3 encoded the MD as: /* Note that PGP before version 2.3 encoded the MD as:
* *

10
g10/sig-check.c
View File

@ -59,7 +59,7 @@ int
signature_check2( PKT_signature *sig, MD_HANDLE digest, u32 *r_expiredate, signature_check2( PKT_signature *sig, MD_HANDLE digest, u32 *r_expiredate,
int *r_expired, int *r_revoked, PKT_public_key *ret_pk ) int *r_expired, int *r_revoked, PKT_public_key *ret_pk )
{ {
PKT_public_key *pk = m_alloc_clear( sizeof *pk ); PKT_public_key *pk = xmalloc_clear( sizeof *pk );
int rc=0; int rc=0;
if( (rc=check_digest_algo(sig->digest_algo)) ) if( (rc=check_digest_algo(sig->digest_algo)) )
@ -134,16 +134,16 @@ signature_check2( PKT_signature *sig, MD_HANDLE digest, u32 *r_expiredate,
md_putc( md, n ); md_putc( md, n );
p = mpi_get_buffer( sig->data[i], &n, NULL ); p = mpi_get_buffer( sig->data[i], &n, NULL );
md_write( md, p, n ); md_write( md, p, n );
m_free(p); xfree(p);
} }
md_final( md ); md_final( md );
p = make_radix64_string( md_read( md, 0 ), 20 ); p = make_radix64_string( md_read( md, 0 ), 20 );
buffer = m_alloc( strlen(p) + 60 ); buffer = xmalloc( strlen(p) + 60 );
sprintf( buffer, "%s %s %lu", sprintf( buffer, "%s %s %lu",
p, strtimestamp( sig->timestamp ), (ulong)sig->timestamp ); p, strtimestamp( sig->timestamp ), (ulong)sig->timestamp );
write_status_text( STATUS_SIG_ID, buffer ); write_status_text( STATUS_SIG_ID, buffer );
m_free(buffer); xfree(buffer);
m_free(p); xfree(p);
md_close(md); md_close(md);
} }

42
g10/sign.c
View File

@ -112,11 +112,11 @@ mk_notation_policy_etc( PKT_signature *sig,
{ {
log_error(_("WARNING: unable to %%-expand notation " log_error(_("WARNING: unable to %%-expand notation "
"(too large). Using unexpanded.\n")); "(too large). Using unexpanded.\n"));
expanded=m_strdup(s); expanded=xstrdup(s);
} }
n2 = strlen(expanded); n2 = strlen(expanded);
buf = m_alloc( 8 + n1 + n2 ); buf = xmalloc( 8 + n1 + n2 );
buf[0] = 0x80; /* human readable */ buf[0] = 0x80; /* human readable */
buf[1] = buf[2] = buf[3] = 0; buf[1] = buf[2] = buf[3] = 0;
buf[4] = n1 >> 8; buf[4] = n1 >> 8;
@ -128,8 +128,8 @@ mk_notation_policy_etc( PKT_signature *sig,
build_sig_subpkt( sig, SIGSUBPKT_NOTATION build_sig_subpkt( sig, SIGSUBPKT_NOTATION
| ((nd->flags & 1)? SIGSUBPKT_FLAG_CRITICAL:0), | ((nd->flags & 1)? SIGSUBPKT_FLAG_CRITICAL:0),
buf, 8+n1+n2 ); buf, 8+n1+n2 );
m_free(expanded); xfree(expanded);
m_free(buf); xfree(buf);
} }
/* set policy URL */ /* set policy URL */
@ -159,14 +159,14 @@ mk_notation_policy_etc( PKT_signature *sig,
{ {
log_error(_("WARNING: unable to %%-expand policy URL " log_error(_("WARNING: unable to %%-expand policy URL "
"(too large). Using unexpanded.\n")); "(too large). Using unexpanded.\n"));
s=m_strdup(string); s=xstrdup(string);
} }
build_sig_subpkt(sig,SIGSUBPKT_POLICY| build_sig_subpkt(sig,SIGSUBPKT_POLICY|
((pu->flags & 1)?SIGSUBPKT_FLAG_CRITICAL:0), ((pu->flags & 1)?SIGSUBPKT_FLAG_CRITICAL:0),
s,strlen(s)); s,strlen(s));
m_free(s); xfree(s);
} }
/* preferred keyserver URL */ /* preferred keyserver URL */
@ -187,14 +187,14 @@ mk_notation_policy_etc( PKT_signature *sig,
{ {
log_error(_("WARNING: unable to %%-expand preferred keyserver URL" log_error(_("WARNING: unable to %%-expand preferred keyserver URL"
" (too large). Using unexpanded.\n")); " (too large). Using unexpanded.\n"));
s=m_strdup(string); s=xstrdup(string);
} }
build_sig_subpkt(sig,SIGSUBPKT_PREF_KS| build_sig_subpkt(sig,SIGSUBPKT_PREF_KS|
((pu->flags & 1)?SIGSUBPKT_FLAG_CRITICAL:0), ((pu->flags & 1)?SIGSUBPKT_FLAG_CRITICAL:0),
s,strlen(s)); s,strlen(s));
m_free(s); xfree(s);
} }
} }
@ -346,7 +346,7 @@ do_sign( PKT_secret_key *sk, PKT_signature *sig,
/* check that the signature verification worked and nothing is /* check that the signature verification worked and nothing is
* fooling us e.g. by a bug in the signature create * fooling us e.g. by a bug in the signature create
* code or by deliberately introduced faults. */ * code or by deliberately introduced faults. */
PKT_public_key *pk = m_alloc_clear (sizeof *pk); PKT_public_key *pk = xmalloc_clear (sizeof *pk);
if( get_pubkey( pk, sig->keyid ) ) if( get_pubkey( pk, sig->keyid ) )
rc = G10ERR_NO_PUBKEY; rc = G10ERR_NO_PUBKEY;
@ -375,7 +375,7 @@ do_sign( PKT_secret_key *sk, PKT_signature *sig,
pubkey_algo_to_string(sk->pubkey_algo), pubkey_algo_to_string(sk->pubkey_algo),
digest_algo_to_string(sig->digest_algo), digest_algo_to_string(sig->digest_algo),
ustr ); ustr );
m_free(ustr); xfree(ustr);
} }
} }
return rc; return rc;
@ -509,7 +509,7 @@ write_onepass_sig_packets (SK_LIST sk_list, IOBUF out, int sigclass )
} }
sk = sk_rover->sk; sk = sk_rover->sk;
ops = m_alloc_clear (sizeof *ops); ops = xmalloc_clear (sizeof *ops);
ops->sig_class = sigclass; ops->sig_class = sigclass;
ops->digest_algo = hash_for (sk->pubkey_algo, sk->version); ops->digest_algo = hash_for (sk->pubkey_algo, sk->version);
ops->pubkey_algo = sk->pubkey_algo; ops->pubkey_algo = sk->pubkey_algo;
@ -546,13 +546,13 @@ write_plaintext_packet (IOBUF out, IOBUF inp, const char *fname, int ptmode)
char *s = make_basename (opt.set_filename? opt.set_filename char *s = make_basename (opt.set_filename? opt.set_filename
: fname, : fname,
iobuf_get_real_fname(inp)); iobuf_get_real_fname(inp));
pt = m_alloc (sizeof *pt + strlen(s) - 1); pt = xmalloc (sizeof *pt + strlen(s) - 1);
pt->namelen = strlen (s); pt->namelen = strlen (s);
memcpy (pt->name, s, pt->namelen); memcpy (pt->name, s, pt->namelen);
m_free (s); xfree (s);
} }
else { /* no filename */ else { /* no filename */
pt = m_alloc (sizeof *pt - 1); pt = xmalloc (sizeof *pt - 1);
pt->namelen = 0; pt->namelen = 0;
} }
} }
@ -640,7 +640,7 @@ write_signature_packets (SK_LIST sk_list, IOBUF out, MD_HANDLE hash,
sk = sk_rover->sk; sk = sk_rover->sk;
/* build the signature packet */ /* build the signature packet */
sig = m_alloc_clear (sizeof *sig); sig = xmalloc_clear (sizeof *sig);
if(opt.force_v3_sigs || RFC1991) if(opt.force_v3_sigs || RFC1991)
sig->version=3; sig->version=3;
else if(duration || opt.sig_policy_url else if(duration || opt.sig_policy_url
@ -1203,7 +1203,7 @@ sign_symencrypt_file (const char *fname, STRLIST locusr)
handle_progress (&pfx, inp, fname); handle_progress (&pfx, inp, fname);
/* prepare key */ /* prepare key */
s2k = m_alloc_clear( sizeof *s2k ); s2k = xmalloc_clear( sizeof *s2k );
s2k->mode = RFC1991? 0:opt.s2k_mode; s2k->mode = RFC1991? 0:opt.s2k_mode;
s2k->hash_algo = S2K_DIGEST_ALGO; s2k->hash_algo = S2K_DIGEST_ALGO;
@ -1252,7 +1252,7 @@ sign_symencrypt_file (const char *fname, STRLIST locusr)
/* Write the symmetric key packet */ /* Write the symmetric key packet */
/*(current filters: armor)*/ /*(current filters: armor)*/
if (!RFC1991) { if (!RFC1991) {
PKT_symkey_enc *enc = m_alloc_clear( sizeof *enc ); PKT_symkey_enc *enc = xmalloc_clear( sizeof *enc );
enc->version = 4; enc->version = 4;
enc->cipher_algo = cfx.dek->algo; enc->cipher_algo = cfx.dek->algo;
enc->s2k = *s2k; enc->s2k = *s2k;
@ -1260,7 +1260,7 @@ sign_symencrypt_file (const char *fname, STRLIST locusr)
pkt.pkt.symkey_enc = enc; pkt.pkt.symkey_enc = enc;
if( (rc = build_packet( out, &pkt )) ) if( (rc = build_packet( out, &pkt )) )
log_error("build symkey packet failed: %s\n", g10_errstr(rc) ); log_error("build symkey packet failed: %s\n", g10_errstr(rc) );
m_free(enc); xfree(enc);
} }
/* Push the encryption filter */ /* Push the encryption filter */
@ -1304,8 +1304,8 @@ sign_symencrypt_file (const char *fname, STRLIST locusr)
iobuf_close(inp); iobuf_close(inp);
release_sk_list( sk_list ); release_sk_list( sk_list );
md_close( mfx.md ); md_close( mfx.md );
m_free(cfx.dek); xfree(cfx.dek);
m_free(s2k); xfree(s2k);
return rc; return rc;
} }
@ -1386,7 +1386,7 @@ make_keysig_packet( PKT_signature **ret_sig, PKT_public_key *pk,
hash_uid (md, sigversion, uid); hash_uid (md, sigversion, uid);
} }
/* and make the signature packet */ /* and make the signature packet */
sig = m_alloc_clear( sizeof *sig ); sig = xmalloc_clear( sizeof *sig );
sig->version = sigversion; sig->version = sigversion;
sig->flags.exportable=1; sig->flags.exportable=1;
sig->flags.revocable=1; sig->flags.revocable=1;

10
g10/skclist.c
View File

@ -44,7 +44,7 @@ release_sk_list( SK_LIST sk_list )
for( ; sk_list; sk_list = sk_rover ) { for( ; sk_list; sk_list = sk_rover ) {
sk_rover = sk_list->next; sk_rover = sk_list->next;
free_secret_key( sk_list->sk ); free_secret_key( sk_list->sk );
m_free( sk_list ); xfree( sk_list );
} }
} }
@ -112,7 +112,7 @@ build_sk_list( STRLIST locusr, SK_LIST *ret_sk_list,
{ /* use the default one */ { /* use the default one */
PKT_secret_key *sk; PKT_secret_key *sk;
sk = m_alloc_clear( sizeof *sk ); sk = xmalloc_clear( sizeof *sk );
sk->req_usage = use; sk->req_usage = use;
if( (rc = get_seckey_byname( sk, NULL, unlock )) ) { if( (rc = get_seckey_byname( sk, NULL, unlock )) ) {
free_secret_key( sk ); sk = NULL; free_secret_key( sk ); sk = NULL;
@ -130,7 +130,7 @@ build_sk_list( STRLIST locusr, SK_LIST *ret_sk_list,
} }
else else
{ {
r = m_alloc( sizeof *r ); r = xmalloc( sizeof *r );
r->sk = sk; sk = NULL; r->sk = sk; sk = NULL;
r->next = sk_list; r->next = sk_list;
r->mark = 0; r->mark = 0;
@ -158,7 +158,7 @@ build_sk_list( STRLIST locusr, SK_LIST *ret_sk_list,
log_error(_("skipped \"%s\": duplicated\n"), locusr->d ); log_error(_("skipped \"%s\": duplicated\n"), locusr->d );
continue; continue;
} }
sk = m_alloc_clear( sizeof *sk ); sk = xmalloc_clear( sizeof *sk );
sk->req_usage = use; sk->req_usage = use;
if( (rc = get_seckey_byname( sk, locusr->d, 0 )) ) if( (rc = get_seckey_byname( sk, locusr->d, 0 )) )
{ {
@ -193,7 +193,7 @@ build_sk_list( STRLIST locusr, SK_LIST *ret_sk_list,
free_secret_key( sk ); sk = NULL; free_secret_key( sk ); sk = NULL;
} }
else { else {
r = m_alloc( sizeof *r ); r = xmalloc( sizeof *r );
r->sk = sk; sk = NULL; r->sk = sk; sk = NULL;
r->next = sk_list; r->next = sk_list;
r->mark = 0; r->mark = 0;

24
g10/status.c
View File

@ -501,7 +501,7 @@ do_shm_get( const char *keyword, int hidden, int bool )
if( bool ) if( bool )
return p[0]? "" : NULL; return p[0]? "" : NULL;
string = hidden? m_alloc_secure( n+1 ) : m_alloc( n+1 ); string = hidden? xmalloc_secure( n+1 ) : xmalloc( n+1 );
memcpy(string, p, n ); memcpy(string, p, n );
string[n] = 0; /* make sure it is a string */ string[n] = 0; /* make sure it is a string */
if( hidden ) /* invalidate the memory */ if( hidden ) /* invalidate the memory */
@ -559,7 +559,7 @@ do_get_from_fd( const char *keyword, int hidden, int bool )
if( i >= len-1 ) { if( i >= len-1 ) {
char *save = string; char *save = string;
len += 100; len += 100;
string = hidden? m_alloc_secure ( len ) : m_alloc ( len ); string = hidden? xmalloc_secure ( len ) : xmalloc ( len );
if( save ) if( save )
memcpy(string, save, i ); memcpy(string, save, i );
else else
@ -630,7 +630,7 @@ cpr_get( const char *keyword, const char *prompt )
for(;;) { for(;;) {
p = tty_get( prompt ); p = tty_get( prompt );
if( *p=='?' && !p[1] && !(keyword && !*keyword)) { if( *p=='?' && !p[1] && !(keyword && !*keyword)) {
m_free(p); xfree(p);
display_online_help( keyword ); display_online_help( keyword );
} }
else else
@ -646,7 +646,7 @@ cpr_get_utf8( const char *keyword, const char *prompt )
p = cpr_get( keyword, prompt ); p = cpr_get( keyword, prompt );
if( p ) { if( p ) {
char *utf8 = native_to_utf8( p ); char *utf8 = native_to_utf8( p );
m_free( p ); xfree( p );
p = utf8; p = utf8;
} }
return p; return p;
@ -666,7 +666,7 @@ cpr_get_hidden( const char *keyword, const char *prompt )
for(;;) { for(;;) {
p = tty_get_hidden( prompt ); p = tty_get_hidden( prompt );
if( *p == '?' && !p[1] ) { if( *p == '?' && !p[1] ) {
m_free(p); xfree(p);
display_online_help( keyword ); display_online_help( keyword );
} }
else else
@ -703,13 +703,13 @@ cpr_get_answer_is_yes( const char *keyword, const char *prompt )
p = tty_get( prompt ); p = tty_get( prompt );
trim_spaces(p); /* it is okay to do this here */ trim_spaces(p); /* it is okay to do this here */
if( *p == '?' && !p[1] ) { if( *p == '?' && !p[1] ) {
m_free(p); xfree(p);
display_online_help( keyword ); display_online_help( keyword );
} }
else { else {
tty_kill_prompt(); tty_kill_prompt();
yes = answer_is_yes(p); yes = answer_is_yes(p);
m_free(p); xfree(p);
return yes; return yes;
} }
} }
@ -731,13 +731,13 @@ cpr_get_answer_yes_no_quit( const char *keyword, const char *prompt )
p = tty_get( prompt ); p = tty_get( prompt );
trim_spaces(p); /* it is okay to do this here */ trim_spaces(p); /* it is okay to do this here */
if( *p == '?' && !p[1] ) { if( *p == '?' && !p[1] ) {
m_free(p); xfree(p);
display_online_help( keyword ); display_online_help( keyword );
} }
else { else {
tty_kill_prompt(); tty_kill_prompt();
yes = answer_is_yes_no_quit(p); yes = answer_is_yes_no_quit(p);
m_free(p); xfree(p);
return yes; return yes;
} }
} }
@ -763,7 +763,7 @@ cpr_get_answer_okay_cancel (const char *keyword,
if (answer) if (answer)
{ {
yes = answer_is_okay_cancel (answer, def_answer); yes = answer_is_okay_cancel (answer, def_answer);
m_free (answer); xfree (answer);
return yes; return yes;
} }
@ -773,14 +773,14 @@ cpr_get_answer_okay_cancel (const char *keyword,
trim_spaces(p); /* it is okay to do this here */ trim_spaces(p); /* it is okay to do this here */
if (*p == '?' && !p[1]) if (*p == '?' && !p[1])
{ {
m_free(p); xfree(p);
display_online_help (keyword); display_online_help (keyword);
} }
else else
{ {
tty_kill_prompt(); tty_kill_prompt();
yes = answer_is_okay_cancel (p, def_answer); yes = answer_is_okay_cancel (p, def_answer);
m_free(p); xfree(p);
return yes; return yes;
} }
} }

18
g10/tdbio.c
View File

@ -188,7 +188,7 @@ put_record_into_cache( ulong recno, const char *data )
} }
/* see whether we reached the limit */ /* see whether we reached the limit */
if( cache_entries < MAX_CACHE_ENTRIES_SOFT ) { /* no */ if( cache_entries < MAX_CACHE_ENTRIES_SOFT ) { /* no */
r = m_alloc( sizeof *r ); r = xmalloc( sizeof *r );
r->flags.used = 1; r->flags.used = 1;
r->recno = recno; r->recno = recno;
memcpy( r->data, data, TRUST_RECORD_LEN ); memcpy( r->data, data, TRUST_RECORD_LEN );
@ -231,7 +231,7 @@ put_record_into_cache( ulong recno, const char *data )
if( cache_entries < MAX_CACHE_ENTRIES_HARD ) { /* no */ if( cache_entries < MAX_CACHE_ENTRIES_HARD ) { /* no */
if( opt.debug && !(cache_entries % 100) ) if( opt.debug && !(cache_entries % 100) )
log_debug("increasing tdbio cache size\n"); log_debug("increasing tdbio cache size\n");
r = m_alloc( sizeof *r ); r = xmalloc( sizeof *r );
r->flags.used = 1; r->flags.used = 1;
r->recno = recno; r->recno = recno;
memcpy( r->data, data, TRUST_RECORD_LEN ); memcpy( r->data, data, TRUST_RECORD_LEN );
@ -491,12 +491,12 @@ tdbio_set_dbname( const char *new_dbname, int create )
fname = make_filename (opt.homedir, new_dbname, NULL); fname = make_filename (opt.homedir, new_dbname, NULL);
} }
else else
fname = m_strdup (new_dbname); fname = xstrdup (new_dbname);
if( access( fname, R_OK ) ) { if( access( fname, R_OK ) ) {
if( errno != ENOENT ) { if( errno != ENOENT ) {
log_error( _("can't access `%s': %s\n"), fname, strerror(errno) ); log_error( _("can't access `%s': %s\n"), fname, strerror(errno) );
m_free(fname); xfree(fname);
return G10ERR_TRUSTDB; return G10ERR_TRUSTDB;
} }
if( create ) { if( create ) {
@ -514,7 +514,7 @@ tdbio_set_dbname( const char *new_dbname, int create )
} }
*p = DIRSEP_C; *p = DIRSEP_C;
m_free(db_name); xfree(db_name);
db_name = fname; db_name = fname;
#ifdef __riscos__ #ifdef __riscos__
if( !lockhandle ) if( !lockhandle )
@ -560,7 +560,7 @@ tdbio_set_dbname( const char *new_dbname, int create )
return 0; return 0;
} }
} }
m_free(db_name); xfree(db_name);
db_name = fname; db_name = fname;
return 0; return 0;
} }
@ -1528,7 +1528,7 @@ migrate_from_v2 ()
int rc, count; int rc, count;
ottable_size = 5; ottable_size = 5;
ottable = m_alloc (ottable_size * sizeof *ottable); ottable = xmalloc (ottable_size * sizeof *ottable);
ottable_used = 0; ottable_used = 0;
/* We have some restrictions here. We can't use the version record /* We have some restrictions here. We can't use the version record
@ -1558,7 +1558,7 @@ migrate_from_v2 ()
if (ottable_used == ottable_size) if (ottable_used == ottable_size)
{ {
ottable_size += 1000; ottable_size += 1000;
ottable = m_realloc (ottable, ottable_size * sizeof *ottable); ottable = xrealloc (ottable, ottable_size * sizeof *ottable);
} }
ottable[ottable_used].keyrecno = buftoulong (oldbuf+6); ottable[ottable_used].keyrecno = buftoulong (oldbuf+6);
ottable[ottable_used].ot = oldbuf[18]; ottable[ottable_used].ot = oldbuf[18];
@ -1629,5 +1629,5 @@ migrate_from_v2 ()
if (rc) if (rc)
log_fatal ("failed to sync `%s'\n", db_name); log_fatal ("failed to sync `%s'\n", db_name);
log_info ("migrated %d version 2 ownertrusts\n", count); log_info ("migrated %d version 2 ownertrusts\n", count);
m_free (ottable); xfree (ottable);
} }

2
g10/textfilter.c
View File

@ -147,7 +147,7 @@ text_filter( void *opaque, int control,
if( tfx->truncated ) if( tfx->truncated )
log_error(_("can't handle text lines longer than %d characters\n"), log_error(_("can't handle text lines longer than %d characters\n"),
MAX_LINELEN ); MAX_LINELEN );
m_free( tfx->buffer ); xfree( tfx->buffer );
tfx->buffer = NULL; tfx->buffer = NULL;
} }
else if( control == IOBUFCTRL_DESC ) else if( control == IOBUFCTRL_DESC )

40
g10/trustdb.c
View File

@ -99,7 +99,7 @@ new_key_item (void)
{ {
struct key_item *k; struct key_item *k;
k = m_alloc_clear (sizeof *k); k = xmalloc_clear (sizeof *k);
return k; return k;
} }
@ -111,8 +111,8 @@ release_key_items (struct key_item *k)
for (; k; k = k2) for (; k; k = k2)
{ {
k2 = k->next; k2 = k->next;
m_free (k->trust_regexp); xfree (k->trust_regexp);
m_free (k); xfree (k);
} }
} }
@ -129,7 +129,7 @@ new_key_hash_table (void)
{ {
struct key_item **tbl; struct key_item **tbl;
tbl = m_alloc_clear (1024 * sizeof *tbl); tbl = xmalloc_clear (1024 * sizeof *tbl);
return tbl; return tbl;
} }
@ -142,7 +142,7 @@ release_key_hash_table (KeyHashTable tbl)
return; return;
for (i=0; i < 1024; i++) for (i=0; i < 1024; i++)
release_key_items (tbl[i]); release_key_items (tbl[i]);
m_free (tbl); xfree (tbl);
} }
/* /*
@ -189,7 +189,7 @@ release_key_array ( struct key_array *keys )
if (keys) { if (keys) {
for (k=keys; k->keyblock; k++) for (k=keys; k->keyblock; k++)
release_kbnode (k->keyblock); release_kbnode (k->keyblock);
m_free (keys); xfree (keys);
} }
} }
@ -409,7 +409,7 @@ setup_trustdb( int level, const char *dbname )
if( trustdb_args.init ) if( trustdb_args.init )
return 0; return 0;
trustdb_args.level = level; trustdb_args.level = level;
trustdb_args.dbname = dbname? m_strdup(dbname): NULL; trustdb_args.dbname = dbname? xstrdup(dbname): NULL;
return 0; return 0;
} }
@ -832,7 +832,7 @@ update_min_ownertrust (u32 *kid, unsigned int new_trust )
TRUSTREC rec; TRUSTREC rec;
int rc; int rc;
pk = m_alloc_clear (sizeof *pk); pk = xmalloc_clear (sizeof *pk);
rc = get_pubkey (pk, kid); rc = get_pubkey (pk, kid);
if (rc) if (rc)
{ {
@ -1066,14 +1066,14 @@ get_validity (PKT_public_key *pk, PKT_user_id *uid)
keyid_from_pk (pk, kid); keyid_from_pk (pk, kid);
if (pk->main_keyid[0] != kid[0] || pk->main_keyid[1] != kid[1]) if (pk->main_keyid[0] != kid[0] || pk->main_keyid[1] != kid[1])
{ /* this is a subkey - get the mainkey */ { /* this is a subkey - get the mainkey */
main_pk = m_alloc_clear (sizeof *main_pk); main_pk = xmalloc_clear (sizeof *main_pk);
rc = get_pubkey (main_pk, pk->main_keyid); rc = get_pubkey (main_pk, pk->main_keyid);
if (rc) if (rc)
{ {
char *tempkeystr=m_strdup(keystr(pk->main_keyid)); char *tempkeystr=xstrdup(keystr(pk->main_keyid));
log_error ("error getting main key %s of subkey %s: %s\n", log_error ("error getting main key %s of subkey %s: %s\n",
tempkeystr, keystr(kid), g10_errstr(rc)); tempkeystr, keystr(kid), g10_errstr(rc));
m_free(tempkeystr); xfree(tempkeystr);
validity = TRUST_UNKNOWN; validity = TRUST_UNKNOWN;
goto leave; goto leave;
} }
@ -1270,7 +1270,7 @@ ask_ownertrust (u32 *kid,int minimum)
int rc; int rc;
int ot; int ot;
pk = m_alloc_clear (sizeof *pk); pk = xmalloc_clear (sizeof *pk);
rc = get_pubkey (pk, kid); rc = get_pubkey (pk, kid);
if (rc) if (rc)
{ {
@ -1701,7 +1701,7 @@ clean_uids_from_key(KBNODE keyblock,int noisy)
user,keystr(keyblock->pkt->pkt.public_key->keyid), user,keystr(keyblock->pkt->pkt.public_key->keyid),
reason); reason);
m_free(user); xfree(user);
} }
} }
} }
@ -1936,14 +1936,14 @@ validate_key_list (KEYDB_HANDLE hd, KeyHashTable full_trust,
KEYDB_SEARCH_DESC desc; KEYDB_SEARCH_DESC desc;
maxkeys = 1000; maxkeys = 1000;
keys = m_alloc ((maxkeys+1) * sizeof *keys); keys = xmalloc ((maxkeys+1) * sizeof *keys);
nkeys = 0; nkeys = 0;
rc = keydb_search_reset (hd); rc = keydb_search_reset (hd);
if (rc) if (rc)
{ {
log_error ("keydb_search_reset failed: %s\n", g10_errstr(rc)); log_error ("keydb_search_reset failed: %s\n", g10_errstr(rc));
m_free (keys); xfree (keys);
return NULL; return NULL;
} }
@ -1960,7 +1960,7 @@ validate_key_list (KEYDB_HANDLE hd, KeyHashTable full_trust,
if (rc) if (rc)
{ {
log_error ("keydb_search_first failed: %s\n", g10_errstr(rc)); log_error ("keydb_search_first failed: %s\n", g10_errstr(rc));
m_free (keys); xfree (keys);
return NULL; return NULL;
} }
@ -1973,7 +1973,7 @@ validate_key_list (KEYDB_HANDLE hd, KeyHashTable full_trust,
if (rc) if (rc)
{ {
log_error ("keydb_get_keyblock failed: %s\n", g10_errstr(rc)); log_error ("keydb_get_keyblock failed: %s\n", g10_errstr(rc));
m_free (keys); xfree (keys);
return NULL; return NULL;
} }
@ -2005,7 +2005,7 @@ validate_key_list (KEYDB_HANDLE hd, KeyHashTable full_trust,
if (nkeys == maxkeys) { if (nkeys == maxkeys) {
maxkeys += 1000; maxkeys += 1000;
keys = m_realloc (keys, (maxkeys+1) * sizeof *keys); keys = xrealloc (keys, (maxkeys+1) * sizeof *keys);
} }
keys[nkeys++].keyblock = keyblock; keys[nkeys++].keyblock = keyblock;
@ -2029,7 +2029,7 @@ validate_key_list (KEYDB_HANDLE hd, KeyHashTable full_trust,
if (rc && rc != -1) if (rc && rc != -1)
{ {
log_error ("keydb_search_next failed: %s\n", g10_errstr(rc)); log_error ("keydb_search_next failed: %s\n", g10_errstr(rc));
m_free (keys); xfree (keys);
return NULL; return NULL;
} }
@ -2298,7 +2298,7 @@ validate_keys (int interactive)
kar->keyblock->pkt->pkt.public_key->trust_value; kar->keyblock->pkt->pkt.public_key->trust_value;
if(kar->keyblock->pkt->pkt.public_key->trust_regexp) if(kar->keyblock->pkt->pkt.public_key->trust_regexp)
k->trust_regexp= k->trust_regexp=
m_strdup(kar->keyblock->pkt-> xstrdup(kar->keyblock->pkt->
pkt.public_key->trust_regexp); pkt.public_key->trust_regexp);
k->next = klist; k->next = klist;
klist = k; klist = k;

4
g10/verify.c
View File

@ -127,10 +127,10 @@ verify_signatures( int nfiles, char **files )
void void
print_file_status( int status, const char *name, int what ) print_file_status( int status, const char *name, int what )
{ {
char *p = m_alloc(strlen(name)+10); char *p = xmalloc(strlen(name)+10);
sprintf(p, "%d %s", what, name ); sprintf(p, "%d %s", what, name );
write_status_text( status, p ); write_status_text( status, p );
m_free(p); xfree(p);
} }

7
include/ChangeLog
View File

@ -1,3 +1,10 @@
2005-07-27 Werner Koch <wk@g10code.com>
* memory.h (m_free, m_alloc, m_realloc, m_strdup): Removed and
replaced all over by xfoo functions. This is to ease porting to
gnupg 1.9.
(xmalloc_secure) [M_DEBUG]: Correctly map to m_debug_alloc_secure.
2005-06-23 David Shaw <dshaw@jabberwocky.com> 2005-06-23 David Shaw <dshaw@jabberwocky.com>
* http.h: Fix prototypes for http_open_document and http_open * http.h: Fix prototypes for http_open_document and http_open

44
include/memory.h
View File

@ -31,15 +31,15 @@
#else /* __riscos__ */ #else /* __riscos__ */
#define M_DBGINFO(a) "["__FILE__ ":" STR(a) "]" #define M_DBGINFO(a) "["__FILE__ ":" STR(a) "]"
#endif /* __riscos__ */ #endif /* __riscos__ */
#define m_alloc(n) m_debug_alloc((n), M_DBGINFO( __LINE__ ) ) #define xmalloc(n) m_debug_alloc((n), M_DBGINFO( __LINE__ ) )
#define m_alloc_clear(n) m_debug_alloc_clear((n), M_DBGINFO(__LINE__) ) #define xmalloc_clear(n) m_debug_alloc_clear((n), M_DBGINFO(__LINE__) )
#define m_alloc_secure(n) m_debug_alloc((n), M_DBGINFO(__LINE__) ) #define xmalloc_secure(n) m_debug_alloc_secure(n), M_DBGINFO(__LINE__) )
#define m_alloc_secure_clear(n) m_debug_alloc_secure_clear((n), M_DBGINFO(__LINE__) ) #define xmalloc_secure_clear(n) m_debug_alloc_secure_clear((n), M_DBGINFO(__LINE__) )
#define m_realloc(n,m) m_debug_realloc((n),(m), M_DBGINFO(__LINE__) ) #define xrealloc(n,m) m_debug_realloc((n),(m), M_DBGINFO(__LINE__) )
#define m_free(n) m_debug_free((n), M_DBGINFO(__LINE__) ) #define xfree(n) m_debug_free((n), M_DBGINFO(__LINE__) )
#define m_check(n) m_debug_check((n), M_DBGINFO(__LINE__) ) #define m_check(n) m_debug_check((n), M_DBGINFO(__LINE__) )
/*#define m_copy(a) m_debug_copy((a), M_DBGINFO(__LINE__) )*/ /*#define m_copy(a) m_debug_copy((a), M_DBGINFO(__LINE__) )*/
#define m_strdup(a) m_debug_strdup((a), M_DBGINFO(__LINE__) ) #define xstrdup(a) m_debug_strdup((a), M_DBGINFO(__LINE__) )
void *m_debug_alloc( size_t n, const char *info ); void *m_debug_alloc( size_t n, const char *info );
void *m_debug_alloc_clear( size_t n, const char *info ); void *m_debug_alloc_clear( size_t n, const char *info );
@ -52,25 +52,30 @@ void m_debug_check( const void *a, const char *info );
char *m_debug_strdup( const char *a, const char *info ); char *m_debug_strdup( const char *a, const char *info );
#else #else
void *m_alloc( size_t n ); void *xmalloc( size_t n );
void *m_alloc_clear( size_t n ); void *xmalloc_clear( size_t n );
void *m_alloc_secure( size_t n ); void *xmalloc_secure( size_t n );
void *m_alloc_secure_clear( size_t n ); void *xmalloc_secure_clear( size_t n );
void *m_realloc( void *a, size_t n ); void *xrealloc( void *a, size_t n );
void m_free( void *p ); void xfree( void *p );
void m_check( const void *a ); void m_check( const void *a );
/*void *m_copy( const void *a );*/ /*void *m_copy( const void *a );*/
char *m_strdup( const char * a); char *xstrdup( const char * a);
#endif #endif
size_t m_size( const void *a ); size_t m_size( const void *a );
void m_print_stats(const char *prefix); void m_print_stats(const char *prefix);
/* The follwing functions should be preferred over xmalloc_clear. */
void *xcalloc (size_t n, size_t m);
void *xcalloc_secure (size_t n, size_t m);
/*-- secmem.c --*/ /*-- secmem.c --*/
int secmem_init( size_t npool ); int secmem_init( size_t npool );
void secmem_term( void ); void secmem_term( void );
void *secmem_malloc( size_t size ); void *secmem_malloc( size_t size );
void *secmem_realloc( void *a, size_t newsize ); void *secmexrealloc( void *a, size_t newsize );
void secmem_free( void *a ); void secmem_free( void *a );
int m_is_secure( const void *p ); int m_is_secure( const void *p );
void secmem_dump_stats(void); void secmem_dump_stats(void);
@ -91,15 +96,6 @@ unsigned secmem_get_flags(void);
EXTERN_UNLESS_MAIN_MODULE int memory_debug_mode; EXTERN_UNLESS_MAIN_MODULE int memory_debug_mode;
EXTERN_UNLESS_MAIN_MODULE int memory_stat_debug_mode; EXTERN_UNLESS_MAIN_MODULE int memory_stat_debug_mode;
/* To prepare a migration to the xmalloc suite of function as used in
1.9 we define a couple of macros. */
#define xmalloc(n) m_alloc ((n))
void *xcalloc (size_t n, size_t m);
#define xmalloc_secure(n) m_alloc_secure (n)
void *xcalloc_secure (size_t n, size_t m);
#define xrealloc(a,n) m_realloc ((a),(n))
#define xstrdup(a) m_strdup ((a))
#define xfree(a) m_free (a)
#endif /*G10_MEMORY_H*/ #endif /*G10_MEMORY_H*/

2
include/mpi.h
View File

@ -73,7 +73,7 @@ struct gcry_mpi {
int sign; /* indicates a negative number */ int sign; /* indicates a negative number */
unsigned flags; /* bit 0: array must be allocated in secure memory space */ unsigned flags; /* bit 0: array must be allocated in secure memory space */
/* bit 1: not used */ /* bit 1: not used */
/* bit 2: the limb is a pointer to some m_alloced data */ /* bit 2: the limb is a pointer to some xmalloced data */
mpi_limb_t *d; /* array with the limbs */ mpi_limb_t *d; /* array with the limbs */
}; };

2
keyserver/curl-shim.c
View File

@ -212,7 +212,7 @@ curl_easy_perform(CURL *curl)
} }
} }
m_free(line); xfree(line);
http_close(&curl->hd); http_close(&curl->hd);
} }
} }

2
keyserver/gpgkeys_finger.c
View File

@ -344,7 +344,7 @@ get_key (char *getkey)
getkey,KEYSERVER_KEY_NOT_FOUND); getkey,KEYSERVER_KEY_NOT_FOUND);
} }
m_free(line); xfree(line);
iobuf_close (fp_read); iobuf_close (fp_read);
return KEYSERVER_OK; return KEYSERVER_OK;

2
keyserver/gpgkeys_http.c
View File

@ -111,7 +111,7 @@ get_key(char *getkey)
getkey,KEYSERVER_KEY_NOT_FOUND); getkey,KEYSERVER_KEY_NOT_FOUND);
} }
m_free(line); xfree(line);
http_close(&hd); http_close(&hd);
} }

6
keyserver/gpgkeys_oldhkp.c
View File

@ -293,7 +293,7 @@ get_key(char *getkey)
getkey,KEYSERVER_KEY_NOT_FOUND); getkey,KEYSERVER_KEY_NOT_FOUND);
} }
m_free(line); xfree(line);
http_close(&hd); http_close(&hd);
} }
@ -607,7 +607,7 @@ handle_old_hkp_index(IOBUF inp)
} }
while(rc!=0); while(rc!=0);
m_free(line); xfree(line);
if(ret>-1) if(ret>-1)
fprintf(output,"info:1:%d\n%s",count,iobuf_get_temp_buffer(buffer)); fprintf(output,"info:1:%d\n%s",count,iobuf_get_temp_buffer(buffer));
@ -702,7 +702,7 @@ search_key(char *searchkey)
} }
while(rc!=0); while(rc!=0);
m_free(line); xfree(line);
http_close(&hd); http_close(&hd);

4
mpi/mpi-mpow.c
View File

@ -65,7 +65,7 @@ mpi_mulpowm( MPI res, MPI *basearray, MPI *exparray, MPI m)
assert(t); assert(t);
assert( k < 10 ); assert( k < 10 );
G = m_alloc_clear( (1<<k) * sizeof *G ); G = xmalloc_clear( (1<<k) * sizeof *G );
/* and calculate */ /* and calculate */
tmp = mpi_alloc( mpi_get_nlimbs(m)+1 ); tmp = mpi_alloc( mpi_get_nlimbs(m)+1 );
mpi_set_ui( res, 1 ); mpi_set_ui( res, 1 );
@ -96,5 +96,5 @@ mpi_mulpowm( MPI res, MPI *basearray, MPI *exparray, MPI m)
mpi_free(tmp); mpi_free(tmp);
for(i=0; i < (1<<k); i++ ) for(i=0; i < (1<<k); i++ )
mpi_free(G[i]); mpi_free(G[i]);
m_free(G); xfree(G);
} }

8
mpi/mpicoder.c
View File

@ -56,7 +56,7 @@ mpi_write( IOBUF out, MPI a )
p = buf = mpi_get_buffer( a, &n, NULL ); p = buf = mpi_get_buffer( a, &n, NULL );
rc = iobuf_write( out, p, n ); rc = iobuf_write( out, p, n );
m_free(buf); xfree(buf);
return rc; return rc;
} }
@ -344,7 +344,7 @@ mpi_get_keyid( MPI a, u32 *keyid )
/**************** /****************
* Return an m_alloced buffer with the MPI (msb first). * Return an xmalloced buffer with the MPI (msb first).
* NBYTES receives the length of this buffer. Caller must free the * NBYTES receives the length of this buffer. Caller must free the
* return string (This function does return a 0 byte buffer with NBYTES * return string (This function does return a 0 byte buffer with NBYTES
* set to zero if the value of A is zero. If sign is not NULL, it will * set to zero if the value of A is zero. If sign is not NULL, it will
@ -363,8 +363,8 @@ do_get_buffer( MPI a, unsigned *nbytes, int *sign, int force_secure )
*nbytes = n = a->nlimbs * BYTES_PER_MPI_LIMB; *nbytes = n = a->nlimbs * BYTES_PER_MPI_LIMB;
if (!n) if (!n)
n++; /* avoid zero length allocation */ n++; /* avoid zero length allocation */
p = buffer = force_secure || mpi_is_secure(a) ? m_alloc_secure(n) p = buffer = force_secure || mpi_is_secure(a) ? xmalloc_secure(n)
: m_alloc(n); : xmalloc(n);
for(i=a->nlimbs-1; i >= 0; i-- ) { for(i=a->nlimbs-1; i >= 0; i-- ) {
alimb = a->d[i]; alimb = a->d[i];

4
mpi/mpih-mul.c
View File

@ -422,7 +422,7 @@ mpihelp_mul_karatsuba_case( mpi_ptr_t prodp,
} }
else { else {
if( !ctx->next ) { if( !ctx->next ) {
ctx->next = m_alloc_clear( sizeof *ctx ); ctx->next = xmalloc_clear( sizeof *ctx );
} }
mpihelp_mul_karatsuba_case( ctx->tspace, mpihelp_mul_karatsuba_case( ctx->tspace,
vp, vsize, vp, vsize,
@ -451,7 +451,7 @@ mpihelp_release_karatsuba_ctx( struct karatsuba_ctx *ctx )
mpi_free_limb_space( ctx->tp ); mpi_free_limb_space( ctx->tp );
if( ctx->tspace ) if( ctx->tspace )
mpi_free_limb_space( ctx->tspace ); mpi_free_limb_space( ctx->tspace );
m_free( ctx ); xfree( ctx );
} }
} }

28
mpi/mpiutil.c
View File

@ -59,7 +59,7 @@ mpi_alloc( unsigned nlimbs )
a = m_debug_alloc( sizeof *a, info ); a = m_debug_alloc( sizeof *a, info );
a->d = nlimbs? mpi_debug_alloc_limb_space( nlimbs, 0, info ) : NULL; a->d = nlimbs? mpi_debug_alloc_limb_space( nlimbs, 0, info ) : NULL;
#else #else
a = m_alloc( sizeof *a ); a = xmalloc( sizeof *a );
a->d = nlimbs? mpi_alloc_limb_space( nlimbs, 0 ) : NULL; a->d = nlimbs? mpi_alloc_limb_space( nlimbs, 0 ) : NULL;
#endif #endif
a->alloced = nlimbs; a->alloced = nlimbs;
@ -92,7 +92,7 @@ mpi_alloc_secure( unsigned nlimbs )
a = m_debug_alloc( sizeof *a, info ); a = m_debug_alloc( sizeof *a, info );
a->d = nlimbs? mpi_debug_alloc_limb_space( nlimbs, 1, info ) : NULL; a->d = nlimbs? mpi_debug_alloc_limb_space( nlimbs, 1, info ) : NULL;
#else #else
a = m_alloc( sizeof *a ); a = xmalloc( sizeof *a );
a->d = nlimbs? mpi_alloc_limb_space( nlimbs, 1 ) : NULL; a->d = nlimbs? mpi_alloc_limb_space( nlimbs, 1 ) : NULL;
#endif #endif
a->alloced = nlimbs; a->alloced = nlimbs;
@ -145,7 +145,7 @@ mpi_alloc_limb_space( unsigned nlimbs, int secure )
#ifdef M_DEBUG #ifdef M_DEBUG
p = secure? m_debug_alloc_secure(len, info):m_debug_alloc( len, info ); p = secure? m_debug_alloc_secure(len, info):m_debug_alloc( len, info );
#else #else
p = secure? m_alloc_secure( len ):m_alloc( len ); p = secure? xmalloc_secure( len ):xmalloc( len );
#endif #endif
return p; return p;
@ -186,7 +186,7 @@ mpi_free_limb_space( mpi_ptr_t a )
} }
#endif #endif
m_free(a); xfree(a);
} }
@ -202,7 +202,7 @@ mpi_assign_limb_space( MPI a, mpi_ptr_t ap, unsigned nlimbs )
/**************** /****************
* Resize the array of A to NLIMBS. the additional space is cleared * Resize the array of A to NLIMBS. the additional space is cleared
* (set to 0) [done by m_realloc()] * (set to 0) [done by xrealloc()]
*/ */
void void
#ifdef M_DEBUG #ifdef M_DEBUG
@ -225,9 +225,9 @@ mpi_resize( MPI a, unsigned nlimbs )
a->d = m_debug_alloc_clear( nlimbs * sizeof(mpi_limb_t), info ); a->d = m_debug_alloc_clear( nlimbs * sizeof(mpi_limb_t), info );
#else #else
if( a->d ) if( a->d )
a->d = m_realloc(a->d, nlimbs * sizeof(mpi_limb_t) ); a->d = xrealloc(a->d, nlimbs * sizeof(mpi_limb_t) );
else else
a->d = m_alloc_clear( nlimbs * sizeof(mpi_limb_t) ); a->d = xmalloc_clear( nlimbs * sizeof(mpi_limb_t) );
#endif #endif
a->alloced = nlimbs; a->alloced = nlimbs;
} }
@ -253,7 +253,7 @@ mpi_free( MPI a )
if( DBG_MEMORY ) if( DBG_MEMORY )
log_debug("mpi_free\n" ); log_debug("mpi_free\n" );
if( a->flags & 4 ) if( a->flags & 4 )
m_free( a->d ); xfree( a->d );
else { else {
#ifdef M_DEBUG #ifdef M_DEBUG
mpi_debug_free_limb_space(a->d, info); mpi_debug_free_limb_space(a->d, info);
@ -263,7 +263,7 @@ mpi_free( MPI a )
} }
if( a->flags & ~7 ) if( a->flags & ~7 )
log_bug("invalid flag value in mpi\n"); log_bug("invalid flag value in mpi\n");
m_free(a); xfree(a);
} }
@ -307,7 +307,7 @@ mpi_set_opaque( MPI a, void *p, unsigned int len )
} }
if( a->flags & 4 ) if( a->flags & 4 )
m_free( a->d ); xfree( a->d );
else { else {
#ifdef M_DEBUG #ifdef M_DEBUG
mpi_debug_free_limb_space(a->d, "alloc_opaque"); mpi_debug_free_limb_space(a->d, "alloc_opaque");
@ -351,8 +351,8 @@ mpi_copy( MPI a )
MPI b; MPI b;
if( a && (a->flags & 4) ) { if( a && (a->flags & 4) ) {
void *p = m_is_secure(a->d)? m_alloc_secure( a->nbits ) void *p = m_is_secure(a->d)? xmalloc_secure( a->nbits )
: m_alloc( a->nbits ); : xmalloc( a->nbits );
memcpy( p, a->d, a->nbits ); memcpy( p, a->d, a->nbits );
b = mpi_set_opaque( NULL, p, a->nbits ); b = mpi_set_opaque( NULL, p, a->nbits );
} }
@ -392,8 +392,8 @@ mpi_alloc_like( MPI a )
MPI b; MPI b;
if( a && (a->flags & 4) ) { if( a && (a->flags & 4) ) {
void *p = m_is_secure(a->d)? m_alloc_secure( a->nbits ) void *p = m_is_secure(a->d)? xmalloc_secure( a->nbits )
: m_alloc( a->nbits ); : xmalloc( a->nbits );
memcpy( p, a->d, a->nbits ); memcpy( p, a->d, a->nbits );
b = mpi_set_opaque( NULL, p, a->nbits ); b = mpi_set_opaque( NULL, p, a->nbits );
} }

63
po/be.po
View File

@ -6,7 +6,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: gnupg 1.2.2\n" "Project-Id-Version: gnupg 1.2.2\n"
"Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n"
"POT-Creation-Date: 2005-07-26 18:08+0200\n" "POT-Creation-Date: 2005-07-27 19:41+0200\n"
"PO-Revision-Date: 2003-10-30 16:35+0200\n" "PO-Revision-Date: 2003-10-30 16:35+0200\n"
"Last-Translator: Ales Nyakhaychyk <nab@mail.by>\n" "Last-Translator: Ales Nyakhaychyk <nab@mail.by>\n"
"Language-Team: Belarusian <i18n@mova.org>\n" "Language-Team: Belarusian <i18n@mova.org>\n"
@ -705,13 +705,13 @@ msgstr "немагчыма адкрыць \"%s\"\n"
msgid "--output doesn't work for this command\n" msgid "--output doesn't work for this command\n"
msgstr "" msgstr ""
#: g10/delkey.c:75 g10/export.c:178 g10/keyedit.c:3360 g10/keyserver.c:1569 #: g10/delkey.c:75 g10/export.c:178 g10/keyedit.c:3360 g10/keyserver.c:1571
#: g10/revoke.c:227 #: g10/revoke.c:227
#, fuzzy, c-format #, fuzzy, c-format
msgid "key \"%s\" not found: %s\n" msgid "key \"%s\" not found: %s\n"
msgstr "грамадскі ключ ня знойдзены" msgstr "грамадскі ключ ня знойдзены"
#: g10/delkey.c:83 g10/export.c:208 g10/import.c:2334 g10/keyserver.c:1583 #: g10/delkey.c:83 g10/export.c:208 g10/import.c:2334 g10/keyserver.c:1585
#: g10/revoke.c:233 g10/revoke.c:440 #: g10/revoke.c:233 g10/revoke.c:440
#, c-format #, c-format
msgid "error reading keyblock: %s\n" msgid "error reading keyblock: %s\n"
@ -908,12 +908,21 @@ msgstr "Ключ абаронены.\n"
msgid "key %s: PGP 2.x style key - skipped\n" msgid "key %s: PGP 2.x style key - skipped\n"
msgstr "" msgstr ""
#: g10/export.c:454 #: g10/export.c:409
msgid "about to export an unprotected subkey\n"
msgstr ""
#: g10/export.c:432
#, fuzzy, c-format
msgid "failed to unprotect the subkey: %s\n"
msgstr "%s: немагчыма стварыць хэш-табліцу: %s\n"
#: g10/export.c:453
#, c-format #, c-format
msgid "WARNING: secret key %s does not have a simple SK checksum\n" msgid "WARNING: secret key %s does not have a simple SK checksum\n"
msgstr "" msgstr ""
#: g10/export.c:486 #: g10/export.c:485
msgid "WARNING: nothing exported\n" msgid "WARNING: nothing exported\n"
msgstr "" msgstr ""
@ -3868,7 +3877,7 @@ msgstr ""
msgid "Enter number(s), N)ext, or Q)uit > " msgid "Enter number(s), N)ext, or Q)uit > "
msgstr "" msgstr ""
#: g10/keyserver.c:724 g10/keyserver.c:1294 #: g10/keyserver.c:724 g10/keyserver.c:1296
#, fuzzy, c-format #, fuzzy, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n" msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "недапушчальныя выбары экспартаваньня\n" msgstr "недапушчальныя выбары экспартаваньня\n"
@ -3883,104 +3892,104 @@ msgstr "грамадскі ключ ня знойдзены"
msgid "key not found on keyserver\n" msgid "key not found on keyserver\n"
msgstr "экспартаваць ключы на паслужнік ключоў" msgstr "экспартаваць ключы на паслужнік ключоў"
#: g10/keyserver.c:1041 #: g10/keyserver.c:1043
#, fuzzy, c-format #, fuzzy, c-format
msgid "requesting key %s from %s server %s\n" msgid "requesting key %s from %s server %s\n"
msgstr "імпартаваць ключы з паслужніка ключоў" msgstr "імпартаваць ключы з паслужніка ключоў"
#: g10/keyserver.c:1045 #: g10/keyserver.c:1047
#, c-format #, c-format
msgid "requesting key %s from %s\n" msgid "requesting key %s from %s\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1197 #: g10/keyserver.c:1199
#, c-format #, c-format
msgid "sending key %s to %s server %s\n" msgid "sending key %s to %s server %s\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1201 #: g10/keyserver.c:1203
#, fuzzy, c-format #, fuzzy, c-format
msgid "sending key %s to %s\n" msgid "sending key %s to %s\n"
msgstr "грамадскі ключ ня знойдзены" msgstr "грамадскі ключ ня знойдзены"
#: g10/keyserver.c:1244 #: g10/keyserver.c:1246
#, c-format #, c-format
msgid "searching for \"%s\" from %s server %s\n" msgid "searching for \"%s\" from %s server %s\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1247 #: g10/keyserver.c:1249
#, c-format #, c-format
msgid "searching for \"%s\" from %s\n" msgid "searching for \"%s\" from %s\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1254 g10/keyserver.c:1349 #: g10/keyserver.c:1256 g10/keyserver.c:1351
#, fuzzy #, fuzzy
msgid "no keyserver action!\n" msgid "no keyserver action!\n"
msgstr "недапушчальныя выбары экспартаваньня\n" msgstr "недапушчальныя выбары экспартаваньня\n"
#: g10/keyserver.c:1302 #: g10/keyserver.c:1304
#, c-format #, c-format
msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n" msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1311 #: g10/keyserver.c:1313
msgid "keyserver did not send VERSION\n" msgid "keyserver did not send VERSION\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1371 #: g10/keyserver.c:1373
msgid "no keyserver known (use option --keyserver)\n" msgid "no keyserver known (use option --keyserver)\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1377 #: g10/keyserver.c:1379
msgid "external keyserver calls are not supported in this build\n" msgid "external keyserver calls are not supported in this build\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1389 #: g10/keyserver.c:1391
#, c-format #, c-format
msgid "no handler for keyserver scheme `%s'\n" msgid "no handler for keyserver scheme `%s'\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1394 #: g10/keyserver.c:1396
#, c-format #, c-format
msgid "action `%s' not supported with keyserver scheme `%s'\n" msgid "action `%s' not supported with keyserver scheme `%s'\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1402 #: g10/keyserver.c:1404
#, c-format #, c-format
msgid "%s does not support handler version %d\n" msgid "%s does not support handler version %d\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1409 #: g10/keyserver.c:1411
#, fuzzy #, fuzzy
msgid "keyserver timed out\n" msgid "keyserver timed out\n"
msgstr "збой падпісаньня: %s\n" msgstr "збой падпісаньня: %s\n"
#: g10/keyserver.c:1414 #: g10/keyserver.c:1416
#, fuzzy #, fuzzy
msgid "keyserver internal error\n" msgid "keyserver internal error\n"
msgstr "агульная памылка" msgstr "агульная памылка"
#: g10/keyserver.c:1423 #: g10/keyserver.c:1425
#, fuzzy, c-format #, fuzzy, c-format
msgid "keyserver communications error: %s\n" msgid "keyserver communications error: %s\n"
msgstr "збой падпісаньня: %s\n" msgstr "збой падпісаньня: %s\n"
#: g10/keyserver.c:1448 g10/keyserver.c:1482 #: g10/keyserver.c:1450 g10/keyserver.c:1484
#, c-format #, c-format
msgid "\"%s\" not a key ID: skipping\n" msgid "\"%s\" not a key ID: skipping\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1739 #: g10/keyserver.c:1741
#, c-format #, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n" msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1761 #: g10/keyserver.c:1763
#, c-format #, c-format
msgid "refreshing 1 key from %s\n" msgid "refreshing 1 key from %s\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1763 #: g10/keyserver.c:1765
#, c-format #, c-format
msgid "refreshing %d keys from %s\n" msgid "refreshing %d keys from %s\n"
msgstr "" msgstr ""

63
po/ca.po
View File

@ -27,7 +27,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: gnupg 1.4.0\n" "Project-Id-Version: gnupg 1.4.0\n"
"Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n"
"POT-Creation-Date: 2005-07-26 18:08+0200\n" "POT-Creation-Date: 2005-07-27 19:41+0200\n"
"PO-Revision-Date: 2005-02-04 02:04+0100\n" "PO-Revision-Date: 2005-02-04 02:04+0100\n"
"Last-Translator: Jordi Mallach <jordi@gnu.org>\n" "Last-Translator: Jordi Mallach <jordi@gnu.org>\n"
"Language-Team: Catalan <ca@dodds.net>\n" "Language-Team: Catalan <ca@dodds.net>\n"
@ -758,13 +758,13 @@ msgstr "no s'ha pogut obrir «%s»\n"
msgid "--output doesn't work for this command\n" msgid "--output doesn't work for this command\n"
msgstr "--output no funciona per a aquesta ordre\n" msgstr "--output no funciona per a aquesta ordre\n"
#: g10/delkey.c:75 g10/export.c:178 g10/keyedit.c:3360 g10/keyserver.c:1569 #: g10/delkey.c:75 g10/export.c:178 g10/keyedit.c:3360 g10/keyserver.c:1571
#: g10/revoke.c:227 #: g10/revoke.c:227
#, fuzzy, c-format #, fuzzy, c-format
msgid "key \"%s\" not found: %s\n" msgid "key \"%s\" not found: %s\n"
msgstr "no s'ha trobat la clau «%s»: %s\n" msgstr "no s'ha trobat la clau «%s»: %s\n"
#: g10/delkey.c:83 g10/export.c:208 g10/import.c:2334 g10/keyserver.c:1583 #: g10/delkey.c:83 g10/export.c:208 g10/import.c:2334 g10/keyserver.c:1585
#: g10/revoke.c:233 g10/revoke.c:440 #: g10/revoke.c:233 g10/revoke.c:440
#, c-format #, c-format
msgid "error reading keyblock: %s\n" msgid "error reading keyblock: %s\n"
@ -982,12 +982,21 @@ msgstr "clau %08lX: no està protegida - es descarta\n"
msgid "key %s: PGP 2.x style key - skipped\n" msgid "key %s: PGP 2.x style key - skipped\n"
msgstr "clau %08lX: clau d'estil PGP 2.x - es descarta\n" msgstr "clau %08lX: clau d'estil PGP 2.x - es descarta\n"
#: g10/export.c:454 #: g10/export.c:409
msgid "about to export an unprotected subkey\n"
msgstr ""
#: g10/export.c:432
#, fuzzy, c-format
msgid "failed to unprotect the subkey: %s\n"
msgstr "no s'ha pogut inicialitzar la base de dades de confiança: %s\n"
#: g10/export.c:453
#, fuzzy, c-format #, fuzzy, c-format
msgid "WARNING: secret key %s does not have a simple SK checksum\n" msgid "WARNING: secret key %s does not have a simple SK checksum\n"
msgstr "AVÍS: la clau secreta %08lX no te una simple suma de comprovació SK\n" msgstr "AVÍS: la clau secreta %08lX no te una simple suma de comprovació SK\n"
#: g10/export.c:486 #: g10/export.c:485
msgid "WARNING: nothing exported\n" msgid "WARNING: nothing exported\n"
msgstr "AVÍS: no s'ha exportat res\n" msgstr "AVÍS: no s'ha exportat res\n"
@ -4278,7 +4287,7 @@ msgstr "disable"
msgid "Enter number(s), N)ext, or Q)uit > " msgid "Enter number(s), N)ext, or Q)uit > "
msgstr "" msgstr ""
#: g10/keyserver.c:724 g10/keyserver.c:1294 #: g10/keyserver.c:724 g10/keyserver.c:1296
#, c-format #, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n" msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "" msgstr ""
@ -4293,107 +4302,107 @@ msgstr "no s'ha trobat la clau «%s»: %s\n"
msgid "key not found on keyserver\n" msgid "key not found on keyserver\n"
msgstr "no s'ha trobat la clau «%s»: %s\n" msgstr "no s'ha trobat la clau «%s»: %s\n"
#: g10/keyserver.c:1041 #: g10/keyserver.c:1043
#, fuzzy, c-format #, fuzzy, c-format
msgid "requesting key %s from %s server %s\n" msgid "requesting key %s from %s server %s\n"
msgstr "s'està sol·licitant la clau %08lX de %s\n" msgstr "s'està sol·licitant la clau %08lX de %s\n"
#: g10/keyserver.c:1045 #: g10/keyserver.c:1047
#, fuzzy, c-format #, fuzzy, c-format
msgid "requesting key %s from %s\n" msgid "requesting key %s from %s\n"
msgstr "s'està sol·licitant la clau %08lX de %s\n" msgstr "s'està sol·licitant la clau %08lX de %s\n"
#: g10/keyserver.c:1197 #: g10/keyserver.c:1199
#, fuzzy, c-format #, fuzzy, c-format
msgid "sending key %s to %s server %s\n" msgid "sending key %s to %s server %s\n"
msgstr "s'està cercant «%s» al servidor HKP %s\n" msgstr "s'està cercant «%s» al servidor HKP %s\n"
#: g10/keyserver.c:1201 #: g10/keyserver.c:1203
#, fuzzy, c-format #, fuzzy, c-format
msgid "sending key %s to %s\n" msgid "sending key %s to %s\n"
msgstr "s'està sol·licitant la clau %08lX de %s\n" msgstr "s'està sol·licitant la clau %08lX de %s\n"
#: g10/keyserver.c:1244 #: g10/keyserver.c:1246
#, fuzzy, c-format #, fuzzy, c-format
msgid "searching for \"%s\" from %s server %s\n" msgid "searching for \"%s\" from %s server %s\n"
msgstr "s'està cercant «%s» al servidor HKP %s\n" msgstr "s'està cercant «%s» al servidor HKP %s\n"
#: g10/keyserver.c:1247 #: g10/keyserver.c:1249
#, fuzzy, c-format #, fuzzy, c-format
msgid "searching for \"%s\" from %s\n" msgid "searching for \"%s\" from %s\n"
msgstr "s'està cercant «%s» al servidor HKP %s\n" msgstr "s'està cercant «%s» al servidor HKP %s\n"
# «del servidor», «en el servidor»? ivb # «del servidor», «en el servidor»? ivb
#: g10/keyserver.c:1254 g10/keyserver.c:1349 #: g10/keyserver.c:1256 g10/keyserver.c:1351
#, fuzzy #, fuzzy
msgid "no keyserver action!\n" msgid "no keyserver action!\n"
msgstr "error de servidor de claus" msgstr "error de servidor de claus"
#: g10/keyserver.c:1302 #: g10/keyserver.c:1304
#, c-format #, c-format
msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n" msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1311 #: g10/keyserver.c:1313
msgid "keyserver did not send VERSION\n" msgid "keyserver did not send VERSION\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1371 #: g10/keyserver.c:1373
msgid "no keyserver known (use option --keyserver)\n" msgid "no keyserver known (use option --keyserver)\n"
msgstr "no es coneix cap servidor de claus (useu l'opció \"--keyserver\")\n" msgstr "no es coneix cap servidor de claus (useu l'opció \"--keyserver\")\n"
#: g10/keyserver.c:1377 #: g10/keyserver.c:1379
msgid "external keyserver calls are not supported in this build\n" msgid "external keyserver calls are not supported in this build\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1389 #: g10/keyserver.c:1391
#, c-format #, c-format
msgid "no handler for keyserver scheme `%s'\n" msgid "no handler for keyserver scheme `%s'\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1394 #: g10/keyserver.c:1396
#, c-format #, c-format
msgid "action `%s' not supported with keyserver scheme `%s'\n" msgid "action `%s' not supported with keyserver scheme `%s'\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1402 #: g10/keyserver.c:1404
#, c-format #, c-format
msgid "%s does not support handler version %d\n" msgid "%s does not support handler version %d\n"
msgstr "" msgstr ""
# «del servidor», «en el servidor»? ivb # «del servidor», «en el servidor»? ivb
#: g10/keyserver.c:1409 #: g10/keyserver.c:1411
#, fuzzy #, fuzzy
msgid "keyserver timed out\n" msgid "keyserver timed out\n"
msgstr "error de servidor de claus" msgstr "error de servidor de claus"
# «del servidor», «en el servidor»? ivb # «del servidor», «en el servidor»? ivb
#: g10/keyserver.c:1414 #: g10/keyserver.c:1416
#, fuzzy #, fuzzy
msgid "keyserver internal error\n" msgid "keyserver internal error\n"
msgstr "error de servidor de claus" msgstr "error de servidor de claus"
#: g10/keyserver.c:1423 #: g10/keyserver.c:1425
#, fuzzy, c-format #, fuzzy, c-format
msgid "keyserver communications error: %s\n" msgid "keyserver communications error: %s\n"
msgstr "la recepció des del servidor de claus ha fallat: %s\n" msgstr "la recepció des del servidor de claus ha fallat: %s\n"
#: g10/keyserver.c:1448 g10/keyserver.c:1482 #: g10/keyserver.c:1450 g10/keyserver.c:1484
#, fuzzy, c-format #, fuzzy, c-format
msgid "\"%s\" not a key ID: skipping\n" msgid "\"%s\" not a key ID: skipping\n"
msgstr "%s: no és un ID vàlid\n" msgstr "%s: no és un ID vàlid\n"
#: g10/keyserver.c:1739 #: g10/keyserver.c:1741
#, fuzzy, c-format #, fuzzy, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n" msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr "AVÍS: no s'ha pogut eliminar el fitxer temporal (%s) «%s»: %s\n" msgstr "AVÍS: no s'ha pogut eliminar el fitxer temporal (%s) «%s»: %s\n"
#: g10/keyserver.c:1761 #: g10/keyserver.c:1763
#, fuzzy, c-format #, fuzzy, c-format
msgid "refreshing 1 key from %s\n" msgid "refreshing 1 key from %s\n"
msgstr "s'està sol·licitant la clau %08lX de %s\n" msgstr "s'està sol·licitant la clau %08lX de %s\n"
#: g10/keyserver.c:1763 #: g10/keyserver.c:1765
#, fuzzy, c-format #, fuzzy, c-format
msgid "refreshing %d keys from %s\n" msgid "refreshing %d keys from %s\n"
msgstr "s'està sol·licitant la clau %08lX de %s\n" msgstr "s'està sol·licitant la clau %08lX de %s\n"

63
po/cs.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: gnupg-1.3.92\n" "Project-Id-Version: gnupg-1.3.92\n"
"Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n"
"POT-Creation-Date: 2005-07-26 18:08+0200\n" "POT-Creation-Date: 2005-07-27 19:41+0200\n"
"PO-Revision-Date: 2004-11-26 09:12+0200\n" "PO-Revision-Date: 2004-11-26 09:12+0200\n"
"Last-Translator: Roman Pavlik <rp@tns.cz>\n" "Last-Translator: Roman Pavlik <rp@tns.cz>\n"
"Language-Team: Czech <translations.cs@gnupg.cz>\n" "Language-Team: Czech <translations.cs@gnupg.cz>\n"
@ -701,13 +701,13 @@ msgstr "nelze otev
msgid "--output doesn't work for this command\n" msgid "--output doesn't work for this command\n"
msgstr "--output pro tento pøíkaz není platný\n" msgstr "--output pro tento pøíkaz není platný\n"
#: g10/delkey.c:75 g10/export.c:178 g10/keyedit.c:3360 g10/keyserver.c:1569 #: g10/delkey.c:75 g10/export.c:178 g10/keyedit.c:3360 g10/keyserver.c:1571
#: g10/revoke.c:227 #: g10/revoke.c:227
#, c-format #, c-format
msgid "key \"%s\" not found: %s\n" msgid "key \"%s\" not found: %s\n"
msgstr "klíè \"%s\" nenalezen: %s\n" msgstr "klíè \"%s\" nenalezen: %s\n"
#: g10/delkey.c:83 g10/export.c:208 g10/import.c:2334 g10/keyserver.c:1583 #: g10/delkey.c:83 g10/export.c:208 g10/import.c:2334 g10/keyserver.c:1585
#: g10/revoke.c:233 g10/revoke.c:440 #: g10/revoke.c:233 g10/revoke.c:440
#, c-format #, c-format
msgid "error reading keyblock: %s\n" msgid "error reading keyblock: %s\n"
@ -911,12 +911,21 @@ msgstr "kl
msgid "key %s: PGP 2.x style key - skipped\n" msgid "key %s: PGP 2.x style key - skipped\n"
msgstr "klíè %s: PGP 2.x klíè - pøeskoèeno\n" msgstr "klíè %s: PGP 2.x klíè - pøeskoèeno\n"
#: g10/export.c:454 #: g10/export.c:409
msgid "about to export an unprotected subkey\n"
msgstr ""
#: g10/export.c:432
#, fuzzy, c-format
msgid "failed to unprotect the subkey: %s\n"
msgstr "nelze ulo¾it klíè: %s\n"
#: g10/export.c:453
#, c-format #, c-format
msgid "WARNING: secret key %s does not have a simple SK checksum\n" msgid "WARNING: secret key %s does not have a simple SK checksum\n"
msgstr "VAROVÁNÍ: tajný klíè %s není chránìn pomocí simple SK checksum\n" msgstr "VAROVÁNÍ: tajný klíè %s není chránìn pomocí simple SK checksum\n"
#: g10/export.c:486 #: g10/export.c:485
msgid "WARNING: nothing exported\n" msgid "WARNING: nothing exported\n"
msgstr "VAROVÁNÍ: nebylo nic vyexportováno\n" msgstr "VAROVÁNÍ: nebylo nic vyexportováno\n"
@ -4068,7 +4077,7 @@ msgstr "disabled"
msgid "Enter number(s), N)ext, or Q)uit > " msgid "Enter number(s), N)ext, or Q)uit > "
msgstr "Vlo¾te èíslo (èísla), 'N' pro dal¹í nebo 'Q' pro konec> " msgstr "Vlo¾te èíslo (èísla), 'N' pro dal¹í nebo 'Q' pro konec> "
#: g10/keyserver.c:724 g10/keyserver.c:1294 #: g10/keyserver.c:724 g10/keyserver.c:1296
#, c-format #, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n" msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "neplatný protokol serveru klíèù (us %d!=handler %d)\n" msgstr "neplatný protokol serveru klíèù (us %d!=handler %d)\n"
@ -4082,101 +4091,101 @@ msgstr "kl
msgid "key not found on keyserver\n" msgid "key not found on keyserver\n"
msgstr "klíè nebyl na serveru klíèù nalezen\n" msgstr "klíè nebyl na serveru klíèù nalezen\n"
#: g10/keyserver.c:1041 #: g10/keyserver.c:1043
#, c-format #, c-format
msgid "requesting key %s from %s server %s\n" msgid "requesting key %s from %s server %s\n"
msgstr "po¾aduji klíè %s ze %s server %s\n" msgstr "po¾aduji klíè %s ze %s server %s\n"
#: g10/keyserver.c:1045 #: g10/keyserver.c:1047
#, c-format #, c-format
msgid "requesting key %s from %s\n" msgid "requesting key %s from %s\n"
msgstr "po¾aduji klíè %s z %s\n" msgstr "po¾aduji klíè %s z %s\n"
#: g10/keyserver.c:1197 #: g10/keyserver.c:1199
#, c-format #, c-format
msgid "sending key %s to %s server %s\n" msgid "sending key %s to %s server %s\n"
msgstr "posílám klíè %s na %s server %s\n" msgstr "posílám klíè %s na %s server %s\n"
#: g10/keyserver.c:1201 #: g10/keyserver.c:1203
#, c-format #, c-format
msgid "sending key %s to %s\n" msgid "sending key %s to %s\n"
msgstr "posílám klíè %s na %s\n" msgstr "posílám klíè %s na %s\n"
#: g10/keyserver.c:1244 #: g10/keyserver.c:1246
#, c-format #, c-format
msgid "searching for \"%s\" from %s server %s\n" msgid "searching for \"%s\" from %s server %s\n"
msgstr "vyhledávám \"%s\" na %s serveru %s\n" msgstr "vyhledávám \"%s\" na %s serveru %s\n"
#: g10/keyserver.c:1247 #: g10/keyserver.c:1249
#, c-format #, c-format
msgid "searching for \"%s\" from %s\n" msgid "searching for \"%s\" from %s\n"
msgstr "vyhledávám \"%s\" na serveru %s\n" msgstr "vyhledávám \"%s\" na serveru %s\n"
#: g10/keyserver.c:1254 g10/keyserver.c:1349 #: g10/keyserver.c:1256 g10/keyserver.c:1351
msgid "no keyserver action!\n" msgid "no keyserver action!\n"
msgstr "¾ádná operace se serverem klíèù!\n" msgstr "¾ádná operace se serverem klíèù!\n"
#: g10/keyserver.c:1302 #: g10/keyserver.c:1304
#, c-format #, c-format
msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n" msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
msgstr "VAROVÁNÍ: keyserver handler z jiné verze GnuPG (%s)\n" msgstr "VAROVÁNÍ: keyserver handler z jiné verze GnuPG (%s)\n"
#: g10/keyserver.c:1311 #: g10/keyserver.c:1313
msgid "keyserver did not send VERSION\n" msgid "keyserver did not send VERSION\n"
msgstr "server klíèù neposlal VERSION\n" msgstr "server klíèù neposlal VERSION\n"
#: g10/keyserver.c:1371 #: g10/keyserver.c:1373
msgid "no keyserver known (use option --keyserver)\n" msgid "no keyserver known (use option --keyserver)\n"
msgstr "¾adný server klíèù není znám (pou¾íjte volbu --keyserver)\n" msgstr "¾adný server klíèù není znám (pou¾íjte volbu --keyserver)\n"
#: g10/keyserver.c:1377 #: g10/keyserver.c:1379
msgid "external keyserver calls are not supported in this build\n" msgid "external keyserver calls are not supported in this build\n"
msgstr "volání externího keyserver není v této verzi podporováno\n" msgstr "volání externího keyserver není v této verzi podporováno\n"
#: g10/keyserver.c:1389 #: g10/keyserver.c:1391
#, c-format #, c-format
msgid "no handler for keyserver scheme `%s'\n" msgid "no handler for keyserver scheme `%s'\n"
msgstr "protokol serveru klíèù `%s' není podporován\n" msgstr "protokol serveru klíèù `%s' není podporován\n"
#: g10/keyserver.c:1394 #: g10/keyserver.c:1396
#, c-format #, c-format
msgid "action `%s' not supported with keyserver scheme `%s'\n" msgid "action `%s' not supported with keyserver scheme `%s'\n"
msgstr "akce `%s' není podporována v protokolu `%s' serveru klíèù\n" msgstr "akce `%s' není podporována v protokolu `%s' serveru klíèù\n"
#: g10/keyserver.c:1402 #: g10/keyserver.c:1404
#, c-format #, c-format
msgid "%s does not support handler version %d\n" msgid "%s does not support handler version %d\n"
msgstr "%s nepodporuje protokol verze %d\n" msgstr "%s nepodporuje protokol verze %d\n"
#: g10/keyserver.c:1409 #: g10/keyserver.c:1411
msgid "keyserver timed out\n" msgid "keyserver timed out\n"
msgstr "èasový limit pro server klíèù vypr¹el\n" msgstr "èasový limit pro server klíèù vypr¹el\n"
#: g10/keyserver.c:1414 #: g10/keyserver.c:1416
msgid "keyserver internal error\n" msgid "keyserver internal error\n"
msgstr "interní chyba serveru klíèù\n" msgstr "interní chyba serveru klíèù\n"
#: g10/keyserver.c:1423 #: g10/keyserver.c:1425
#, c-format #, c-format
msgid "keyserver communications error: %s\n" msgid "keyserver communications error: %s\n"
msgstr "chyba komunikace se serverem klíèù: %s\n" msgstr "chyba komunikace se serverem klíèù: %s\n"
#: g10/keyserver.c:1448 g10/keyserver.c:1482 #: g10/keyserver.c:1450 g10/keyserver.c:1484
#, c-format #, c-format
msgid "\"%s\" not a key ID: skipping\n" msgid "\"%s\" not a key ID: skipping\n"
msgstr "\"%s\" není ID klíèe: pøeskoèeno\n" msgstr "\"%s\" není ID klíèe: pøeskoèeno\n"
#: g10/keyserver.c:1739 #: g10/keyserver.c:1741
#, c-format #, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n" msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr "VAROVÁNÍ: nelze aktualizovat klíè %s prostøednictvím %s: %s\n" msgstr "VAROVÁNÍ: nelze aktualizovat klíè %s prostøednictvím %s: %s\n"
#: g10/keyserver.c:1761 #: g10/keyserver.c:1763
#, c-format #, c-format
msgid "refreshing 1 key from %s\n" msgid "refreshing 1 key from %s\n"
msgstr "aktualizuji 1 klíè z %s\n" msgstr "aktualizuji 1 klíè z %s\n"
#: g10/keyserver.c:1763 #: g10/keyserver.c:1765
#, c-format #, c-format
msgid "refreshing %d keys from %s\n" msgid "refreshing %d keys from %s\n"
msgstr "aktualizuji %d klíèù z %s\n" msgstr "aktualizuji %d klíèù z %s\n"

64
po/da.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: gnupg 1.0.0h\n" "Project-Id-Version: gnupg 1.0.0h\n"
"Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n"
"POT-Creation-Date: 2005-07-26 18:08+0200\n" "POT-Creation-Date: 2005-07-27 19:41+0200\n"
"PO-Revision-Date: 2003-12-03 16:11+0100\n" "PO-Revision-Date: 2003-12-03 16:11+0100\n"
"Last-Translator: Birger Langkjer <birger.langkjer@image.dk>\n" "Last-Translator: Birger Langkjer <birger.langkjer@image.dk>\n"
"Language-Team: Danish <dansk@klid.dk>\n" "Language-Team: Danish <dansk@klid.dk>\n"
@ -731,13 +731,13 @@ msgstr "kan ikke
msgid "--output doesn't work for this command\n" msgid "--output doesn't work for this command\n"
msgstr "" msgstr ""
#: g10/delkey.c:75 g10/export.c:178 g10/keyedit.c:3360 g10/keyserver.c:1569 #: g10/delkey.c:75 g10/export.c:178 g10/keyedit.c:3360 g10/keyserver.c:1571
#: g10/revoke.c:227 #: g10/revoke.c:227
#, fuzzy, c-format #, fuzzy, c-format
msgid "key \"%s\" not found: %s\n" msgid "key \"%s\" not found: %s\n"
msgstr "%s: bruger ikke fundet: %s\n" msgstr "%s: bruger ikke fundet: %s\n"
#: g10/delkey.c:83 g10/export.c:208 g10/import.c:2334 g10/keyserver.c:1583 #: g10/delkey.c:83 g10/export.c:208 g10/import.c:2334 g10/keyserver.c:1585
#: g10/revoke.c:233 g10/revoke.c:440 #: g10/revoke.c:233 g10/revoke.c:440
#, fuzzy, c-format #, fuzzy, c-format
msgid "error reading keyblock: %s\n" msgid "error reading keyblock: %s\n"
@ -934,12 +934,22 @@ msgstr "n
msgid "key %s: PGP 2.x style key - skipped\n" msgid "key %s: PGP 2.x style key - skipped\n"
msgstr "nøgle %08lX: ikke en rfc2440 nøgle - udeladt\n" msgstr "nøgle %08lX: ikke en rfc2440 nøgle - udeladt\n"
#: g10/export.c:454 #: g10/export.c:409
msgid "about to export an unprotected subkey\n"
msgstr ""
# er det klogt at oversætte TrustDB?
#: g10/export.c:432
#, fuzzy, c-format
msgid "failed to unprotect the subkey: %s\n"
msgstr "kunne ikke initialisere TillidsDB: %s\n"
#: g10/export.c:453
#, c-format #, c-format
msgid "WARNING: secret key %s does not have a simple SK checksum\n" msgid "WARNING: secret key %s does not have a simple SK checksum\n"
msgstr "" msgstr ""
#: g10/export.c:486 #: g10/export.c:485
msgid "WARNING: nothing exported\n" msgid "WARNING: nothing exported\n"
msgstr "ADVARSEL: intet blev eksporteret\n" msgstr "ADVARSEL: intet blev eksporteret\n"
@ -3986,7 +3996,7 @@ msgstr "sl
msgid "Enter number(s), N)ext, or Q)uit > " msgid "Enter number(s), N)ext, or Q)uit > "
msgstr "" msgstr ""
#: g10/keyserver.c:724 g10/keyserver.c:1294 #: g10/keyserver.c:724 g10/keyserver.c:1296
#, fuzzy, c-format #, fuzzy, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n" msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "ugyldig nøglering" msgstr "ugyldig nøglering"
@ -4001,104 +4011,104 @@ msgstr "%s: bruger ikke fundet: %s\n"
msgid "key not found on keyserver\n" msgid "key not found on keyserver\n"
msgstr "%s: bruger ikke fundet: %s\n" msgstr "%s: bruger ikke fundet: %s\n"
#: g10/keyserver.c:1041 #: g10/keyserver.c:1043
#, fuzzy, c-format #, fuzzy, c-format
msgid "requesting key %s from %s server %s\n" msgid "requesting key %s from %s server %s\n"
msgstr "importér nøgler fra en nøgleserver: %s\n" msgstr "importér nøgler fra en nøgleserver: %s\n"
#: g10/keyserver.c:1045 #: g10/keyserver.c:1047
#, fuzzy, c-format #, fuzzy, c-format
msgid "requesting key %s from %s\n" msgid "requesting key %s from %s\n"
msgstr "importér nøgler fra en nøgleserver: %s\n" msgstr "importér nøgler fra en nøgleserver: %s\n"
#: g10/keyserver.c:1197 #: g10/keyserver.c:1199
#, c-format #, c-format
msgid "sending key %s to %s server %s\n" msgid "sending key %s to %s server %s\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1201 #: g10/keyserver.c:1203
#, fuzzy, c-format #, fuzzy, c-format
msgid "sending key %s to %s\n" msgid "sending key %s to %s\n"
msgstr "importér nøgler fra en nøgleserver: %s\n" msgstr "importér nøgler fra en nøgleserver: %s\n"
#: g10/keyserver.c:1244 #: g10/keyserver.c:1246
#, fuzzy, c-format #, fuzzy, c-format
msgid "searching for \"%s\" from %s server %s\n" msgid "searching for \"%s\" from %s server %s\n"
msgstr "eksportér nøgler til en nøgletjener" msgstr "eksportér nøgler til en nøgletjener"
#: g10/keyserver.c:1247 #: g10/keyserver.c:1249
#, fuzzy, c-format #, fuzzy, c-format
msgid "searching for \"%s\" from %s\n" msgid "searching for \"%s\" from %s\n"
msgstr "læser indstillinger fra `%s'\n" msgstr "læser indstillinger fra `%s'\n"
#: g10/keyserver.c:1254 g10/keyserver.c:1349 #: g10/keyserver.c:1256 g10/keyserver.c:1351
#, fuzzy #, fuzzy
msgid "no keyserver action!\n" msgid "no keyserver action!\n"
msgstr "ugyldig nøglering" msgstr "ugyldig nøglering"
#: g10/keyserver.c:1302 #: g10/keyserver.c:1304
#, c-format #, c-format
msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n" msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1311 #: g10/keyserver.c:1313
msgid "keyserver did not send VERSION\n" msgid "keyserver did not send VERSION\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1371 #: g10/keyserver.c:1373
msgid "no keyserver known (use option --keyserver)\n" msgid "no keyserver known (use option --keyserver)\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1377 #: g10/keyserver.c:1379
msgid "external keyserver calls are not supported in this build\n" msgid "external keyserver calls are not supported in this build\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1389 #: g10/keyserver.c:1391
#, c-format #, c-format
msgid "no handler for keyserver scheme `%s'\n" msgid "no handler for keyserver scheme `%s'\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1394 #: g10/keyserver.c:1396
#, c-format #, c-format
msgid "action `%s' not supported with keyserver scheme `%s'\n" msgid "action `%s' not supported with keyserver scheme `%s'\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1402 #: g10/keyserver.c:1404
#, c-format #, c-format
msgid "%s does not support handler version %d\n" msgid "%s does not support handler version %d\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1409 #: g10/keyserver.c:1411
#, fuzzy #, fuzzy
msgid "keyserver timed out\n" msgid "keyserver timed out\n"
msgstr "generel fejl" msgstr "generel fejl"
#: g10/keyserver.c:1414 #: g10/keyserver.c:1416
#, fuzzy #, fuzzy
msgid "keyserver internal error\n" msgid "keyserver internal error\n"
msgstr "generel fejl" msgstr "generel fejl"
#: g10/keyserver.c:1423 #: g10/keyserver.c:1425
#, fuzzy, c-format #, fuzzy, c-format
msgid "keyserver communications error: %s\n" msgid "keyserver communications error: %s\n"
msgstr "påklædning af beskyttelse fejlede: %s\n" msgstr "påklædning af beskyttelse fejlede: %s\n"
#: g10/keyserver.c:1448 g10/keyserver.c:1482 #: g10/keyserver.c:1450 g10/keyserver.c:1484
#, fuzzy, c-format #, fuzzy, c-format
msgid "\"%s\" not a key ID: skipping\n" msgid "\"%s\" not a key ID: skipping\n"
msgstr "%s er ikke et gyldigt tegnsæt\n" msgstr "%s er ikke et gyldigt tegnsæt\n"
#: g10/keyserver.c:1739 #: g10/keyserver.c:1741
#, c-format #, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n" msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1761 #: g10/keyserver.c:1763
#, fuzzy, c-format #, fuzzy, c-format
msgid "refreshing 1 key from %s\n" msgid "refreshing 1 key from %s\n"
msgstr "importér nøgler fra en nøgleserver: %s\n" msgstr "importér nøgler fra en nøgleserver: %s\n"
#: g10/keyserver.c:1763 #: g10/keyserver.c:1765
#, fuzzy, c-format #, fuzzy, c-format
msgid "refreshing %d keys from %s\n" msgid "refreshing %d keys from %s\n"
msgstr "importér nøgler fra en nøgleserver: %s\n" msgstr "importér nøgler fra en nøgleserver: %s\n"

63
po/de.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: gnupg-1.4.1\n" "Project-Id-Version: gnupg-1.4.1\n"
"Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n"
"POT-Creation-Date: 2005-07-26 18:08+0200\n" "POT-Creation-Date: 2005-07-27 19:41+0200\n"
"PO-Revision-Date: 2005-07-26 20:42+0200\n" "PO-Revision-Date: 2005-07-26 20:42+0200\n"
"Last-Translator: Walter Koch <koch@u32.de>\n" "Last-Translator: Walter Koch <koch@u32.de>\n"
"Language-Team: German <de@li.org>\n" "Language-Team: German <de@li.org>\n"
@ -706,13 +706,13 @@ msgstr "'%s' kann nicht ge
msgid "--output doesn't work for this command\n" msgid "--output doesn't work for this command\n"
msgstr "--output funktioniert nicht bei diesem Kommando\n" msgstr "--output funktioniert nicht bei diesem Kommando\n"
#: g10/delkey.c:75 g10/export.c:178 g10/keyedit.c:3360 g10/keyserver.c:1569 #: g10/delkey.c:75 g10/export.c:178 g10/keyedit.c:3360 g10/keyserver.c:1571
#: g10/revoke.c:227 #: g10/revoke.c:227
#, c-format #, c-format
msgid "key \"%s\" not found: %s\n" msgid "key \"%s\" not found: %s\n"
msgstr "Schlüssel \"%s\" nicht gefunden: %s\n" msgstr "Schlüssel \"%s\" nicht gefunden: %s\n"
#: g10/delkey.c:83 g10/export.c:208 g10/import.c:2334 g10/keyserver.c:1583 #: g10/delkey.c:83 g10/export.c:208 g10/import.c:2334 g10/keyserver.c:1585
#: g10/revoke.c:233 g10/revoke.c:440 #: g10/revoke.c:233 g10/revoke.c:440
#, c-format #, c-format
msgid "error reading keyblock: %s\n" msgid "error reading keyblock: %s\n"
@ -928,13 +928,22 @@ msgstr "Schl
msgid "key %s: PGP 2.x style key - skipped\n" msgid "key %s: PGP 2.x style key - skipped\n"
msgstr "Schlüssel %s: PGP 2.x-artiger Schlüssel - übersprungen\n" msgstr "Schlüssel %s: PGP 2.x-artiger Schlüssel - übersprungen\n"
#: g10/export.c:409
msgid "about to export an unprotected subkey\n"
msgstr ""
#: g10/export.c:432
#, fuzzy, c-format
msgid "failed to unprotect the subkey: %s\n"
msgstr "Speichern des Schlüssels fehlgeschlagen: %s\n"
# translated by wk # translated by wk
#: g10/export.c:454 #: g10/export.c:453
#, c-format #, c-format
msgid "WARNING: secret key %s does not have a simple SK checksum\n" msgid "WARNING: secret key %s does not have a simple SK checksum\n"
msgstr "WARNUNG: Der geheime Schlüssel %s hat keine einfache SK-Prüfsumme\n" msgstr "WARNUNG: Der geheime Schlüssel %s hat keine einfache SK-Prüfsumme\n"
#: g10/export.c:486 #: g10/export.c:485
msgid "WARNING: nothing exported\n" msgid "WARNING: nothing exported\n"
msgstr "WARNUNG: Nichts exportiert\n" msgstr "WARNUNG: Nichts exportiert\n"
@ -4204,7 +4213,7 @@ msgstr "disable"
msgid "Enter number(s), N)ext, or Q)uit > " msgid "Enter number(s), N)ext, or Q)uit > "
msgstr "" msgstr ""
#: g10/keyserver.c:724 g10/keyserver.c:1294 #: g10/keyserver.c:724 g10/keyserver.c:1296
#, fuzzy, c-format #, fuzzy, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n" msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "Ungültige export Option\n" msgstr "Ungültige export Option\n"
@ -4219,107 +4228,107 @@ msgstr "Schl
msgid "key not found on keyserver\n" msgid "key not found on keyserver\n"
msgstr "Schlüssel `%s' nicht gefunden: %s\n" msgstr "Schlüssel `%s' nicht gefunden: %s\n"
#: g10/keyserver.c:1041 #: g10/keyserver.c:1043
#, fuzzy, c-format #, fuzzy, c-format
msgid "requesting key %s from %s server %s\n" msgid "requesting key %s from %s server %s\n"
msgstr "Schlüssel %08lX wird von %s angefordert\n" msgstr "Schlüssel %08lX wird von %s angefordert\n"
#: g10/keyserver.c:1045 #: g10/keyserver.c:1047
#, fuzzy, c-format #, fuzzy, c-format
msgid "requesting key %s from %s\n" msgid "requesting key %s from %s\n"
msgstr "Schlüssel %08lX wird von %s angefordert\n" msgstr "Schlüssel %08lX wird von %s angefordert\n"
#: g10/keyserver.c:1197 #: g10/keyserver.c:1199
#, fuzzy, c-format #, fuzzy, c-format
msgid "sending key %s to %s server %s\n" msgid "sending key %s to %s server %s\n"
msgstr "suche nach \"%s\" auf HKP-Server %s\n" msgstr "suche nach \"%s\" auf HKP-Server %s\n"
#: g10/keyserver.c:1201 #: g10/keyserver.c:1203
#, fuzzy, c-format #, fuzzy, c-format
msgid "sending key %s to %s\n" msgid "sending key %s to %s\n"
msgstr "" msgstr ""
"\"\n" "\"\n"
"unterschrieben mit Ihrem Schlüssel %08lX um %s\n" "unterschrieben mit Ihrem Schlüssel %08lX um %s\n"
#: g10/keyserver.c:1244 #: g10/keyserver.c:1246
#, fuzzy, c-format #, fuzzy, c-format
msgid "searching for \"%s\" from %s server %s\n" msgid "searching for \"%s\" from %s server %s\n"
msgstr "suche nach \"%s\" auf HKP-Server %s\n" msgstr "suche nach \"%s\" auf HKP-Server %s\n"
#: g10/keyserver.c:1247 #: g10/keyserver.c:1249
#, fuzzy, c-format #, fuzzy, c-format
msgid "searching for \"%s\" from %s\n" msgid "searching for \"%s\" from %s\n"
msgstr "suche nach \"%s\" auf HKP-Server %s\n" msgstr "suche nach \"%s\" auf HKP-Server %s\n"
#: g10/keyserver.c:1254 g10/keyserver.c:1349 #: g10/keyserver.c:1256 g10/keyserver.c:1351
#, fuzzy #, fuzzy
msgid "no keyserver action!\n" msgid "no keyserver action!\n"
msgstr "Ungültige export Option\n" msgstr "Ungültige export Option\n"
#: g10/keyserver.c:1302 #: g10/keyserver.c:1304
#, c-format #, c-format
msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n" msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1311 #: g10/keyserver.c:1313
msgid "keyserver did not send VERSION\n" msgid "keyserver did not send VERSION\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1371 #: g10/keyserver.c:1373
msgid "no keyserver known (use option --keyserver)\n" msgid "no keyserver known (use option --keyserver)\n"
msgstr "Kein Schlüsselserver bekannt (Option --keyserver verwenden)\n" msgstr "Kein Schlüsselserver bekannt (Option --keyserver verwenden)\n"
#: g10/keyserver.c:1377 #: g10/keyserver.c:1379
msgid "external keyserver calls are not supported in this build\n" msgid "external keyserver calls are not supported in this build\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1389 #: g10/keyserver.c:1391
#, c-format #, c-format
msgid "no handler for keyserver scheme `%s'\n" msgid "no handler for keyserver scheme `%s'\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1394 #: g10/keyserver.c:1396
#, c-format #, c-format
msgid "action `%s' not supported with keyserver scheme `%s'\n" msgid "action `%s' not supported with keyserver scheme `%s'\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1402 #: g10/keyserver.c:1404
#, c-format #, c-format
msgid "%s does not support handler version %d\n" msgid "%s does not support handler version %d\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1409 #: g10/keyserver.c:1411
#, fuzzy #, fuzzy
msgid "keyserver timed out\n" msgid "keyserver timed out\n"
msgstr "Schlüsselserverfehler" msgstr "Schlüsselserverfehler"
#: g10/keyserver.c:1414 #: g10/keyserver.c:1416
#, fuzzy #, fuzzy
msgid "keyserver internal error\n" msgid "keyserver internal error\n"
msgstr "Schlüsselserverfehler" msgstr "Schlüsselserverfehler"
#: g10/keyserver.c:1423 #: g10/keyserver.c:1425
#, fuzzy, c-format #, fuzzy, c-format
msgid "keyserver communications error: %s\n" msgid "keyserver communications error: %s\n"
msgstr "Empfangen vom Schlüsselserver fehlgeschlagen: %s\n" msgstr "Empfangen vom Schlüsselserver fehlgeschlagen: %s\n"
#: g10/keyserver.c:1448 g10/keyserver.c:1482 #: g10/keyserver.c:1450 g10/keyserver.c:1484
#, fuzzy, c-format #, fuzzy, c-format
msgid "\"%s\" not a key ID: skipping\n" msgid "\"%s\" not a key ID: skipping\n"
msgstr "%s: Dies ist keine gültige Schlüssel-ID\n" msgstr "%s: Dies ist keine gültige Schlüssel-ID\n"
#: g10/keyserver.c:1739 #: g10/keyserver.c:1741
#, fuzzy, c-format #, fuzzy, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n" msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr "" msgstr ""
"WARNUNG: die temporäre Datei (%s) `%s' konnte nicht entfernt werden: %s\n" "WARNUNG: die temporäre Datei (%s) `%s' konnte nicht entfernt werden: %s\n"
#: g10/keyserver.c:1761 #: g10/keyserver.c:1763
#, fuzzy, c-format #, fuzzy, c-format
msgid "refreshing 1 key from %s\n" msgid "refreshing 1 key from %s\n"
msgstr "Schlüssel %08lX wird von %s angefordert\n" msgstr "Schlüssel %08lX wird von %s angefordert\n"
#: g10/keyserver.c:1763 #: g10/keyserver.c:1765
#, fuzzy, c-format #, fuzzy, c-format
msgid "refreshing %d keys from %s\n" msgid "refreshing %d keys from %s\n"
msgstr "Schlüssel %08lX wird von %s angefordert\n" msgstr "Schlüssel %08lX wird von %s angefordert\n"

63
po/el.po
View File

@ -6,7 +6,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: gnupg-1.1.92\n" "Project-Id-Version: gnupg-1.1.92\n"
"Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n"
"POT-Creation-Date: 2005-07-26 18:08+0200\n" "POT-Creation-Date: 2005-07-27 19:41+0200\n"
"PO-Revision-Date: 2003-06-27 12:00+0200\n" "PO-Revision-Date: 2003-06-27 12:00+0200\n"
"Last-Translator: Dokianakis Theofanis <madf@hellug.gr>\n" "Last-Translator: Dokianakis Theofanis <madf@hellug.gr>\n"
"Language-Team: Greek <nls@tux.hellug.gr>\n" "Language-Team: Greek <nls@tux.hellug.gr>\n"
@ -730,13 +730,13 @@ msgstr "
msgid "--output doesn't work for this command\n" msgid "--output doesn't work for this command\n"
msgstr "--output äåí ëåéôïõñãåß ãéá áõôÞ ôçí åíôïëÞ\n" msgstr "--output äåí ëåéôïõñãåß ãéá áõôÞ ôçí åíôïëÞ\n"
#: g10/delkey.c:75 g10/export.c:178 g10/keyedit.c:3360 g10/keyserver.c:1569 #: g10/delkey.c:75 g10/export.c:178 g10/keyedit.c:3360 g10/keyserver.c:1571
#: g10/revoke.c:227 #: g10/revoke.c:227
#, fuzzy, c-format #, fuzzy, c-format
msgid "key \"%s\" not found: %s\n" msgid "key \"%s\" not found: %s\n"
msgstr "ôï êëåéäß '%s' äå âñÝèçêå: %s\n" msgstr "ôï êëåéäß '%s' äå âñÝèçêå: %s\n"
#: g10/delkey.c:83 g10/export.c:208 g10/import.c:2334 g10/keyserver.c:1583 #: g10/delkey.c:83 g10/export.c:208 g10/import.c:2334 g10/keyserver.c:1585
#: g10/revoke.c:233 g10/revoke.c:440 #: g10/revoke.c:233 g10/revoke.c:440
#, c-format #, c-format
msgid "error reading keyblock: %s\n" msgid "error reading keyblock: %s\n"
@ -952,12 +952,21 @@ msgstr "
msgid "key %s: PGP 2.x style key - skipped\n" msgid "key %s: PGP 2.x style key - skipped\n"
msgstr "êëåéäß %08lX: êëåéäß ôýðïõ PGP 2.x - ðáñáëåßöèçêå\n" msgstr "êëåéäß %08lX: êëåéäß ôýðïõ PGP 2.x - ðáñáëåßöèçêå\n"
#: g10/export.c:454 #: g10/export.c:409
msgid "about to export an unprotected subkey\n"
msgstr ""
#: g10/export.c:432
#, fuzzy, c-format
msgid "failed to unprotect the subkey: %s\n"
msgstr "áðïôõ÷ßá áñ÷éêïðïßçóçò ôçò TrustDB: %s\n"
#: g10/export.c:453
#, fuzzy, c-format #, fuzzy, c-format
msgid "WARNING: secret key %s does not have a simple SK checksum\n" msgid "WARNING: secret key %s does not have a simple SK checksum\n"
msgstr "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: ôï ìõóôéêü êëåéäß %08lX äåí Ý÷åé áðëü SK checksum\n" msgstr "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: ôï ìõóôéêü êëåéäß %08lX äåí Ý÷åé áðëü SK checksum\n"
#: g10/export.c:486 #: g10/export.c:485
msgid "WARNING: nothing exported\n" msgid "WARNING: nothing exported\n"
msgstr "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: äåí Ýãéíå êáììßá åîáãùãÞ\n" msgstr "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: äåí Ýãéíå êáììßá åîáãùãÞ\n"
@ -4201,7 +4210,7 @@ msgstr "disable"
msgid "Enter number(s), N)ext, or Q)uit > " msgid "Enter number(s), N)ext, or Q)uit > "
msgstr "" msgstr ""
#: g10/keyserver.c:724 g10/keyserver.c:1294 #: g10/keyserver.c:724 g10/keyserver.c:1296
#, fuzzy, c-format #, fuzzy, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n" msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "ìç Ýãêõñåò åðéëïãÝò åîáãùãÞò\n" msgstr "ìç Ýãêõñåò åðéëïãÝò åîáãùãÞò\n"
@ -4216,106 +4225,106 @@ msgstr "
msgid "key not found on keyserver\n" msgid "key not found on keyserver\n"
msgstr "ôï êëåéäß '%s' äå âñÝèçêå: %s\n" msgstr "ôï êëåéäß '%s' äå âñÝèçêå: %s\n"
#: g10/keyserver.c:1041 #: g10/keyserver.c:1043
#, fuzzy, c-format #, fuzzy, c-format
msgid "requesting key %s from %s server %s\n" msgid "requesting key %s from %s server %s\n"
msgstr "áßôçóç êëåéäéïý %08lX áðü ôï %s\n" msgstr "áßôçóç êëåéäéïý %08lX áðü ôï %s\n"
#: g10/keyserver.c:1045 #: g10/keyserver.c:1047
#, fuzzy, c-format #, fuzzy, c-format
msgid "requesting key %s from %s\n" msgid "requesting key %s from %s\n"
msgstr "áßôçóç êëåéäéïý %08lX áðü ôï %s\n" msgstr "áßôçóç êëåéäéïý %08lX áðü ôï %s\n"
#: g10/keyserver.c:1197 #: g10/keyserver.c:1199
#, fuzzy, c-format #, fuzzy, c-format
msgid "sending key %s to %s server %s\n" msgid "sending key %s to %s server %s\n"
msgstr "áíáæÞôçóç ôïõ \"%s\" áðü ôï HKP äéáêïìéóôÞ %s\n" msgstr "áíáæÞôçóç ôïõ \"%s\" áðü ôï HKP äéáêïìéóôÞ %s\n"
#: g10/keyserver.c:1201 #: g10/keyserver.c:1203
#, fuzzy, c-format #, fuzzy, c-format
msgid "sending key %s to %s\n" msgid "sending key %s to %s\n"
msgstr "" msgstr ""
"\"\n" "\"\n"
"õðïãñÜöèçêå ìå ôï êëåéäß óáò %08lX óôéò %s\n" "õðïãñÜöèçêå ìå ôï êëåéäß óáò %08lX óôéò %s\n"
#: g10/keyserver.c:1244 #: g10/keyserver.c:1246
#, fuzzy, c-format #, fuzzy, c-format
msgid "searching for \"%s\" from %s server %s\n" msgid "searching for \"%s\" from %s server %s\n"
msgstr "áíáæÞôçóç ôïõ \"%s\" áðü ôï HKP äéáêïìéóôÞ %s\n" msgstr "áíáæÞôçóç ôïõ \"%s\" áðü ôï HKP äéáêïìéóôÞ %s\n"
#: g10/keyserver.c:1247 #: g10/keyserver.c:1249
#, fuzzy, c-format #, fuzzy, c-format
msgid "searching for \"%s\" from %s\n" msgid "searching for \"%s\" from %s\n"
msgstr "áíáæÞôçóç ôïõ \"%s\" áðü ôï HKP äéáêïìéóôÞ %s\n" msgstr "áíáæÞôçóç ôïõ \"%s\" áðü ôï HKP äéáêïìéóôÞ %s\n"
#: g10/keyserver.c:1254 g10/keyserver.c:1349 #: g10/keyserver.c:1256 g10/keyserver.c:1351
#, fuzzy #, fuzzy
msgid "no keyserver action!\n" msgid "no keyserver action!\n"
msgstr "ìç Ýãêõñåò åðéëïãÝò åîáãùãÞò\n" msgstr "ìç Ýãêõñåò åðéëïãÝò åîáãùãÞò\n"
#: g10/keyserver.c:1302 #: g10/keyserver.c:1304
#, c-format #, c-format
msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n" msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1311 #: g10/keyserver.c:1313
msgid "keyserver did not send VERSION\n" msgid "keyserver did not send VERSION\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1371 #: g10/keyserver.c:1373
msgid "no keyserver known (use option --keyserver)\n" msgid "no keyserver known (use option --keyserver)\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1377 #: g10/keyserver.c:1379
msgid "external keyserver calls are not supported in this build\n" msgid "external keyserver calls are not supported in this build\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1389 #: g10/keyserver.c:1391
#, c-format #, c-format
msgid "no handler for keyserver scheme `%s'\n" msgid "no handler for keyserver scheme `%s'\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1394 #: g10/keyserver.c:1396
#, c-format #, c-format
msgid "action `%s' not supported with keyserver scheme `%s'\n" msgid "action `%s' not supported with keyserver scheme `%s'\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1402 #: g10/keyserver.c:1404
#, c-format #, c-format
msgid "%s does not support handler version %d\n" msgid "%s does not support handler version %d\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1409 #: g10/keyserver.c:1411
#, fuzzy #, fuzzy
msgid "keyserver timed out\n" msgid "keyserver timed out\n"
msgstr "óöÜëìá äéáêïìéóôÞ êëåéäéþí" msgstr "óöÜëìá äéáêïìéóôÞ êëåéäéþí"
#: g10/keyserver.c:1414 #: g10/keyserver.c:1416
#, fuzzy #, fuzzy
msgid "keyserver internal error\n" msgid "keyserver internal error\n"
msgstr "óöÜëìá äéáêïìéóôÞ êëåéäéþí" msgstr "óöÜëìá äéáêïìéóôÞ êëåéäéþí"
#: g10/keyserver.c:1423 #: g10/keyserver.c:1425
#, fuzzy, c-format #, fuzzy, c-format
msgid "keyserver communications error: %s\n" msgid "keyserver communications error: %s\n"
msgstr "keyserver ëÞøç áðÝôõ÷å: %s\n" msgstr "keyserver ëÞøç áðÝôõ÷å: %s\n"
#: g10/keyserver.c:1448 g10/keyserver.c:1482 #: g10/keyserver.c:1450 g10/keyserver.c:1484
#, c-format #, c-format
msgid "\"%s\" not a key ID: skipping\n" msgid "\"%s\" not a key ID: skipping\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1739 #: g10/keyserver.c:1741
#, fuzzy, c-format #, fuzzy, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n" msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: áäõíáìßá äéáãñáöÞò tempfile (%s) `%s': %s\n" msgstr "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: áäõíáìßá äéáãñáöÞò tempfile (%s) `%s': %s\n"
#: g10/keyserver.c:1761 #: g10/keyserver.c:1763
#, fuzzy, c-format #, fuzzy, c-format
msgid "refreshing 1 key from %s\n" msgid "refreshing 1 key from %s\n"
msgstr "áßôçóç êëåéäéïý %08lX áðü ôï %s\n" msgstr "áßôçóç êëåéäéïý %08lX áðü ôï %s\n"
#: g10/keyserver.c:1763 #: g10/keyserver.c:1765
#, fuzzy, c-format #, fuzzy, c-format
msgid "refreshing %d keys from %s\n" msgid "refreshing %d keys from %s\n"
msgstr "áßôçóç êëåéäéïý %08lX áðü ôï %s\n" msgstr "áßôçóç êëåéäéïý %08lX áðü ôï %s\n"

63
po/eo.po
View File

@ -6,7 +6,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: gnupg 1.0.6d\n" "Project-Id-Version: gnupg 1.0.6d\n"
"Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n"
"POT-Creation-Date: 2005-07-26 18:08+0200\n" "POT-Creation-Date: 2005-07-27 19:41+0200\n"
"PO-Revision-Date: 2002-04-14 14:33+0100\n" "PO-Revision-Date: 2002-04-14 14:33+0100\n"
"Last-Translator: Edmund GRIMLEY EVANS <edmundo@rano.org>\n" "Last-Translator: Edmund GRIMLEY EVANS <edmundo@rano.org>\n"
"Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n" "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
@ -730,13 +730,13 @@ msgstr "ne povas malfermi '%s'\n"
msgid "--output doesn't work for this command\n" msgid "--output doesn't work for this command\n"
msgstr "--output ne funkcias por æi tiu komando\n" msgstr "--output ne funkcias por æi tiu komando\n"
#: g10/delkey.c:75 g10/export.c:178 g10/keyedit.c:3360 g10/keyserver.c:1569 #: g10/delkey.c:75 g10/export.c:178 g10/keyedit.c:3360 g10/keyserver.c:1571
#: g10/revoke.c:227 #: g10/revoke.c:227
#, fuzzy, c-format #, fuzzy, c-format
msgid "key \"%s\" not found: %s\n" msgid "key \"%s\" not found: %s\n"
msgstr "þlosilo '%s' ne trovita: %s\n" msgstr "þlosilo '%s' ne trovita: %s\n"
#: g10/delkey.c:83 g10/export.c:208 g10/import.c:2334 g10/keyserver.c:1583 #: g10/delkey.c:83 g10/export.c:208 g10/import.c:2334 g10/keyserver.c:1585
#: g10/revoke.c:233 g10/revoke.c:440 #: g10/revoke.c:233 g10/revoke.c:440
#, c-format #, c-format
msgid "error reading keyblock: %s\n" msgid "error reading keyblock: %s\n"
@ -937,12 +937,21 @@ msgstr "
msgid "key %s: PGP 2.x style key - skipped\n" msgid "key %s: PGP 2.x style key - skipped\n"
msgstr "þlosilo %08lX: PGP-2.x-stila þlosilo - ignorita\n" msgstr "þlosilo %08lX: PGP-2.x-stila þlosilo - ignorita\n"
#: g10/export.c:454 #: g10/export.c:409
msgid "about to export an unprotected subkey\n"
msgstr ""
#: g10/export.c:432
#, fuzzy, c-format
msgid "failed to unprotect the subkey: %s\n"
msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
#: g10/export.c:453
#, c-format #, c-format
msgid "WARNING: secret key %s does not have a simple SK checksum\n" msgid "WARNING: secret key %s does not have a simple SK checksum\n"
msgstr "" msgstr ""
#: g10/export.c:486 #: g10/export.c:485
msgid "WARNING: nothing exported\n" msgid "WARNING: nothing exported\n"
msgstr "AVERTO: nenio estis eksportita\n" msgstr "AVERTO: nenio estis eksportita\n"
@ -4169,7 +4178,7 @@ msgstr "el"
msgid "Enter number(s), N)ext, or Q)uit > " msgid "Enter number(s), N)ext, or Q)uit > "
msgstr "" msgstr ""
#: g10/keyserver.c:724 g10/keyserver.c:1294 #: g10/keyserver.c:724 g10/keyserver.c:1296
#, fuzzy, c-format #, fuzzy, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n" msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "nevalida þlosilaro" msgstr "nevalida þlosilaro"
@ -4184,106 +4193,106 @@ msgstr "
msgid "key not found on keyserver\n" msgid "key not found on keyserver\n"
msgstr "þlosilo '%s' ne trovita: %s\n" msgstr "þlosilo '%s' ne trovita: %s\n"
#: g10/keyserver.c:1041 #: g10/keyserver.c:1043
#, fuzzy, c-format #, fuzzy, c-format
msgid "requesting key %s from %s server %s\n" msgid "requesting key %s from %s server %s\n"
msgstr "petas la þlosilon %08lX de HKP-þlosilservilo %s ...\n" msgstr "petas la þlosilon %08lX de HKP-þlosilservilo %s ...\n"
#: g10/keyserver.c:1045 #: g10/keyserver.c:1047
#, fuzzy, c-format #, fuzzy, c-format
msgid "requesting key %s from %s\n" msgid "requesting key %s from %s\n"
msgstr "petas la þlosilon %08lX de HKP-þlosilservilo %s ...\n" msgstr "petas la þlosilon %08lX de HKP-þlosilservilo %s ...\n"
#: g10/keyserver.c:1197 #: g10/keyserver.c:1199
#, fuzzy, c-format #, fuzzy, c-format
msgid "sending key %s to %s server %s\n" msgid "sending key %s to %s server %s\n"
msgstr "seræas pri \"%s\" æe HKP-servilo %s\n" msgstr "seræas pri \"%s\" æe HKP-servilo %s\n"
#: g10/keyserver.c:1201 #: g10/keyserver.c:1203
#, fuzzy, c-format #, fuzzy, c-format
msgid "sending key %s to %s\n" msgid "sending key %s to %s\n"
msgstr "" msgstr ""
"\"\n" "\"\n"
"subskribita per via þlosilo %08lX je %s\n" "subskribita per via þlosilo %08lX je %s\n"
#: g10/keyserver.c:1244 #: g10/keyserver.c:1246
#, fuzzy, c-format #, fuzzy, c-format
msgid "searching for \"%s\" from %s server %s\n" msgid "searching for \"%s\" from %s server %s\n"
msgstr "seræas pri \"%s\" æe HKP-servilo %s\n" msgstr "seræas pri \"%s\" æe HKP-servilo %s\n"
#: g10/keyserver.c:1247 #: g10/keyserver.c:1249
#, fuzzy, c-format #, fuzzy, c-format
msgid "searching for \"%s\" from %s\n" msgid "searching for \"%s\" from %s\n"
msgstr "seræas pri \"%s\" æe HKP-servilo %s\n" msgstr "seræas pri \"%s\" æe HKP-servilo %s\n"
#: g10/keyserver.c:1254 g10/keyserver.c:1349 #: g10/keyserver.c:1256 g10/keyserver.c:1351
#, fuzzy #, fuzzy
msgid "no keyserver action!\n" msgid "no keyserver action!\n"
msgstr "nevalida þlosilaro" msgstr "nevalida þlosilaro"
#: g10/keyserver.c:1302 #: g10/keyserver.c:1304
#, c-format #, c-format
msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n" msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1311 #: g10/keyserver.c:1313
msgid "keyserver did not send VERSION\n" msgid "keyserver did not send VERSION\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1371 #: g10/keyserver.c:1373
msgid "no keyserver known (use option --keyserver)\n" msgid "no keyserver known (use option --keyserver)\n"
msgstr "neniu þlosilservilo konata (uzu la opcion --keyserver)\n" msgstr "neniu þlosilservilo konata (uzu la opcion --keyserver)\n"
#: g10/keyserver.c:1377 #: g10/keyserver.c:1379
msgid "external keyserver calls are not supported in this build\n" msgid "external keyserver calls are not supported in this build\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1389 #: g10/keyserver.c:1391
#, c-format #, c-format
msgid "no handler for keyserver scheme `%s'\n" msgid "no handler for keyserver scheme `%s'\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1394 #: g10/keyserver.c:1396
#, c-format #, c-format
msgid "action `%s' not supported with keyserver scheme `%s'\n" msgid "action `%s' not supported with keyserver scheme `%s'\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1402 #: g10/keyserver.c:1404
#, c-format #, c-format
msgid "%s does not support handler version %d\n" msgid "%s does not support handler version %d\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1409 #: g10/keyserver.c:1411
#, fuzzy #, fuzzy
msgid "keyserver timed out\n" msgid "keyserver timed out\n"
msgstr "þlosilservila eraro" msgstr "þlosilservila eraro"
#: g10/keyserver.c:1414 #: g10/keyserver.c:1416
#, fuzzy #, fuzzy
msgid "keyserver internal error\n" msgid "keyserver internal error\n"
msgstr "þlosilservila eraro" msgstr "þlosilservila eraro"
#: g10/keyserver.c:1423 #: g10/keyserver.c:1425
#, fuzzy, c-format #, fuzzy, c-format
msgid "keyserver communications error: %s\n" msgid "keyserver communications error: %s\n"
msgstr "listigo de sekretaj þlosiloj malsukcesis: %s\n" msgstr "listigo de sekretaj þlosiloj malsukcesis: %s\n"
#: g10/keyserver.c:1448 g10/keyserver.c:1482 #: g10/keyserver.c:1450 g10/keyserver.c:1484
#, fuzzy, c-format #, fuzzy, c-format
msgid "\"%s\" not a key ID: skipping\n" msgid "\"%s\" not a key ID: skipping\n"
msgstr "%s: ne valida þlosilidentigilo\n" msgstr "%s: ne valida þlosilidentigilo\n"
#: g10/keyserver.c:1739 #: g10/keyserver.c:1741
#, fuzzy, c-format #, fuzzy, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n" msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr "Averto: malsekura posedeco sur %s \"%s\"\n" msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
#: g10/keyserver.c:1761 #: g10/keyserver.c:1763
#, fuzzy, c-format #, fuzzy, c-format
msgid "refreshing 1 key from %s\n" msgid "refreshing 1 key from %s\n"
msgstr "petas la þlosilon %08lX de HKP-þlosilservilo %s ...\n" msgstr "petas la þlosilon %08lX de HKP-þlosilservilo %s ...\n"
#: g10/keyserver.c:1763 #: g10/keyserver.c:1765
#, fuzzy, c-format #, fuzzy, c-format
msgid "refreshing %d keys from %s\n" msgid "refreshing %d keys from %s\n"
msgstr "petas la þlosilon %08lX de HKP-þlosilservilo %s ...\n" msgstr "petas la þlosilon %08lX de HKP-þlosilservilo %s ...\n"

63
po/es.po
View File

@ -10,7 +10,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: GNU gnupg 1.4.1\n" "Project-Id-Version: GNU gnupg 1.4.1\n"
"Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n"
"POT-Creation-Date: 2005-07-26 18:08+0200\n" "POT-Creation-Date: 2005-07-27 19:41+0200\n"
"PO-Revision-Date: 2005-03-25 16:50+0100\n" "PO-Revision-Date: 2005-03-25 16:50+0100\n"
"Last-Translator: Jaime Suárez <jsuarez@ono.com>\n" "Last-Translator: Jaime Suárez <jsuarez@ono.com>\n"
"Language-Team: Spanish <es@li.org>\n" "Language-Team: Spanish <es@li.org>\n"
@ -711,13 +711,13 @@ msgstr "no se puede abrir `%s'\n"
msgid "--output doesn't work for this command\n" msgid "--output doesn't work for this command\n"
msgstr "--output no funciona con esta orden\n" msgstr "--output no funciona con esta orden\n"
#: g10/delkey.c:75 g10/export.c:178 g10/keyedit.c:3360 g10/keyserver.c:1569 #: g10/delkey.c:75 g10/export.c:178 g10/keyedit.c:3360 g10/keyserver.c:1571
#: g10/revoke.c:227 #: g10/revoke.c:227
#, c-format #, c-format
msgid "key \"%s\" not found: %s\n" msgid "key \"%s\" not found: %s\n"
msgstr "clave \"%s\" no encontrada: %s\n" msgstr "clave \"%s\" no encontrada: %s\n"
#: g10/delkey.c:83 g10/export.c:208 g10/import.c:2334 g10/keyserver.c:1583 #: g10/delkey.c:83 g10/export.c:208 g10/import.c:2334 g10/keyserver.c:1585
#: g10/revoke.c:233 g10/revoke.c:440 #: g10/revoke.c:233 g10/revoke.c:440
#, c-format #, c-format
msgid "error reading keyblock: %s\n" msgid "error reading keyblock: %s\n"
@ -924,12 +924,21 @@ msgstr "clave %s: no protegida - omitida\n"
msgid "key %s: PGP 2.x style key - skipped\n" msgid "key %s: PGP 2.x style key - skipped\n"
msgstr "clave %s: clave estilo PGP 2.x - omitida\n" msgstr "clave %s: clave estilo PGP 2.x - omitida\n"
#: g10/export.c:454 #: g10/export.c:409
msgid "about to export an unprotected subkey\n"
msgstr ""
#: g10/export.c:432
#, fuzzy, c-format
msgid "failed to unprotect the subkey: %s\n"
msgstr "fallo al almacenar la clave: %s\n"
#: g10/export.c:453
#, c-format #, c-format
msgid "WARNING: secret key %s does not have a simple SK checksum\n" msgid "WARNING: secret key %s does not have a simple SK checksum\n"
msgstr "AVISO: la clave secreta %s no tiene suma de comprobación simple SK\n" msgstr "AVISO: la clave secreta %s no tiene suma de comprobación simple SK\n"
#: g10/export.c:486 #: g10/export.c:485
msgid "WARNING: nothing exported\n" msgid "WARNING: nothing exported\n"
msgstr "ATENCIÓN: no se ha exportado nada\n" msgstr "ATENCIÓN: no se ha exportado nada\n"
@ -4074,7 +4083,7 @@ msgstr "deshabilitado"
msgid "Enter number(s), N)ext, or Q)uit > " msgid "Enter number(s), N)ext, or Q)uit > "
msgstr "Introduzca número(s), O)tro, o F)in >" msgstr "Introduzca número(s), O)tro, o F)in >"
#: g10/keyserver.c:724 g10/keyserver.c:1294 #: g10/keyserver.c:724 g10/keyserver.c:1296
#, c-format #, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n" msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "protocolo del servidor de claves inválido (us %d!=handler %d)\n" msgstr "protocolo del servidor de claves inválido (us %d!=handler %d)\n"
@ -4088,105 +4097,105 @@ msgstr "clave \"%s\" no encontrada en el servidor\n"
msgid "key not found on keyserver\n" msgid "key not found on keyserver\n"
msgstr "clave no encontrada en el servidor\n" msgstr "clave no encontrada en el servidor\n"
#: g10/keyserver.c:1041 #: g10/keyserver.c:1043
#, c-format #, c-format
msgid "requesting key %s from %s server %s\n" msgid "requesting key %s from %s server %s\n"
msgstr "solicitando clave %s de %s servidor %s\n" msgstr "solicitando clave %s de %s servidor %s\n"
#: g10/keyserver.c:1045 #: g10/keyserver.c:1047
#, c-format #, c-format
msgid "requesting key %s from %s\n" msgid "requesting key %s from %s\n"
msgstr "solicitando clave %s de %s\n" msgstr "solicitando clave %s de %s\n"
#: g10/keyserver.c:1197 #: g10/keyserver.c:1199
#, c-format #, c-format
msgid "sending key %s to %s server %s\n" msgid "sending key %s to %s server %s\n"
msgstr "enviando clave %s a %s servidor %s\n" msgstr "enviando clave %s a %s servidor %s\n"
#: g10/keyserver.c:1201 #: g10/keyserver.c:1203
#, c-format #, c-format
msgid "sending key %s to %s\n" msgid "sending key %s to %s\n"
msgstr "enviando clave %s a %s\n" msgstr "enviando clave %s a %s\n"
#: g10/keyserver.c:1244 #: g10/keyserver.c:1246
#, c-format #, c-format
msgid "searching for \"%s\" from %s server %s\n" msgid "searching for \"%s\" from %s server %s\n"
msgstr "buscando \"%s\" de %s servidor %s\n" msgstr "buscando \"%s\" de %s servidor %s\n"
#: g10/keyserver.c:1247 #: g10/keyserver.c:1249
#, c-format #, c-format
msgid "searching for \"%s\" from %s\n" msgid "searching for \"%s\" from %s\n"
msgstr "buscando \"%s\" de %s\n" msgstr "buscando \"%s\" de %s\n"
#: g10/keyserver.c:1254 g10/keyserver.c:1349 #: g10/keyserver.c:1256 g10/keyserver.c:1351
msgid "no keyserver action!\n" msgid "no keyserver action!\n"
msgstr "¡no se solicita ninguna acción al servidor de claves!\n" msgstr "¡no se solicita ninguna acción al servidor de claves!\n"
#: g10/keyserver.c:1302 #: g10/keyserver.c:1304
#, c-format #, c-format
msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n" msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
msgstr "" msgstr ""
"AVISO: el manejo de claves procede de una versión diferente de GnuPG (%s)\n" "AVISO: el manejo de claves procede de una versión diferente de GnuPG (%s)\n"
#: g10/keyserver.c:1311 #: g10/keyserver.c:1313
msgid "keyserver did not send VERSION\n" msgid "keyserver did not send VERSION\n"
msgstr "el servidor de claves no envió VERSION\n" msgstr "el servidor de claves no envió VERSION\n"
#: g10/keyserver.c:1371 #: g10/keyserver.c:1373
msgid "no keyserver known (use option --keyserver)\n" msgid "no keyserver known (use option --keyserver)\n"
msgstr "no hay servidores de claves conocidos (use opción --keyserver)\n" msgstr "no hay servidores de claves conocidos (use opción --keyserver)\n"
#: g10/keyserver.c:1377 #: g10/keyserver.c:1379
msgid "external keyserver calls are not supported in this build\n" msgid "external keyserver calls are not supported in this build\n"
msgstr "" msgstr ""
"no se pueden realizar llamadas a un servidor externo de claves tal y\n" "no se pueden realizar llamadas a un servidor externo de claves tal y\n"
"como está compilado el programa\n" "como está compilado el programa\n"
#: g10/keyserver.c:1389 #: g10/keyserver.c:1391
#, c-format #, c-format
msgid "no handler for keyserver scheme `%s'\n" msgid "no handler for keyserver scheme `%s'\n"
msgstr "no hay un manejador para ese esquema de servidor de claves `%s'\n" msgstr "no hay un manejador para ese esquema de servidor de claves `%s'\n"
#: g10/keyserver.c:1394 #: g10/keyserver.c:1396
#, c-format #, c-format
msgid "action `%s' not supported with keyserver scheme `%s'\n" msgid "action `%s' not supported with keyserver scheme `%s'\n"
msgstr "" msgstr ""
"la acción `%s' no es posible con este esquema de servidor de claves `%s'\n" "la acción `%s' no es posible con este esquema de servidor de claves `%s'\n"
#: g10/keyserver.c:1402 #: g10/keyserver.c:1404
#, fuzzy, c-format #, fuzzy, c-format
msgid "%s does not support handler version %d\n" msgid "%s does not support handler version %d\n"
msgstr "gpgkeys_%s no permite usar la versión %d del manejador\n" msgstr "gpgkeys_%s no permite usar la versión %d del manejador\n"
#: g10/keyserver.c:1409 #: g10/keyserver.c:1411
msgid "keyserver timed out\n" msgid "keyserver timed out\n"
msgstr "agotado el tiempo de espera para el servidor de claves\n" msgstr "agotado el tiempo de espera para el servidor de claves\n"
#: g10/keyserver.c:1414 #: g10/keyserver.c:1416
msgid "keyserver internal error\n" msgid "keyserver internal error\n"
msgstr "error interno del servidor de claves\n" msgstr "error interno del servidor de claves\n"
#: g10/keyserver.c:1423 #: g10/keyserver.c:1425
#, c-format #, c-format
msgid "keyserver communications error: %s\n" msgid "keyserver communications error: %s\n"
msgstr "error de comunicación con el servidor de claves: %s\n" msgstr "error de comunicación con el servidor de claves: %s\n"
#: g10/keyserver.c:1448 g10/keyserver.c:1482 #: g10/keyserver.c:1450 g10/keyserver.c:1484
#, c-format #, c-format
msgid "\"%s\" not a key ID: skipping\n" msgid "\"%s\" not a key ID: skipping\n"
msgstr "\"%s\" no es un identificador de clave válido: omitido\n" msgstr "\"%s\" no es un identificador de clave válido: omitido\n"
#: g10/keyserver.c:1739 #: g10/keyserver.c:1741
#, c-format #, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n" msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr "AVISO: no se puede renovar la clave %s a traves de %s: %s\n" msgstr "AVISO: no se puede renovar la clave %s a traves de %s: %s\n"
#: g10/keyserver.c:1761 #: g10/keyserver.c:1763
#, c-format #, c-format
msgid "refreshing 1 key from %s\n" msgid "refreshing 1 key from %s\n"
msgstr "renovando 1 clave de %s\n" msgstr "renovando 1 clave de %s\n"
#: g10/keyserver.c:1763 #: g10/keyserver.c:1765
#, c-format #, c-format
msgid "refreshing %d keys from %s\n" msgid "refreshing %d keys from %s\n"
msgstr "renovando %d claves desde %s\n" msgstr "renovando %d claves desde %s\n"

63
po/et.po
View File

@ -6,7 +6,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: gnupg 1.2.2\n" "Project-Id-Version: gnupg 1.2.2\n"
"Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n"
"POT-Creation-Date: 2005-07-26 18:08+0200\n" "POT-Creation-Date: 2005-07-27 19:41+0200\n"
"PO-Revision-Date: 2004-06-17 11:04+0300\n" "PO-Revision-Date: 2004-06-17 11:04+0300\n"
"Last-Translator: Toomas Soome <Toomas.Soome@microlink.ee>\n" "Last-Translator: Toomas Soome <Toomas.Soome@microlink.ee>\n"
"Language-Team: Estonian <et@li.org>\n" "Language-Team: Estonian <et@li.org>\n"
@ -727,13 +727,13 @@ msgstr "`%s' ei
msgid "--output doesn't work for this command\n" msgid "--output doesn't work for this command\n"
msgstr "võti --output ei tööta selle käsuga\n" msgstr "võti --output ei tööta selle käsuga\n"
#: g10/delkey.c:75 g10/export.c:178 g10/keyedit.c:3360 g10/keyserver.c:1569 #: g10/delkey.c:75 g10/export.c:178 g10/keyedit.c:3360 g10/keyserver.c:1571
#: g10/revoke.c:227 #: g10/revoke.c:227
#, fuzzy, c-format #, fuzzy, c-format
msgid "key \"%s\" not found: %s\n" msgid "key \"%s\" not found: %s\n"
msgstr "võtit '%s' ei leitud: %s\n" msgstr "võtit '%s' ei leitud: %s\n"
#: g10/delkey.c:83 g10/export.c:208 g10/import.c:2334 g10/keyserver.c:1583 #: g10/delkey.c:83 g10/export.c:208 g10/import.c:2334 g10/keyserver.c:1585
#: g10/revoke.c:233 g10/revoke.c:440 #: g10/revoke.c:233 g10/revoke.c:440
#, c-format #, c-format
msgid "error reading keyblock: %s\n" msgid "error reading keyblock: %s\n"
@ -941,12 +941,21 @@ msgstr "v
msgid "key %s: PGP 2.x style key - skipped\n" msgid "key %s: PGP 2.x style key - skipped\n"
msgstr "võti %08lX: PGP 2.x stiilis võti - jätsin vahele\n" msgstr "võti %08lX: PGP 2.x stiilis võti - jätsin vahele\n"
#: g10/export.c:454 #: g10/export.c:409
msgid "about to export an unprotected subkey\n"
msgstr ""
#: g10/export.c:432
#, fuzzy, c-format
msgid "failed to unprotect the subkey: %s\n"
msgstr "TrustDB initsialiseerimine ebaõnnestus: %s\n"
#: g10/export.c:453
#, fuzzy, c-format #, fuzzy, c-format
msgid "WARNING: secret key %s does not have a simple SK checksum\n" msgid "WARNING: secret key %s does not have a simple SK checksum\n"
msgstr "HOIATUS: salajases võtmes %08lX puudub lihtne SK kontrollsumma\n" msgstr "HOIATUS: salajases võtmes %08lX puudub lihtne SK kontrollsumma\n"
#: g10/export.c:486 #: g10/export.c:485
msgid "WARNING: nothing exported\n" msgid "WARNING: nothing exported\n"
msgstr "HOIATUS: midagi ei eksporditud\n" msgstr "HOIATUS: midagi ei eksporditud\n"
@ -4137,7 +4146,7 @@ msgstr "disable"
msgid "Enter number(s), N)ext, or Q)uit > " msgid "Enter number(s), N)ext, or Q)uit > "
msgstr "" msgstr ""
#: g10/keyserver.c:724 g10/keyserver.c:1294 #: g10/keyserver.c:724 g10/keyserver.c:1296
#, fuzzy, c-format #, fuzzy, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n" msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "vigased ekspordi võtmed\n" msgstr "vigased ekspordi võtmed\n"
@ -4152,106 +4161,106 @@ msgstr "v
msgid "key not found on keyserver\n" msgid "key not found on keyserver\n"
msgstr "võtit '%s' ei leitud: %s\n" msgstr "võtit '%s' ei leitud: %s\n"
#: g10/keyserver.c:1041 #: g10/keyserver.c:1043
#, fuzzy, c-format #, fuzzy, c-format
msgid "requesting key %s from %s server %s\n" msgid "requesting key %s from %s server %s\n"
msgstr "küsin võtit %08lX võtmeserverist %s\n" msgstr "küsin võtit %08lX võtmeserverist %s\n"
#: g10/keyserver.c:1045 #: g10/keyserver.c:1047
#, fuzzy, c-format #, fuzzy, c-format
msgid "requesting key %s from %s\n" msgid "requesting key %s from %s\n"
msgstr "küsin võtit %08lX võtmeserverist %s\n" msgstr "küsin võtit %08lX võtmeserverist %s\n"
#: g10/keyserver.c:1197 #: g10/keyserver.c:1199
#, fuzzy, c-format #, fuzzy, c-format
msgid "sending key %s to %s server %s\n" msgid "sending key %s to %s server %s\n"
msgstr "otsin \"%s\" HKP serverist %s\n" msgstr "otsin \"%s\" HKP serverist %s\n"
#: g10/keyserver.c:1201 #: g10/keyserver.c:1203
#, fuzzy, c-format #, fuzzy, c-format
msgid "sending key %s to %s\n" msgid "sending key %s to %s\n"
msgstr "" msgstr ""
"\"\n" "\"\n"
"allkirjastatud teie võtmega %08lX %s\n" "allkirjastatud teie võtmega %08lX %s\n"
#: g10/keyserver.c:1244 #: g10/keyserver.c:1246
#, fuzzy, c-format #, fuzzy, c-format
msgid "searching for \"%s\" from %s server %s\n" msgid "searching for \"%s\" from %s server %s\n"
msgstr "otsin \"%s\" HKP serverist %s\n" msgstr "otsin \"%s\" HKP serverist %s\n"
#: g10/keyserver.c:1247 #: g10/keyserver.c:1249
#, fuzzy, c-format #, fuzzy, c-format
msgid "searching for \"%s\" from %s\n" msgid "searching for \"%s\" from %s\n"
msgstr "otsin \"%s\" HKP serverist %s\n" msgstr "otsin \"%s\" HKP serverist %s\n"
#: g10/keyserver.c:1254 g10/keyserver.c:1349 #: g10/keyserver.c:1256 g10/keyserver.c:1351
#, fuzzy #, fuzzy
msgid "no keyserver action!\n" msgid "no keyserver action!\n"
msgstr "vigased ekspordi võtmed\n" msgstr "vigased ekspordi võtmed\n"
#: g10/keyserver.c:1302 #: g10/keyserver.c:1304
#, c-format #, c-format
msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n" msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1311 #: g10/keyserver.c:1313
msgid "keyserver did not send VERSION\n" msgid "keyserver did not send VERSION\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1371 #: g10/keyserver.c:1373
msgid "no keyserver known (use option --keyserver)\n" msgid "no keyserver known (use option --keyserver)\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1377 #: g10/keyserver.c:1379
msgid "external keyserver calls are not supported in this build\n" msgid "external keyserver calls are not supported in this build\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1389 #: g10/keyserver.c:1391
#, c-format #, c-format
msgid "no handler for keyserver scheme `%s'\n" msgid "no handler for keyserver scheme `%s'\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1394 #: g10/keyserver.c:1396
#, c-format #, c-format
msgid "action `%s' not supported with keyserver scheme `%s'\n" msgid "action `%s' not supported with keyserver scheme `%s'\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1402 #: g10/keyserver.c:1404
#, c-format #, c-format
msgid "%s does not support handler version %d\n" msgid "%s does not support handler version %d\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1409 #: g10/keyserver.c:1411
#, fuzzy #, fuzzy
msgid "keyserver timed out\n" msgid "keyserver timed out\n"
msgstr "võtmeserveri viga" msgstr "võtmeserveri viga"
#: g10/keyserver.c:1414 #: g10/keyserver.c:1416
#, fuzzy #, fuzzy
msgid "keyserver internal error\n" msgid "keyserver internal error\n"
msgstr "võtmeserveri viga" msgstr "võtmeserveri viga"
#: g10/keyserver.c:1423 #: g10/keyserver.c:1425
#, fuzzy, c-format #, fuzzy, c-format
msgid "keyserver communications error: %s\n" msgid "keyserver communications error: %s\n"
msgstr "võtmeserverilt lugemine ebaõnnestus: %s\n" msgstr "võtmeserverilt lugemine ebaõnnestus: %s\n"
#: g10/keyserver.c:1448 g10/keyserver.c:1482 #: g10/keyserver.c:1450 g10/keyserver.c:1484
#, c-format #, c-format
msgid "\"%s\" not a key ID: skipping\n" msgid "\"%s\" not a key ID: skipping\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1739 #: g10/keyserver.c:1741
#, fuzzy, c-format #, fuzzy, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n" msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr "HOIATUS: ei saa kustutada ajutist faili (%s) `%s': %s\n" msgstr "HOIATUS: ei saa kustutada ajutist faili (%s) `%s': %s\n"
#: g10/keyserver.c:1761 #: g10/keyserver.c:1763
#, fuzzy, c-format #, fuzzy, c-format
msgid "refreshing 1 key from %s\n" msgid "refreshing 1 key from %s\n"
msgstr "küsin võtit %08lX võtmeserverist %s\n" msgstr "küsin võtit %08lX võtmeserverist %s\n"
#: g10/keyserver.c:1763 #: g10/keyserver.c:1765
#, fuzzy, c-format #, fuzzy, c-format
msgid "refreshing %d keys from %s\n" msgid "refreshing %d keys from %s\n"
msgstr "küsin võtit %08lX võtmeserverist %s\n" msgstr "küsin võtit %08lX võtmeserverist %s\n"

63
po/fi.po
View File

@ -22,7 +22,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: gnupg 1.2.2\n" "Project-Id-Version: gnupg 1.2.2\n"
"Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n"
"POT-Creation-Date: 2005-07-26 18:08+0200\n" "POT-Creation-Date: 2005-07-27 19:41+0200\n"
"PO-Revision-Date: 2004-06-16 22:40+0300\n" "PO-Revision-Date: 2004-06-16 22:40+0300\n"
"Last-Translator: Tommi Vainikainen <Tommi.Vainikainen@iki.fi>\n" "Last-Translator: Tommi Vainikainen <Tommi.Vainikainen@iki.fi>\n"
"Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n" "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
@ -747,13 +747,13 @@ msgstr "tiedostoa \"%s\" ei voi avata\n"
msgid "--output doesn't work for this command\n" msgid "--output doesn't work for this command\n"
msgstr "--output ei toimi yhdessä tämän komennon kanssa\n" msgstr "--output ei toimi yhdessä tämän komennon kanssa\n"
#: g10/delkey.c:75 g10/export.c:178 g10/keyedit.c:3360 g10/keyserver.c:1569 #: g10/delkey.c:75 g10/export.c:178 g10/keyedit.c:3360 g10/keyserver.c:1571
#: g10/revoke.c:227 #: g10/revoke.c:227
#, fuzzy, c-format #, fuzzy, c-format
msgid "key \"%s\" not found: %s\n" msgid "key \"%s\" not found: %s\n"
msgstr "avainta \"%s\" ei löydy: %s\n" msgstr "avainta \"%s\" ei löydy: %s\n"
#: g10/delkey.c:83 g10/export.c:208 g10/import.c:2334 g10/keyserver.c:1583 #: g10/delkey.c:83 g10/export.c:208 g10/import.c:2334 g10/keyserver.c:1585
#: g10/revoke.c:233 g10/revoke.c:440 #: g10/revoke.c:233 g10/revoke.c:440
#, c-format #, c-format
msgid "error reading keyblock: %s\n" msgid "error reading keyblock: %s\n"
@ -959,14 +959,23 @@ msgstr "avain %08lX: ei suojattu - ohitetaan\n"
msgid "key %s: PGP 2.x style key - skipped\n" msgid "key %s: PGP 2.x style key - skipped\n"
msgstr "avain %08lX: PGP 2.x -muodon avain - ohitetaan\n" msgstr "avain %08lX: PGP 2.x -muodon avain - ohitetaan\n"
#: g10/export.c:454 #: g10/export.c:409
msgid "about to export an unprotected subkey\n"
msgstr ""
#: g10/export.c:432
#, fuzzy, c-format
msgid "failed to unprotect the subkey: %s\n"
msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
#: g10/export.c:453
#, fuzzy, c-format #, fuzzy, c-format
msgid "WARNING: secret key %s does not have a simple SK checksum\n" msgid "WARNING: secret key %s does not have a simple SK checksum\n"
msgstr "" msgstr ""
"VAROITUS: salaisella avaimella %08lX ei ole yksinkertaista SK-" "VAROITUS: salaisella avaimella %08lX ei ole yksinkertaista SK-"
"tarkistussummaa\n" "tarkistussummaa\n"
#: g10/export.c:486 #: g10/export.c:485
msgid "WARNING: nothing exported\n" msgid "WARNING: nothing exported\n"
msgstr "VAROITUS: mitään ei viety\n" msgstr "VAROITUS: mitään ei viety\n"
@ -4187,7 +4196,7 @@ msgstr "disable"
msgid "Enter number(s), N)ext, or Q)uit > " msgid "Enter number(s), N)ext, or Q)uit > "
msgstr "" msgstr ""
#: g10/keyserver.c:724 g10/keyserver.c:1294 #: g10/keyserver.c:724 g10/keyserver.c:1296
#, fuzzy, c-format #, fuzzy, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n" msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "virheelliset vientivalitsimet\n" msgstr "virheelliset vientivalitsimet\n"
@ -4202,106 +4211,106 @@ msgstr "avainta \"%s\" ei löydy: %s\n"
msgid "key not found on keyserver\n" msgid "key not found on keyserver\n"
msgstr "avainta \"%s\" ei löydy: %s\n" msgstr "avainta \"%s\" ei löydy: %s\n"
#: g10/keyserver.c:1041 #: g10/keyserver.c:1043
#, fuzzy, c-format #, fuzzy, c-format
msgid "requesting key %s from %s server %s\n" msgid "requesting key %s from %s server %s\n"
msgstr "pyydetään avainta %08lX kohteesta %s\n" msgstr "pyydetään avainta %08lX kohteesta %s\n"
#: g10/keyserver.c:1045 #: g10/keyserver.c:1047
#, fuzzy, c-format #, fuzzy, c-format
msgid "requesting key %s from %s\n" msgid "requesting key %s from %s\n"
msgstr "pyydetään avainta %08lX kohteesta %s\n" msgstr "pyydetään avainta %08lX kohteesta %s\n"
#: g10/keyserver.c:1197 #: g10/keyserver.c:1199
#, fuzzy, c-format #, fuzzy, c-format
msgid "sending key %s to %s server %s\n" msgid "sending key %s to %s server %s\n"
msgstr "etsitään \"%s\" HKP-palvelimelta %s\n" msgstr "etsitään \"%s\" HKP-palvelimelta %s\n"
#: g10/keyserver.c:1201 #: g10/keyserver.c:1203
#, fuzzy, c-format #, fuzzy, c-format
msgid "sending key %s to %s\n" msgid "sending key %s to %s\n"
msgstr "" msgstr ""
"\"\n" "\"\n"
"allekirjoitettu avaimellasi %08lX %s\n" "allekirjoitettu avaimellasi %08lX %s\n"
#: g10/keyserver.c:1244 #: g10/keyserver.c:1246
#, fuzzy, c-format #, fuzzy, c-format
msgid "searching for \"%s\" from %s server %s\n" msgid "searching for \"%s\" from %s server %s\n"
msgstr "etsitään \"%s\" HKP-palvelimelta %s\n" msgstr "etsitään \"%s\" HKP-palvelimelta %s\n"
#: g10/keyserver.c:1247 #: g10/keyserver.c:1249
#, fuzzy, c-format #, fuzzy, c-format
msgid "searching for \"%s\" from %s\n" msgid "searching for \"%s\" from %s\n"
msgstr "etsitään \"%s\" HKP-palvelimelta %s\n" msgstr "etsitään \"%s\" HKP-palvelimelta %s\n"
#: g10/keyserver.c:1254 g10/keyserver.c:1349 #: g10/keyserver.c:1256 g10/keyserver.c:1351
#, fuzzy #, fuzzy
msgid "no keyserver action!\n" msgid "no keyserver action!\n"
msgstr "virheelliset vientivalitsimet\n" msgstr "virheelliset vientivalitsimet\n"
#: g10/keyserver.c:1302 #: g10/keyserver.c:1304
#, c-format #, c-format
msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n" msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1311 #: g10/keyserver.c:1313
msgid "keyserver did not send VERSION\n" msgid "keyserver did not send VERSION\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1371 #: g10/keyserver.c:1373
msgid "no keyserver known (use option --keyserver)\n" msgid "no keyserver known (use option --keyserver)\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1377 #: g10/keyserver.c:1379
msgid "external keyserver calls are not supported in this build\n" msgid "external keyserver calls are not supported in this build\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1389 #: g10/keyserver.c:1391
#, c-format #, c-format
msgid "no handler for keyserver scheme `%s'\n" msgid "no handler for keyserver scheme `%s'\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1394 #: g10/keyserver.c:1396
#, c-format #, c-format
msgid "action `%s' not supported with keyserver scheme `%s'\n" msgid "action `%s' not supported with keyserver scheme `%s'\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1402 #: g10/keyserver.c:1404
#, c-format #, c-format
msgid "%s does not support handler version %d\n" msgid "%s does not support handler version %d\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1409 #: g10/keyserver.c:1411
#, fuzzy #, fuzzy
msgid "keyserver timed out\n" msgid "keyserver timed out\n"
msgstr "avainpalvelinvirhe" msgstr "avainpalvelinvirhe"
#: g10/keyserver.c:1414 #: g10/keyserver.c:1416
#, fuzzy #, fuzzy
msgid "keyserver internal error\n" msgid "keyserver internal error\n"
msgstr "avainpalvelinvirhe" msgstr "avainpalvelinvirhe"
#: g10/keyserver.c:1423 #: g10/keyserver.c:1425
#, fuzzy, c-format #, fuzzy, c-format
msgid "keyserver communications error: %s\n" msgid "keyserver communications error: %s\n"
msgstr "avainpalvelimelta vastaanotto epäonnistui: %s\n" msgstr "avainpalvelimelta vastaanotto epäonnistui: %s\n"
#: g10/keyserver.c:1448 g10/keyserver.c:1482 #: g10/keyserver.c:1450 g10/keyserver.c:1484
#, c-format #, c-format
msgid "\"%s\" not a key ID: skipping\n" msgid "\"%s\" not a key ID: skipping\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1739 #: g10/keyserver.c:1741
#, fuzzy, c-format #, fuzzy, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n" msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr "VAROITUS: tilapäistiedostoa (%s) \"%s\" ei voi poistaa: %s\n" msgstr "VAROITUS: tilapäistiedostoa (%s) \"%s\" ei voi poistaa: %s\n"
#: g10/keyserver.c:1761 #: g10/keyserver.c:1763
#, fuzzy, c-format #, fuzzy, c-format
msgid "refreshing 1 key from %s\n" msgid "refreshing 1 key from %s\n"
msgstr "pyydetään avainta %08lX kohteesta %s\n" msgstr "pyydetään avainta %08lX kohteesta %s\n"
#: g10/keyserver.c:1763 #: g10/keyserver.c:1765
#, fuzzy, c-format #, fuzzy, c-format
msgid "refreshing %d keys from %s\n" msgid "refreshing %d keys from %s\n"
msgstr "pyydetään avainta %08lX kohteesta %s\n" msgstr "pyydetään avainta %08lX kohteesta %s\n"

63
po/fr.po
View File

@ -11,7 +11,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: gnupg 1.4.2rc2\n" "Project-Id-Version: gnupg 1.4.2rc2\n"
"Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n"
"POT-Creation-Date: 2005-07-26 18:08+0200\n" "POT-Creation-Date: 2005-07-27 19:41+0200\n"
"PO-Revision-Date: 2005-06-28 00:24+0200\n" "PO-Revision-Date: 2005-06-28 00:24+0200\n"
"Last-Translator: Gaël Quéri <gael@lautre.net>\n" "Last-Translator: Gaël Quéri <gael@lautre.net>\n"
"Language-Team: French <traduc@traduc.org>\n" "Language-Team: French <traduc@traduc.org>\n"
@ -719,13 +719,13 @@ msgstr "impossible d'ouvrir `%s'\n"
msgid "--output doesn't work for this command\n" msgid "--output doesn't work for this command\n"
msgstr "--output n'est pas compatible avec cette commande\n" msgstr "--output n'est pas compatible avec cette commande\n"
#: g10/delkey.c:75 g10/export.c:178 g10/keyedit.c:3360 g10/keyserver.c:1569 #: g10/delkey.c:75 g10/export.c:178 g10/keyedit.c:3360 g10/keyserver.c:1571
#: g10/revoke.c:227 #: g10/revoke.c:227
#, c-format #, c-format
msgid "key \"%s\" not found: %s\n" msgid "key \"%s\" not found: %s\n"
msgstr "clé « %s » introuvable: %s\n" msgstr "clé « %s » introuvable: %s\n"
#: g10/delkey.c:83 g10/export.c:208 g10/import.c:2334 g10/keyserver.c:1583 #: g10/delkey.c:83 g10/export.c:208 g10/import.c:2334 g10/keyserver.c:1585
#: g10/revoke.c:233 g10/revoke.c:440 #: g10/revoke.c:233 g10/revoke.c:440
#, c-format #, c-format
msgid "error reading keyblock: %s\n" msgid "error reading keyblock: %s\n"
@ -941,14 +941,23 @@ msgstr "cl
msgid "key %s: PGP 2.x style key - skipped\n" msgid "key %s: PGP 2.x style key - skipped\n"
msgstr "clé %s: clé de style PGP 2.x - ignorée\n" msgstr "clé %s: clé de style PGP 2.x - ignorée\n"
#: g10/export.c:454 #: g10/export.c:409
msgid "about to export an unprotected subkey\n"
msgstr ""
#: g10/export.c:432
#, fuzzy, c-format
msgid "failed to unprotect the subkey: %s\n"
msgstr "le stockage de la clé a échoué: %s\n"
#: g10/export.c:453
#, c-format #, c-format
msgid "WARNING: secret key %s does not have a simple SK checksum\n" msgid "WARNING: secret key %s does not have a simple SK checksum\n"
msgstr "" msgstr ""
"AVERTISSEMENT: la clé secrète %s n'a pas de somme de contrôle SK\n" "AVERTISSEMENT: la clé secrète %s n'a pas de somme de contrôle SK\n"
"simple\n" "simple\n"
#: g10/export.c:486 #: g10/export.c:485
msgid "WARNING: nothing exported\n" msgid "WARNING: nothing exported\n"
msgstr "ATTENTION: rien n'a été exporté\n" msgstr "ATTENTION: rien n'a été exporté\n"
@ -4172,7 +4181,7 @@ msgstr "d
msgid "Enter number(s), N)ext, or Q)uit > " msgid "Enter number(s), N)ext, or Q)uit > "
msgstr "Entrez le(s) nombre(s), S)uivant, ou Q)uitter > " msgstr "Entrez le(s) nombre(s), S)uivant, ou Q)uitter > "
#: g10/keyserver.c:724 g10/keyserver.c:1294 #: g10/keyserver.c:724 g10/keyserver.c:1296
#, c-format #, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n" msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "protocole serveur de clés invalide (nous %d!=gestionnaire %d)\n" msgstr "protocole serveur de clés invalide (nous %d!=gestionnaire %d)\n"
@ -4186,109 +4195,109 @@ msgstr "cl
msgid "key not found on keyserver\n" msgid "key not found on keyserver\n"
msgstr "clé non trouvée dans le serveur de clés\n" msgstr "clé non trouvée dans le serveur de clés\n"
#: g10/keyserver.c:1041 #: g10/keyserver.c:1043
#, c-format #, c-format
msgid "requesting key %s from %s server %s\n" msgid "requesting key %s from %s server %s\n"
msgstr "requête de la clé %s du serveur %s %s\n" msgstr "requête de la clé %s du serveur %s %s\n"
#: g10/keyserver.c:1045 #: g10/keyserver.c:1047
#, c-format #, c-format
msgid "requesting key %s from %s\n" msgid "requesting key %s from %s\n"
msgstr "requête de la clé %s de %s\n" msgstr "requête de la clé %s de %s\n"
#: g10/keyserver.c:1197 #: g10/keyserver.c:1199
#, c-format #, c-format
msgid "sending key %s to %s server %s\n" msgid "sending key %s to %s server %s\n"
msgstr "envoi de la clé %s au serveur %s %s\n" msgstr "envoi de la clé %s au serveur %s %s\n"
#: g10/keyserver.c:1201 #: g10/keyserver.c:1203
#, c-format #, c-format
msgid "sending key %s to %s\n" msgid "sending key %s to %s\n"
msgstr "envoi de la clé %s à %s\n" msgstr "envoi de la clé %s à %s\n"
#: g10/keyserver.c:1244 #: g10/keyserver.c:1246
#, c-format #, c-format
msgid "searching for \"%s\" from %s server %s\n" msgid "searching for \"%s\" from %s server %s\n"
msgstr "recherche de « %s » du serveur %s %s\n" msgstr "recherche de « %s » du serveur %s %s\n"
#: g10/keyserver.c:1247 #: g10/keyserver.c:1249
#, c-format #, c-format
msgid "searching for \"%s\" from %s\n" msgid "searching for \"%s\" from %s\n"
msgstr "recherche de « %s » de %s\n" msgstr "recherche de « %s » de %s\n"
#: g10/keyserver.c:1254 g10/keyserver.c:1349 #: g10/keyserver.c:1256 g10/keyserver.c:1351
msgid "no keyserver action!\n" msgid "no keyserver action!\n"
msgstr "pas d'action pour le serveur de clés !\n" msgstr "pas d'action pour le serveur de clés !\n"
#: g10/keyserver.c:1302 #: g10/keyserver.c:1304
#, c-format #, c-format
msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n" msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
msgstr "" msgstr ""
"AVERTISSEMENT: le gestionnaire de serveurs de clés provient d'une\n" "AVERTISSEMENT: le gestionnaire de serveurs de clés provient d'une\n"
"version différente de GnuPG (%s)\n" "version différente de GnuPG (%s)\n"
#: g10/keyserver.c:1311 #: g10/keyserver.c:1313
msgid "keyserver did not send VERSION\n" msgid "keyserver did not send VERSION\n"
msgstr "le serveurs de clés n'a pas envoyé son numéro de VERSION\n" msgstr "le serveurs de clés n'a pas envoyé son numéro de VERSION\n"
#: g10/keyserver.c:1371 #: g10/keyserver.c:1373
msgid "no keyserver known (use option --keyserver)\n" msgid "no keyserver known (use option --keyserver)\n"
msgstr "pas de serveur de clés connu (utilisez l'option --keyserver)\n" msgstr "pas de serveur de clés connu (utilisez l'option --keyserver)\n"
#: g10/keyserver.c:1377 #: g10/keyserver.c:1379
msgid "external keyserver calls are not supported in this build\n" msgid "external keyserver calls are not supported in this build\n"
msgstr "" msgstr ""
"les appels externes à un serveur de clé ne sont pas supportés dans\n" "les appels externes à un serveur de clé ne sont pas supportés dans\n"
"cette compilation\n" "cette compilation\n"
#: g10/keyserver.c:1389 #: g10/keyserver.c:1391
#, c-format #, c-format
msgid "no handler for keyserver scheme `%s'\n" msgid "no handler for keyserver scheme `%s'\n"
msgstr "pas de gestionnaire pour le type de serveurs de clés `%s'\n" msgstr "pas de gestionnaire pour le type de serveurs de clés `%s'\n"
#: g10/keyserver.c:1394 #: g10/keyserver.c:1396
#, c-format #, c-format
msgid "action `%s' not supported with keyserver scheme `%s'\n" msgid "action `%s' not supported with keyserver scheme `%s'\n"
msgstr "" msgstr ""
"l'action `%s' n'est pas supportée avec le type de serveurs\n" "l'action `%s' n'est pas supportée avec le type de serveurs\n"
"de clés `%s'\n" "de clés `%s'\n"
#: g10/keyserver.c:1402 #: g10/keyserver.c:1404
#, c-format #, c-format
msgid "%s does not support handler version %d\n" msgid "%s does not support handler version %d\n"
msgstr "%s ne supporte pas le gestionnaire de version %d\n" msgstr "%s ne supporte pas le gestionnaire de version %d\n"
#: g10/keyserver.c:1409 #: g10/keyserver.c:1411
msgid "keyserver timed out\n" msgid "keyserver timed out\n"
msgstr "le délai d'attente du serveur de clés a expiré\n" msgstr "le délai d'attente du serveur de clés a expiré\n"
#: g10/keyserver.c:1414 #: g10/keyserver.c:1416
msgid "keyserver internal error\n" msgid "keyserver internal error\n"
msgstr "erreur interne du serveur de clés\n" msgstr "erreur interne du serveur de clés\n"
#: g10/keyserver.c:1423 #: g10/keyserver.c:1425
#, c-format #, c-format
msgid "keyserver communications error: %s\n" msgid "keyserver communications error: %s\n"
msgstr "erreur de communication avec le serveur de clés: %s\n" msgstr "erreur de communication avec le serveur de clés: %s\n"
#: g10/keyserver.c:1448 g10/keyserver.c:1482 #: g10/keyserver.c:1450 g10/keyserver.c:1484
#, c-format #, c-format
msgid "\"%s\" not a key ID: skipping\n" msgid "\"%s\" not a key ID: skipping\n"
msgstr "« %s » n'est pas une ID de clé: ignoré\n" msgstr "« %s » n'est pas une ID de clé: ignoré\n"
#: g10/keyserver.c:1739 #: g10/keyserver.c:1741
#, c-format #, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n" msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr "" msgstr ""
"AVERTISSEMENT: impossible de rafraîchir la clé %s\n" "AVERTISSEMENT: impossible de rafraîchir la clé %s\n"
"via %s: %s\n" "via %s: %s\n"
#: g10/keyserver.c:1761 #: g10/keyserver.c:1763
#, c-format #, c-format
msgid "refreshing 1 key from %s\n" msgid "refreshing 1 key from %s\n"
msgstr "rafraîchissement d'une clé depuis %s\n" msgstr "rafraîchissement d'une clé depuis %s\n"
#: g10/keyserver.c:1763 #: g10/keyserver.c:1765
#, c-format #, c-format
msgid "refreshing %d keys from %s\n" msgid "refreshing %d keys from %s\n"
msgstr "rafraîchissement de %d clés depuis %s\n" msgstr "rafraîchissement de %d clés depuis %s\n"

63
po/gl.po
View File

@ -6,7 +6,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: gnupg 1.2.4\n" "Project-Id-Version: gnupg 1.2.4\n"
"Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n"
"POT-Creation-Date: 2005-07-26 18:08+0200\n" "POT-Creation-Date: 2005-07-27 19:41+0200\n"
"PO-Revision-Date: 2003-12-04 11:39+0100\n" "PO-Revision-Date: 2003-12-04 11:39+0100\n"
"Last-Translator: Jacobo Tarrio <jtarrio@trasno.net>\n" "Last-Translator: Jacobo Tarrio <jtarrio@trasno.net>\n"
"Language-Team: Galician <gpul-traduccion@ceu.fi.udc.es>\n" "Language-Team: Galician <gpul-traduccion@ceu.fi.udc.es>\n"
@ -734,13 +734,13 @@ msgstr "non se puido abrir `%s'\n"
msgid "--output doesn't work for this command\n" msgid "--output doesn't work for this command\n"
msgstr "--output non traballa con este comando\n" msgstr "--output non traballa con este comando\n"
#: g10/delkey.c:75 g10/export.c:178 g10/keyedit.c:3360 g10/keyserver.c:1569 #: g10/delkey.c:75 g10/export.c:178 g10/keyedit.c:3360 g10/keyserver.c:1571
#: g10/revoke.c:227 #: g10/revoke.c:227
#, fuzzy, c-format #, fuzzy, c-format
msgid "key \"%s\" not found: %s\n" msgid "key \"%s\" not found: %s\n"
msgstr "non se atopou a chave `%s': %s\n" msgstr "non se atopou a chave `%s': %s\n"
#: g10/delkey.c:83 g10/export.c:208 g10/import.c:2334 g10/keyserver.c:1583 #: g10/delkey.c:83 g10/export.c:208 g10/import.c:2334 g10/keyserver.c:1585
#: g10/revoke.c:233 g10/revoke.c:440 #: g10/revoke.c:233 g10/revoke.c:440
#, c-format #, c-format
msgid "error reading keyblock: %s\n" msgid "error reading keyblock: %s\n"
@ -951,13 +951,22 @@ msgstr "chave %08lX: non est
msgid "key %s: PGP 2.x style key - skipped\n" msgid "key %s: PGP 2.x style key - skipped\n"
msgstr "chave %08lX: chave estilo PGP 2.x - omitida\n" msgstr "chave %08lX: chave estilo PGP 2.x - omitida\n"
#: g10/export.c:454 #: g10/export.c:409
msgid "about to export an unprotected subkey\n"
msgstr ""
#: g10/export.c:432
#, fuzzy, c-format
msgid "failed to unprotect the subkey: %s\n"
msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
#: g10/export.c:453
#, fuzzy, c-format #, fuzzy, c-format
msgid "WARNING: secret key %s does not have a simple SK checksum\n" msgid "WARNING: secret key %s does not have a simple SK checksum\n"
msgstr "" msgstr ""
"AVISO: a chave secreta %08lX non ten unha suma de comprobación SK simple\n" "AVISO: a chave secreta %08lX non ten unha suma de comprobación SK simple\n"
#: g10/export.c:486 #: g10/export.c:485
msgid "WARNING: nothing exported\n" msgid "WARNING: nothing exported\n"
msgstr "AVISO: non se exportou nada\n" msgstr "AVISO: non se exportou nada\n"
@ -4185,7 +4194,7 @@ msgstr "disable"
msgid "Enter number(s), N)ext, or Q)uit > " msgid "Enter number(s), N)ext, or Q)uit > "
msgstr "" msgstr ""
#: g10/keyserver.c:724 g10/keyserver.c:1294 #: g10/keyserver.c:724 g10/keyserver.c:1296
#, fuzzy, c-format #, fuzzy, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n" msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "opcións de exportación non válidas\n" msgstr "opcións de exportación non válidas\n"
@ -4200,107 +4209,107 @@ msgstr "non se atopou a chave `%s': %s\n"
msgid "key not found on keyserver\n" msgid "key not found on keyserver\n"
msgstr "non se atopou a chave `%s': %s\n" msgstr "non se atopou a chave `%s': %s\n"
#: g10/keyserver.c:1041 #: g10/keyserver.c:1043
#, fuzzy, c-format #, fuzzy, c-format
msgid "requesting key %s from %s server %s\n" msgid "requesting key %s from %s server %s\n"
msgstr "solicitando a chave %08lX de %s\n" msgstr "solicitando a chave %08lX de %s\n"
#: g10/keyserver.c:1045 #: g10/keyserver.c:1047
#, fuzzy, c-format #, fuzzy, c-format
msgid "requesting key %s from %s\n" msgid "requesting key %s from %s\n"
msgstr "solicitando a chave %08lX de %s\n" msgstr "solicitando a chave %08lX de %s\n"
#: g10/keyserver.c:1197 #: g10/keyserver.c:1199
#, fuzzy, c-format #, fuzzy, c-format
msgid "sending key %s to %s server %s\n" msgid "sending key %s to %s server %s\n"
msgstr "buscando \"%s\" no servidor HKP %s\n" msgstr "buscando \"%s\" no servidor HKP %s\n"
#: g10/keyserver.c:1201 #: g10/keyserver.c:1203
#, fuzzy, c-format #, fuzzy, c-format
msgid "sending key %s to %s\n" msgid "sending key %s to %s\n"
msgstr "" msgstr ""
"\"\n" "\"\n"
"asinado coa súa chave %08lX no %s\n" "asinado coa súa chave %08lX no %s\n"
#: g10/keyserver.c:1244 #: g10/keyserver.c:1246
#, fuzzy, c-format #, fuzzy, c-format
msgid "searching for \"%s\" from %s server %s\n" msgid "searching for \"%s\" from %s server %s\n"
msgstr "buscando \"%s\" no servidor HKP %s\n" msgstr "buscando \"%s\" no servidor HKP %s\n"
#: g10/keyserver.c:1247 #: g10/keyserver.c:1249
#, fuzzy, c-format #, fuzzy, c-format
msgid "searching for \"%s\" from %s\n" msgid "searching for \"%s\" from %s\n"
msgstr "buscando \"%s\" no servidor HKP %s\n" msgstr "buscando \"%s\" no servidor HKP %s\n"
#: g10/keyserver.c:1254 g10/keyserver.c:1349 #: g10/keyserver.c:1256 g10/keyserver.c:1351
#, fuzzy #, fuzzy
msgid "no keyserver action!\n" msgid "no keyserver action!\n"
msgstr "opcións de exportación non válidas\n" msgstr "opcións de exportación non válidas\n"
#: g10/keyserver.c:1302 #: g10/keyserver.c:1304
#, c-format #, c-format
msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n" msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1311 #: g10/keyserver.c:1313
msgid "keyserver did not send VERSION\n" msgid "keyserver did not send VERSION\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1371 #: g10/keyserver.c:1373
msgid "no keyserver known (use option --keyserver)\n" msgid "no keyserver known (use option --keyserver)\n"
msgstr "" msgstr ""
"non hai un servidor de chaves coñecido (empregue a opción --keyserver)\n" "non hai un servidor de chaves coñecido (empregue a opción --keyserver)\n"
#: g10/keyserver.c:1377 #: g10/keyserver.c:1379
msgid "external keyserver calls are not supported in this build\n" msgid "external keyserver calls are not supported in this build\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1389 #: g10/keyserver.c:1391
#, c-format #, c-format
msgid "no handler for keyserver scheme `%s'\n" msgid "no handler for keyserver scheme `%s'\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1394 #: g10/keyserver.c:1396
#, c-format #, c-format
msgid "action `%s' not supported with keyserver scheme `%s'\n" msgid "action `%s' not supported with keyserver scheme `%s'\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1402 #: g10/keyserver.c:1404
#, c-format #, c-format
msgid "%s does not support handler version %d\n" msgid "%s does not support handler version %d\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1409 #: g10/keyserver.c:1411
#, fuzzy #, fuzzy
msgid "keyserver timed out\n" msgid "keyserver timed out\n"
msgstr "erro do servidor de chaves" msgstr "erro do servidor de chaves"
#: g10/keyserver.c:1414 #: g10/keyserver.c:1416
#, fuzzy #, fuzzy
msgid "keyserver internal error\n" msgid "keyserver internal error\n"
msgstr "erro do servidor de chaves" msgstr "erro do servidor de chaves"
#: g10/keyserver.c:1423 #: g10/keyserver.c:1425
#, fuzzy, c-format #, fuzzy, c-format
msgid "keyserver communications error: %s\n" msgid "keyserver communications error: %s\n"
msgstr "a recepción do servidor de chaves fallou: %s\n" msgstr "a recepción do servidor de chaves fallou: %s\n"
#: g10/keyserver.c:1448 g10/keyserver.c:1482 #: g10/keyserver.c:1450 g10/keyserver.c:1484
#, fuzzy, c-format #, fuzzy, c-format
msgid "\"%s\" not a key ID: skipping\n" msgid "\"%s\" not a key ID: skipping\n"
msgstr "%s: non é un ID de chave válido\n" msgstr "%s: non é un ID de chave válido\n"
#: g10/keyserver.c:1739 #: g10/keyserver.c:1741
#, fuzzy, c-format #, fuzzy, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n" msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr "AVISO: non se puido borra-lo ficheiro temporal (%s) `%s': %s\n" msgstr "AVISO: non se puido borra-lo ficheiro temporal (%s) `%s': %s\n"
#: g10/keyserver.c:1761 #: g10/keyserver.c:1763
#, fuzzy, c-format #, fuzzy, c-format
msgid "refreshing 1 key from %s\n" msgid "refreshing 1 key from %s\n"
msgstr "solicitando a chave %08lX de %s\n" msgstr "solicitando a chave %08lX de %s\n"
#: g10/keyserver.c:1763 #: g10/keyserver.c:1765
#, fuzzy, c-format #, fuzzy, c-format
msgid "refreshing %d keys from %s\n" msgid "refreshing %d keys from %s\n"
msgstr "solicitando a chave %08lX de %s\n" msgstr "solicitando a chave %08lX de %s\n"

63
po/hu.po
View File

@ -6,7 +6,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: gnupg 1.2.5\n" "Project-Id-Version: gnupg 1.2.5\n"
"Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n"
"POT-Creation-Date: 2005-07-26 18:08+0200\n" "POT-Creation-Date: 2005-07-27 19:41+0200\n"
"PO-Revision-Date: 2004-06-19 21:53+0200\n" "PO-Revision-Date: 2004-06-19 21:53+0200\n"
"Last-Translator: Nagy Ferenc László <nfl@nfllab.com>\n" "Last-Translator: Nagy Ferenc László <nfl@nfllab.com>\n"
"Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n" "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
@ -729,13 +729,13 @@ msgstr "Nem tudom megnyitni %s-t!\n"
msgid "--output doesn't work for this command\n" msgid "--output doesn't work for this command\n"
msgstr "Az --output opció nem mûködik ehhez a parancshoz.\n" msgstr "Az --output opció nem mûködik ehhez a parancshoz.\n"
#: g10/delkey.c:75 g10/export.c:178 g10/keyedit.c:3360 g10/keyserver.c:1569 #: g10/delkey.c:75 g10/export.c:178 g10/keyedit.c:3360 g10/keyserver.c:1571
#: g10/revoke.c:227 #: g10/revoke.c:227
#, fuzzy, c-format #, fuzzy, c-format
msgid "key \"%s\" not found: %s\n" msgid "key \"%s\" not found: %s\n"
msgstr "\"%s\" kulcs nem található: %s\n" msgstr "\"%s\" kulcs nem található: %s\n"
#: g10/delkey.c:83 g10/export.c:208 g10/import.c:2334 g10/keyserver.c:1583 #: g10/delkey.c:83 g10/export.c:208 g10/import.c:2334 g10/keyserver.c:1585
#: g10/revoke.c:233 g10/revoke.c:440 #: g10/revoke.c:233 g10/revoke.c:440
#, c-format #, c-format
msgid "error reading keyblock: %s\n" msgid "error reading keyblock: %s\n"
@ -941,12 +941,21 @@ msgstr "%08lX kulcs: nem v
msgid "key %s: PGP 2.x style key - skipped\n" msgid "key %s: PGP 2.x style key - skipped\n"
msgstr "%08lX kulcs: PGP 2.x stílusú kulcs - kihagytam.\n" msgstr "%08lX kulcs: PGP 2.x stílusú kulcs - kihagytam.\n"
#: g10/export.c:454 #: g10/export.c:409
msgid "about to export an unprotected subkey\n"
msgstr ""
#: g10/export.c:432
#, fuzzy, c-format
msgid "failed to unprotect the subkey: %s\n"
msgstr "Bizalmi adatbázis (%s) inicializálása sikertelen!\n"
#: g10/export.c:453
#, fuzzy, c-format #, fuzzy, c-format
msgid "WARNING: secret key %s does not have a simple SK checksum\n" msgid "WARNING: secret key %s does not have a simple SK checksum\n"
msgstr "FIGYELEM: %08lX titkos kulcsnak nincs egyszerû SK ellenõrzõösszege.\n" msgstr "FIGYELEM: %08lX titkos kulcsnak nincs egyszerû SK ellenõrzõösszege.\n"
#: g10/export.c:486 #: g10/export.c:485
msgid "WARNING: nothing exported\n" msgid "WARNING: nothing exported\n"
msgstr "FIGYELEM: Semmit sem exportáltam.\n" msgstr "FIGYELEM: Semmit sem exportáltam.\n"
@ -4159,7 +4168,7 @@ msgstr "disable"
msgid "Enter number(s), N)ext, or Q)uit > " msgid "Enter number(s), N)ext, or Q)uit > "
msgstr "" msgstr ""
#: g10/keyserver.c:724 g10/keyserver.c:1294 #: g10/keyserver.c:724 g10/keyserver.c:1296
#, fuzzy, c-format #, fuzzy, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n" msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "Érvénytelen export opciók!\n" msgstr "Érvénytelen export opciók!\n"
@ -4174,107 +4183,107 @@ msgstr "\"%s\" kulcs nem tal
msgid "key not found on keyserver\n" msgid "key not found on keyserver\n"
msgstr "\"%s\" kulcs nem található: %s\n" msgstr "\"%s\" kulcs nem található: %s\n"
#: g10/keyserver.c:1041 #: g10/keyserver.c:1043
#, fuzzy, c-format #, fuzzy, c-format
msgid "requesting key %s from %s server %s\n" msgid "requesting key %s from %s server %s\n"
msgstr "Lekérem a %08lX kulcsot a %s kulcsszerverrõl.\n" msgstr "Lekérem a %08lX kulcsot a %s kulcsszerverrõl.\n"
#: g10/keyserver.c:1045 #: g10/keyserver.c:1047
#, fuzzy, c-format #, fuzzy, c-format
msgid "requesting key %s from %s\n" msgid "requesting key %s from %s\n"
msgstr "Lekérem a %08lX kulcsot a %s kulcsszerverrõl.\n" msgstr "Lekérem a %08lX kulcsot a %s kulcsszerverrõl.\n"
#: g10/keyserver.c:1197 #: g10/keyserver.c:1199
#, fuzzy, c-format #, fuzzy, c-format
msgid "sending key %s to %s server %s\n" msgid "sending key %s to %s server %s\n"
msgstr "Keresem \"%s\"-t a %s HKP szerveren.\n" msgstr "Keresem \"%s\"-t a %s HKP szerveren.\n"
#: g10/keyserver.c:1201 #: g10/keyserver.c:1203
#, fuzzy, c-format #, fuzzy, c-format
msgid "sending key %s to %s\n" msgid "sending key %s to %s\n"
msgstr "" msgstr ""
"\"\n" "\"\n"
"Aláírva az Ön %08lX kulcsával %s idõpontban.\n" "Aláírva az Ön %08lX kulcsával %s idõpontban.\n"
#: g10/keyserver.c:1244 #: g10/keyserver.c:1246
#, fuzzy, c-format #, fuzzy, c-format
msgid "searching for \"%s\" from %s server %s\n" msgid "searching for \"%s\" from %s server %s\n"
msgstr "Keresem \"%s\"-t a %s HKP szerveren.\n" msgstr "Keresem \"%s\"-t a %s HKP szerveren.\n"
#: g10/keyserver.c:1247 #: g10/keyserver.c:1249
#, fuzzy, c-format #, fuzzy, c-format
msgid "searching for \"%s\" from %s\n" msgid "searching for \"%s\" from %s\n"
msgstr "Keresem \"%s\"-t a %s HKP szerveren.\n" msgstr "Keresem \"%s\"-t a %s HKP szerveren.\n"
#: g10/keyserver.c:1254 g10/keyserver.c:1349 #: g10/keyserver.c:1256 g10/keyserver.c:1351
#, fuzzy #, fuzzy
msgid "no keyserver action!\n" msgid "no keyserver action!\n"
msgstr "Érvénytelen export opciók!\n" msgstr "Érvénytelen export opciók!\n"
#: g10/keyserver.c:1302 #: g10/keyserver.c:1304
#, c-format #, c-format
msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n" msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1311 #: g10/keyserver.c:1313
msgid "keyserver did not send VERSION\n" msgid "keyserver did not send VERSION\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1371 #: g10/keyserver.c:1373
msgid "no keyserver known (use option --keyserver)\n" msgid "no keyserver known (use option --keyserver)\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1377 #: g10/keyserver.c:1379
msgid "external keyserver calls are not supported in this build\n" msgid "external keyserver calls are not supported in this build\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1389 #: g10/keyserver.c:1391
#, c-format #, c-format
msgid "no handler for keyserver scheme `%s'\n" msgid "no handler for keyserver scheme `%s'\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1394 #: g10/keyserver.c:1396
#, c-format #, c-format
msgid "action `%s' not supported with keyserver scheme `%s'\n" msgid "action `%s' not supported with keyserver scheme `%s'\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1402 #: g10/keyserver.c:1404
#, c-format #, c-format
msgid "%s does not support handler version %d\n" msgid "%s does not support handler version %d\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1409 #: g10/keyserver.c:1411
#, fuzzy #, fuzzy
msgid "keyserver timed out\n" msgid "keyserver timed out\n"
msgstr "kulcsszerverhiba" msgstr "kulcsszerverhiba"
#: g10/keyserver.c:1414 #: g10/keyserver.c:1416
#, fuzzy #, fuzzy
msgid "keyserver internal error\n" msgid "keyserver internal error\n"
msgstr "kulcsszerverhiba" msgstr "kulcsszerverhiba"
#: g10/keyserver.c:1423 #: g10/keyserver.c:1425
#, fuzzy, c-format #, fuzzy, c-format
msgid "keyserver communications error: %s\n" msgid "keyserver communications error: %s\n"
msgstr "Vétel a kulcsszerverrõl sikertelen: %s\n" msgstr "Vétel a kulcsszerverrõl sikertelen: %s\n"
#: g10/keyserver.c:1448 g10/keyserver.c:1482 #: g10/keyserver.c:1450 g10/keyserver.c:1484
#, c-format #, c-format
msgid "\"%s\" not a key ID: skipping\n" msgid "\"%s\" not a key ID: skipping\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1739 #: g10/keyserver.c:1741
#, fuzzy, c-format #, fuzzy, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n" msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr "" msgstr ""
"FIGYELEM: Nem tudom törölni az (\"%s\") átmeneti állományt: \"%s\": %s.\n" "FIGYELEM: Nem tudom törölni az (\"%s\") átmeneti állományt: \"%s\": %s.\n"
#: g10/keyserver.c:1761 #: g10/keyserver.c:1763
#, fuzzy, c-format #, fuzzy, c-format
msgid "refreshing 1 key from %s\n" msgid "refreshing 1 key from %s\n"
msgstr "Lekérem a %08lX kulcsot a %s kulcsszerverrõl.\n" msgstr "Lekérem a %08lX kulcsot a %s kulcsszerverrõl.\n"
#: g10/keyserver.c:1763 #: g10/keyserver.c:1765
#, fuzzy, c-format #, fuzzy, c-format
msgid "refreshing %d keys from %s\n" msgid "refreshing %d keys from %s\n"
msgstr "Lekérem a %08lX kulcsot a %s kulcsszerverrõl.\n" msgstr "Lekérem a %08lX kulcsot a %s kulcsszerverrõl.\n"

63
po/id.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: gnupg-id\n" "Project-Id-Version: gnupg-id\n"
"Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n"
"POT-Creation-Date: 2005-07-26 18:08+0200\n" "POT-Creation-Date: 2005-07-27 19:41+0200\n"
"PO-Revision-Date: 2004-06-17 16:32+0700\n" "PO-Revision-Date: 2004-06-17 16:32+0700\n"
"Last-Translator: Tedi Heriyanto <tedi_h@gmx.net>\n" "Last-Translator: Tedi Heriyanto <tedi_h@gmx.net>\n"
"Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n" "Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n"
@ -731,13 +731,13 @@ msgstr "tidak dapat membuka `%s'\n"
msgid "--output doesn't work for this command\n" msgid "--output doesn't work for this command\n"
msgstr "--output tidak berfungsi untuk perintah ini\n" msgstr "--output tidak berfungsi untuk perintah ini\n"
#: g10/delkey.c:75 g10/export.c:178 g10/keyedit.c:3360 g10/keyserver.c:1569 #: g10/delkey.c:75 g10/export.c:178 g10/keyedit.c:3360 g10/keyserver.c:1571
#: g10/revoke.c:227 #: g10/revoke.c:227
#, fuzzy, c-format #, fuzzy, c-format
msgid "key \"%s\" not found: %s\n" msgid "key \"%s\" not found: %s\n"
msgstr "kunci '%s' tidak ditemukan: %s\n" msgstr "kunci '%s' tidak ditemukan: %s\n"
#: g10/delkey.c:83 g10/export.c:208 g10/import.c:2334 g10/keyserver.c:1583 #: g10/delkey.c:83 g10/export.c:208 g10/import.c:2334 g10/keyserver.c:1585
#: g10/revoke.c:233 g10/revoke.c:440 #: g10/revoke.c:233 g10/revoke.c:440
#, c-format #, c-format
msgid "error reading keyblock: %s\n" msgid "error reading keyblock: %s\n"
@ -944,13 +944,22 @@ msgstr "kunci %08lX: tidak diproteksi - dilewati\n"
msgid "key %s: PGP 2.x style key - skipped\n" msgid "key %s: PGP 2.x style key - skipped\n"
msgstr "kunci %08lX: kunci gaya PGP 2.x - dilewati\n" msgstr "kunci %08lX: kunci gaya PGP 2.x - dilewati\n"
#: g10/export.c:454 #: g10/export.c:409
msgid "about to export an unprotected subkey\n"
msgstr ""
#: g10/export.c:432
#, fuzzy, c-format
msgid "failed to unprotect the subkey: %s\n"
msgstr "gagal inisialisasi TrustDB: %s\n"
#: g10/export.c:453
#, fuzzy, c-format #, fuzzy, c-format
msgid "WARNING: secret key %s does not have a simple SK checksum\n" msgid "WARNING: secret key %s does not have a simple SK checksum\n"
msgstr "" msgstr ""
"PERINGATAN: kunci rahasia %08lX tidak memiliki sebuah checksum SK sederhana\n" "PERINGATAN: kunci rahasia %08lX tidak memiliki sebuah checksum SK sederhana\n"
#: g10/export.c:486 #: g10/export.c:485
msgid "WARNING: nothing exported\n" msgid "WARNING: nothing exported\n"
msgstr "PERINGATAN: tidak ada yang diekspor\n" msgstr "PERINGATAN: tidak ada yang diekspor\n"
@ -4174,7 +4183,7 @@ msgstr "disable"
msgid "Enter number(s), N)ext, or Q)uit > " msgid "Enter number(s), N)ext, or Q)uit > "
msgstr "" msgstr ""
#: g10/keyserver.c:724 g10/keyserver.c:1294 #: g10/keyserver.c:724 g10/keyserver.c:1296
#, fuzzy, c-format #, fuzzy, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n" msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "opsi ekspor tidak valid\n" msgstr "opsi ekspor tidak valid\n"
@ -4189,106 +4198,106 @@ msgstr "kunci '%s' tidak ditemukan: %s\n"
msgid "key not found on keyserver\n" msgid "key not found on keyserver\n"
msgstr "kunci '%s' tidak ditemukan: %s\n" msgstr "kunci '%s' tidak ditemukan: %s\n"
#: g10/keyserver.c:1041 #: g10/keyserver.c:1043
#, fuzzy, c-format #, fuzzy, c-format
msgid "requesting key %s from %s server %s\n" msgid "requesting key %s from %s server %s\n"
msgstr "meminta kunci %08lX dari %s\n" msgstr "meminta kunci %08lX dari %s\n"
#: g10/keyserver.c:1045 #: g10/keyserver.c:1047
#, fuzzy, c-format #, fuzzy, c-format
msgid "requesting key %s from %s\n" msgid "requesting key %s from %s\n"
msgstr "meminta kunci %08lX dari %s\n" msgstr "meminta kunci %08lX dari %s\n"
#: g10/keyserver.c:1197 #: g10/keyserver.c:1199
#, fuzzy, c-format #, fuzzy, c-format
msgid "sending key %s to %s server %s\n" msgid "sending key %s to %s server %s\n"
msgstr "mencari \"%s\" dari server HKP %s\n" msgstr "mencari \"%s\" dari server HKP %s\n"
#: g10/keyserver.c:1201 #: g10/keyserver.c:1203
#, fuzzy, c-format #, fuzzy, c-format
msgid "sending key %s to %s\n" msgid "sending key %s to %s\n"
msgstr "" msgstr ""
"\"\n" "\"\n"
"ditandai dengan kunci anda %08lX pada %s\n" "ditandai dengan kunci anda %08lX pada %s\n"
#: g10/keyserver.c:1244 #: g10/keyserver.c:1246
#, fuzzy, c-format #, fuzzy, c-format
msgid "searching for \"%s\" from %s server %s\n" msgid "searching for \"%s\" from %s server %s\n"
msgstr "mencari \"%s\" dari server HKP %s\n" msgstr "mencari \"%s\" dari server HKP %s\n"
#: g10/keyserver.c:1247 #: g10/keyserver.c:1249
#, fuzzy, c-format #, fuzzy, c-format
msgid "searching for \"%s\" from %s\n" msgid "searching for \"%s\" from %s\n"
msgstr "mencari \"%s\" dari server HKP %s\n" msgstr "mencari \"%s\" dari server HKP %s\n"
#: g10/keyserver.c:1254 g10/keyserver.c:1349 #: g10/keyserver.c:1256 g10/keyserver.c:1351
#, fuzzy #, fuzzy
msgid "no keyserver action!\n" msgid "no keyserver action!\n"
msgstr "opsi ekspor tidak valid\n" msgstr "opsi ekspor tidak valid\n"
#: g10/keyserver.c:1302 #: g10/keyserver.c:1304
#, c-format #, c-format
msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n" msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1311 #: g10/keyserver.c:1313
msgid "keyserver did not send VERSION\n" msgid "keyserver did not send VERSION\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1371 #: g10/keyserver.c:1373
msgid "no keyserver known (use option --keyserver)\n" msgid "no keyserver known (use option --keyserver)\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1377 #: g10/keyserver.c:1379
msgid "external keyserver calls are not supported in this build\n" msgid "external keyserver calls are not supported in this build\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1389 #: g10/keyserver.c:1391
#, c-format #, c-format
msgid "no handler for keyserver scheme `%s'\n" msgid "no handler for keyserver scheme `%s'\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1394 #: g10/keyserver.c:1396
#, c-format #, c-format
msgid "action `%s' not supported with keyserver scheme `%s'\n" msgid "action `%s' not supported with keyserver scheme `%s'\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1402 #: g10/keyserver.c:1404
#, c-format #, c-format
msgid "%s does not support handler version %d\n" msgid "%s does not support handler version %d\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1409 #: g10/keyserver.c:1411
#, fuzzy #, fuzzy
msgid "keyserver timed out\n" msgid "keyserver timed out\n"
msgstr "kesalahan keyserver" msgstr "kesalahan keyserver"
#: g10/keyserver.c:1414 #: g10/keyserver.c:1416
#, fuzzy #, fuzzy
msgid "keyserver internal error\n" msgid "keyserver internal error\n"
msgstr "kesalahan keyserver" msgstr "kesalahan keyserver"
#: g10/keyserver.c:1423 #: g10/keyserver.c:1425
#, fuzzy, c-format #, fuzzy, c-format
msgid "keyserver communications error: %s\n" msgid "keyserver communications error: %s\n"
msgstr "Penerimaan keyserver gagal: %s\n" msgstr "Penerimaan keyserver gagal: %s\n"
#: g10/keyserver.c:1448 g10/keyserver.c:1482 #: g10/keyserver.c:1450 g10/keyserver.c:1484
#, c-format #, c-format
msgid "\"%s\" not a key ID: skipping\n" msgid "\"%s\" not a key ID: skipping\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1739 #: g10/keyserver.c:1741
#, fuzzy, c-format #, fuzzy, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n" msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr "PERINGATAN: tidak dapat menghapus file temp (%s) `%s': %s\n" msgstr "PERINGATAN: tidak dapat menghapus file temp (%s) `%s': %s\n"
#: g10/keyserver.c:1761 #: g10/keyserver.c:1763
#, fuzzy, c-format #, fuzzy, c-format
msgid "refreshing 1 key from %s\n" msgid "refreshing 1 key from %s\n"
msgstr "meminta kunci %08lX dari %s\n" msgstr "meminta kunci %08lX dari %s\n"
#: g10/keyserver.c:1763 #: g10/keyserver.c:1765
#, fuzzy, c-format #, fuzzy, c-format
msgid "refreshing %d keys from %s\n" msgid "refreshing %d keys from %s\n"
msgstr "meminta kunci %08lX dari %s\n" msgstr "meminta kunci %08lX dari %s\n"

63
po/it.po
View File

@ -6,7 +6,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: gnupg 1.1.92\n" "Project-Id-Version: gnupg 1.1.92\n"
"Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n"
"POT-Creation-Date: 2005-07-26 18:08+0200\n" "POT-Creation-Date: 2005-07-27 19:41+0200\n"
"PO-Revision-Date: 2004-06-16 17:01+0200\n" "PO-Revision-Date: 2004-06-16 17:01+0200\n"
"Last-Translator: Marco d'Itri <md@linux.it>\n" "Last-Translator: Marco d'Itri <md@linux.it>\n"
"Language-Team: Italian <tp@lists.linux.it>\n" "Language-Team: Italian <tp@lists.linux.it>\n"
@ -733,13 +733,13 @@ msgstr "impossibile aprire `%s'\n"
msgid "--output doesn't work for this command\n" msgid "--output doesn't work for this command\n"
msgstr "--output non funziona con questo comando\n" msgstr "--output non funziona con questo comando\n"
#: g10/delkey.c:75 g10/export.c:178 g10/keyedit.c:3360 g10/keyserver.c:1569 #: g10/delkey.c:75 g10/export.c:178 g10/keyedit.c:3360 g10/keyserver.c:1571
#: g10/revoke.c:227 #: g10/revoke.c:227
#, fuzzy, c-format #, fuzzy, c-format
msgid "key \"%s\" not found: %s\n" msgid "key \"%s\" not found: %s\n"
msgstr "chiave `%s' non trovata: %s\n" msgstr "chiave `%s' non trovata: %s\n"
#: g10/delkey.c:83 g10/export.c:208 g10/import.c:2334 g10/keyserver.c:1583 #: g10/delkey.c:83 g10/export.c:208 g10/import.c:2334 g10/keyserver.c:1585
#: g10/revoke.c:233 g10/revoke.c:440 #: g10/revoke.c:233 g10/revoke.c:440
#, c-format #, c-format
msgid "error reading keyblock: %s\n" msgid "error reading keyblock: %s\n"
@ -956,12 +956,21 @@ msgstr "chiave %08lX: non protetta - saltata\n"
msgid "key %s: PGP 2.x style key - skipped\n" msgid "key %s: PGP 2.x style key - skipped\n"
msgstr "chiave %08lX: chiave in stile PGP 2.x - saltata\n" msgstr "chiave %08lX: chiave in stile PGP 2.x - saltata\n"
#: g10/export.c:454 #: g10/export.c:409
msgid "about to export an unprotected subkey\n"
msgstr ""
#: g10/export.c:432
#, fuzzy, c-format
msgid "failed to unprotect the subkey: %s\n"
msgstr "inizializzazione del trustdb fallita: %s\n"
#: g10/export.c:453
#, fuzzy, c-format #, fuzzy, c-format
msgid "WARNING: secret key %s does not have a simple SK checksum\n" msgid "WARNING: secret key %s does not have a simple SK checksum\n"
msgstr "ATTENZIONE: la chiave segreta %08lX non ha un checksum SK semplice\n" msgstr "ATTENZIONE: la chiave segreta %08lX non ha un checksum SK semplice\n"
#: g10/export.c:486 #: g10/export.c:485
msgid "WARNING: nothing exported\n" msgid "WARNING: nothing exported\n"
msgstr "ATTENZIONE: non è stato esportato nulla\n" msgstr "ATTENZIONE: non è stato esportato nulla\n"
@ -4196,7 +4205,7 @@ msgstr "disable"
msgid "Enter number(s), N)ext, or Q)uit > " msgid "Enter number(s), N)ext, or Q)uit > "
msgstr "" msgstr ""
#: g10/keyserver.c:724 g10/keyserver.c:1294 #: g10/keyserver.c:724 g10/keyserver.c:1296
#, fuzzy, c-format #, fuzzy, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n" msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "opzioni di esportazione non valide\n" msgstr "opzioni di esportazione non valide\n"
@ -4211,22 +4220,22 @@ msgstr "chiave `%s' non trovata: %s\n"
msgid "key not found on keyserver\n" msgid "key not found on keyserver\n"
msgstr "chiave `%s' non trovata: %s\n" msgstr "chiave `%s' non trovata: %s\n"
#: g10/keyserver.c:1041 #: g10/keyserver.c:1043
#, fuzzy, c-format #, fuzzy, c-format
msgid "requesting key %s from %s server %s\n" msgid "requesting key %s from %s server %s\n"
msgstr "richiedo la chiave %08lX a %s\n" msgstr "richiedo la chiave %08lX a %s\n"
#: g10/keyserver.c:1045 #: g10/keyserver.c:1047
#, fuzzy, c-format #, fuzzy, c-format
msgid "requesting key %s from %s\n" msgid "requesting key %s from %s\n"
msgstr "richiedo la chiave %08lX a %s\n" msgstr "richiedo la chiave %08lX a %s\n"
#: g10/keyserver.c:1197 #: g10/keyserver.c:1199
#, fuzzy, c-format #, fuzzy, c-format
msgid "sending key %s to %s server %s\n" msgid "sending key %s to %s server %s\n"
msgstr "cerco \"%s\" sul server HKP %s\n" msgstr "cerco \"%s\" sul server HKP %s\n"
#: g10/keyserver.c:1201 #: g10/keyserver.c:1203
#, fuzzy, c-format #, fuzzy, c-format
msgid "sending key %s to %s\n" msgid "sending key %s to %s\n"
msgstr "" msgstr ""
@ -4234,84 +4243,84 @@ msgstr ""
"firmata con la tua chiave %08lX il %s\n" "firmata con la tua chiave %08lX il %s\n"
"\n" "\n"
#: g10/keyserver.c:1244 #: g10/keyserver.c:1246
#, fuzzy, c-format #, fuzzy, c-format
msgid "searching for \"%s\" from %s server %s\n" msgid "searching for \"%s\" from %s server %s\n"
msgstr "cerco \"%s\" sul server HKP %s\n" msgstr "cerco \"%s\" sul server HKP %s\n"
#: g10/keyserver.c:1247 #: g10/keyserver.c:1249
#, fuzzy, c-format #, fuzzy, c-format
msgid "searching for \"%s\" from %s\n" msgid "searching for \"%s\" from %s\n"
msgstr "cerco \"%s\" sul server HKP %s\n" msgstr "cerco \"%s\" sul server HKP %s\n"
#: g10/keyserver.c:1254 g10/keyserver.c:1349 #: g10/keyserver.c:1256 g10/keyserver.c:1351
#, fuzzy #, fuzzy
msgid "no keyserver action!\n" msgid "no keyserver action!\n"
msgstr "opzioni di esportazione non valide\n" msgstr "opzioni di esportazione non valide\n"
#: g10/keyserver.c:1302 #: g10/keyserver.c:1304
#, c-format #, c-format
msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n" msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1311 #: g10/keyserver.c:1313
msgid "keyserver did not send VERSION\n" msgid "keyserver did not send VERSION\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1371 #: g10/keyserver.c:1373
msgid "no keyserver known (use option --keyserver)\n" msgid "no keyserver known (use option --keyserver)\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1377 #: g10/keyserver.c:1379
msgid "external keyserver calls are not supported in this build\n" msgid "external keyserver calls are not supported in this build\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1389 #: g10/keyserver.c:1391
#, c-format #, c-format
msgid "no handler for keyserver scheme `%s'\n" msgid "no handler for keyserver scheme `%s'\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1394 #: g10/keyserver.c:1396
#, c-format #, c-format
msgid "action `%s' not supported with keyserver scheme `%s'\n" msgid "action `%s' not supported with keyserver scheme `%s'\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1402 #: g10/keyserver.c:1404
#, c-format #, c-format
msgid "%s does not support handler version %d\n" msgid "%s does not support handler version %d\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1409 #: g10/keyserver.c:1411
#, fuzzy #, fuzzy
msgid "keyserver timed out\n" msgid "keyserver timed out\n"
msgstr "errore del keyserver" msgstr "errore del keyserver"
#: g10/keyserver.c:1414 #: g10/keyserver.c:1416
#, fuzzy #, fuzzy
msgid "keyserver internal error\n" msgid "keyserver internal error\n"
msgstr "errore del keyserver" msgstr "errore del keyserver"
#: g10/keyserver.c:1423 #: g10/keyserver.c:1425
#, fuzzy, c-format #, fuzzy, c-format
msgid "keyserver communications error: %s\n" msgid "keyserver communications error: %s\n"
msgstr "ricezione dal keyserver fallita: %s\n" msgstr "ricezione dal keyserver fallita: %s\n"
#: g10/keyserver.c:1448 g10/keyserver.c:1482 #: g10/keyserver.c:1450 g10/keyserver.c:1484
#, c-format #, c-format
msgid "\"%s\" not a key ID: skipping\n" msgid "\"%s\" not a key ID: skipping\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1739 #: g10/keyserver.c:1741
#, fuzzy, c-format #, fuzzy, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n" msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr "ATTENZIONE: impossibile cancellare il file temporaneo (%s) `%s': %s\n" msgstr "ATTENZIONE: impossibile cancellare il file temporaneo (%s) `%s': %s\n"
#: g10/keyserver.c:1761 #: g10/keyserver.c:1763
#, fuzzy, c-format #, fuzzy, c-format
msgid "refreshing 1 key from %s\n" msgid "refreshing 1 key from %s\n"
msgstr "richiedo la chiave %08lX a %s\n" msgstr "richiedo la chiave %08lX a %s\n"
#: g10/keyserver.c:1763 #: g10/keyserver.c:1765
#, fuzzy, c-format #, fuzzy, c-format
msgid "refreshing %d keys from %s\n" msgid "refreshing %d keys from %s\n"
msgstr "richiedo la chiave %08lX a %s\n" msgstr "richiedo la chiave %08lX a %s\n"

63
po/ja.po
View File

@ -9,7 +9,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: gnupg 1.3.92\n" "Project-Id-Version: gnupg 1.3.92\n"
"Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n"
"POT-Creation-Date: 2005-07-26 18:08+0200\n" "POT-Creation-Date: 2005-07-27 19:41+0200\n"
"PO-Revision-Date: 2004-11-23 11:14+0900\n" "PO-Revision-Date: 2004-11-23 11:14+0900\n"
"Last-Translator: IIDA Yosiaki <iida@gnu.org>\n" "Last-Translator: IIDA Yosiaki <iida@gnu.org>\n"
"Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n" "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
@ -702,13 +702,13 @@ msgstr "
msgid "--output doesn't work for this command\n" msgid "--output doesn't work for this command\n"
msgstr "このコマンドで--outputは機能しません\n" msgstr "このコマンドで--outputは機能しません\n"
#: g10/delkey.c:75 g10/export.c:178 g10/keyedit.c:3360 g10/keyserver.c:1569 #: g10/delkey.c:75 g10/export.c:178 g10/keyedit.c:3360 g10/keyserver.c:1571
#: g10/revoke.c:227 #: g10/revoke.c:227
#, c-format #, c-format
msgid "key \"%s\" not found: %s\n" msgid "key \"%s\" not found: %s\n"
msgstr "鍵“%s”が見つかりません: %s\n" msgstr "鍵“%s”が見つかりません: %s\n"
#: g10/delkey.c:83 g10/export.c:208 g10/import.c:2334 g10/keyserver.c:1583 #: g10/delkey.c:83 g10/export.c:208 g10/import.c:2334 g10/keyserver.c:1585
#: g10/revoke.c:233 g10/revoke.c:440 #: g10/revoke.c:233 g10/revoke.c:440
#, c-format #, c-format
msgid "error reading keyblock: %s\n" msgid "error reading keyblock: %s\n"
@ -906,12 +906,21 @@ msgstr "
msgid "key %s: PGP 2.x style key - skipped\n" msgid "key %s: PGP 2.x style key - skipped\n"
msgstr "鍵%s: PGP 2.x形式の鍵です - とばします\n" msgstr "鍵%s: PGP 2.x形式の鍵です - とばします\n"
#: g10/export.c:454 #: g10/export.c:409
msgid "about to export an unprotected subkey\n"
msgstr ""
#: g10/export.c:432
#, fuzzy, c-format
msgid "failed to unprotect the subkey: %s\n"
msgstr "鍵の保管に失敗しました: %s\n"
#: g10/export.c:453
#, c-format #, c-format
msgid "WARNING: secret key %s does not have a simple SK checksum\n" msgid "WARNING: secret key %s does not have a simple SK checksum\n"
msgstr "警告: 秘密鍵%sには、単純なSKチェックサムがありません\n" msgstr "警告: 秘密鍵%sには、単純なSKチェックサムがありません\n"
#: g10/export.c:486 #: g10/export.c:485
msgid "WARNING: nothing exported\n" msgid "WARNING: nothing exported\n"
msgstr "警告: 何も書き出していません\n" msgstr "警告: 何も書き出していません\n"
@ -4037,7 +4046,7 @@ msgstr "disabled"
msgid "Enter number(s), N)ext, or Q)uit > " msgid "Enter number(s), N)ext, or Q)uit > "
msgstr "番号(s)、N)次、またはQ)中止を入力してください >" msgstr "番号(s)、N)次、またはQ)中止を入力してください >"
#: g10/keyserver.c:724 g10/keyserver.c:1294 #: g10/keyserver.c:724 g10/keyserver.c:1296
#, c-format #, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n" msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "無効な鍵サーバー・プロトコルです (us %d!=handler %d)\n" msgstr "無効な鍵サーバー・プロトコルです (us %d!=handler %d)\n"
@ -4051,101 +4060,101 @@ msgstr "
msgid "key not found on keyserver\n" msgid "key not found on keyserver\n"
msgstr "鍵が鍵サーバーに見つかりません\n" msgstr "鍵が鍵サーバーに見つかりません\n"
#: g10/keyserver.c:1041 #: g10/keyserver.c:1043
#, c-format #, c-format
msgid "requesting key %s from %s server %s\n" msgid "requesting key %s from %s server %s\n"
msgstr "鍵%sを%sからサーバー%sに要求\n" msgstr "鍵%sを%sからサーバー%sに要求\n"
#: g10/keyserver.c:1045 #: g10/keyserver.c:1047
#, c-format #, c-format
msgid "requesting key %s from %s\n" msgid "requesting key %s from %s\n"
msgstr "鍵%sを%sに要求\n" msgstr "鍵%sを%sに要求\n"
#: g10/keyserver.c:1197 #: g10/keyserver.c:1199
#, c-format #, c-format
msgid "sending key %s to %s server %s\n" msgid "sending key %s to %s server %s\n"
msgstr "鍵%sを%sサーバー%sへ送信\n" msgstr "鍵%sを%sサーバー%sへ送信\n"
#: g10/keyserver.c:1201 #: g10/keyserver.c:1203
#, c-format #, c-format
msgid "sending key %s to %s\n" msgid "sending key %s to %s\n"
msgstr "鍵%sを%sへ送信\n" msgstr "鍵%sを%sへ送信\n"
#: g10/keyserver.c:1244 #: g10/keyserver.c:1246
#, c-format #, c-format
msgid "searching for \"%s\" from %s server %s\n" msgid "searching for \"%s\" from %s server %s\n"
msgstr "“%s”を%sサーバー%sから検索\n" msgstr "“%s”を%sサーバー%sから検索\n"
#: g10/keyserver.c:1247 #: g10/keyserver.c:1249
#, c-format #, c-format
msgid "searching for \"%s\" from %s\n" msgid "searching for \"%s\" from %s\n"
msgstr "“%s”をサーバー%sから検索\n" msgstr "“%s”をサーバー%sから検索\n"
#: g10/keyserver.c:1254 g10/keyserver.c:1349 #: g10/keyserver.c:1256 g10/keyserver.c:1351
msgid "no keyserver action!\n" msgid "no keyserver action!\n"
msgstr "鍵サーバー・アクションがありません!\n" msgstr "鍵サーバー・アクションがありません!\n"
#: g10/keyserver.c:1302 #: g10/keyserver.c:1304
#, c-format #, c-format
msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n" msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
msgstr "警告: 別版 (%s) のGnuPGの鍵サーバー・ハンドラ\n" msgstr "警告: 別版 (%s) のGnuPGの鍵サーバー・ハンドラ\n"
#: g10/keyserver.c:1311 #: g10/keyserver.c:1313
msgid "keyserver did not send VERSION\n" msgid "keyserver did not send VERSION\n"
msgstr "鍵サーバーはVERSIONを送信しませんでした\n" msgstr "鍵サーバーはVERSIONを送信しませんでした\n"
#: g10/keyserver.c:1371 #: g10/keyserver.c:1373
msgid "no keyserver known (use option --keyserver)\n" msgid "no keyserver known (use option --keyserver)\n"
msgstr "既知の鍵サーバーがありません (オプション--keyserverを使いましょう)\n" msgstr "既知の鍵サーバーがありません (オプション--keyserverを使いましょう)\n"
#: g10/keyserver.c:1377 #: g10/keyserver.c:1379
msgid "external keyserver calls are not supported in this build\n" msgid "external keyserver calls are not supported in this build\n"
msgstr "この構築では、外部鍵サーバーの呼出しはサポートしていません\n" msgstr "この構築では、外部鍵サーバーの呼出しはサポートしていません\n"
#: g10/keyserver.c:1389 #: g10/keyserver.c:1391
#, c-format #, c-format
msgid "no handler for keyserver scheme `%s'\n" msgid "no handler for keyserver scheme `%s'\n"
msgstr "鍵サーバー・スキーム「%s」用のハンドラがありません\n" msgstr "鍵サーバー・スキーム「%s」用のハンドラがありません\n"
#: g10/keyserver.c:1394 #: g10/keyserver.c:1396
#, c-format #, c-format
msgid "action `%s' not supported with keyserver scheme `%s'\n" msgid "action `%s' not supported with keyserver scheme `%s'\n"
msgstr "操作「%s」は、鍵サーバー・スキーム「%s」でサポートされていません\n" msgstr "操作「%s」は、鍵サーバー・スキーム「%s」でサポートされていません\n"
#: g10/keyserver.c:1402 #: g10/keyserver.c:1404
#, fuzzy, c-format #, fuzzy, c-format
msgid "%s does not support handler version %d\n" msgid "%s does not support handler version %d\n"
msgstr "gpgkeys_%sは、ハンドラ%d版をサポートしません\n" msgstr "gpgkeys_%sは、ハンドラ%d版をサポートしません\n"
#: g10/keyserver.c:1409 #: g10/keyserver.c:1411
msgid "keyserver timed out\n" msgid "keyserver timed out\n"
msgstr "鍵サーバーのタイムアウト\n" msgstr "鍵サーバーのタイムアウト\n"
#: g10/keyserver.c:1414 #: g10/keyserver.c:1416
msgid "keyserver internal error\n" msgid "keyserver internal error\n"
msgstr "鍵サーバーの内部エラー\n" msgstr "鍵サーバーの内部エラー\n"
#: g10/keyserver.c:1423 #: g10/keyserver.c:1425
#, c-format #, c-format
msgid "keyserver communications error: %s\n" msgid "keyserver communications error: %s\n"
msgstr "鍵サーバー通信エラー: %s\n" msgstr "鍵サーバー通信エラー: %s\n"
#: g10/keyserver.c:1448 g10/keyserver.c:1482 #: g10/keyserver.c:1450 g10/keyserver.c:1484
#, c-format #, c-format
msgid "\"%s\" not a key ID: skipping\n" msgid "\"%s\" not a key ID: skipping\n"
msgstr "“%s”鍵IDではありません: とばします\n" msgstr "“%s”鍵IDではありません: とばします\n"
#: g10/keyserver.c:1739 #: g10/keyserver.c:1741
#, c-format #, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n" msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr "警告: 鍵%sを%s経由で回復できません: %s\n" msgstr "警告: 鍵%sを%s経由で回復できません: %s\n"
#: g10/keyserver.c:1761 #: g10/keyserver.c:1763
#, c-format #, c-format
msgid "refreshing 1 key from %s\n" msgid "refreshing 1 key from %s\n"
msgstr "1本の鍵を%sから回復\n" msgstr "1本の鍵を%sから回復\n"
#: g10/keyserver.c:1763 #: g10/keyserver.c:1765
#, c-format #, c-format
msgid "refreshing %d keys from %s\n" msgid "refreshing %d keys from %s\n"
msgstr "%d本の鍵を%sから回復\n" msgstr "%d本の鍵を%sから回復\n"

63
po/pl.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: gnupg-1.2.2\n" "Project-Id-Version: gnupg-1.2.2\n"
"Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n"
"POT-Creation-Date: 2005-07-26 18:08+0200\n" "POT-Creation-Date: 2005-07-27 19:41+0200\n"
"PO-Revision-Date: 2004-06-23 15:54+0200\n" "PO-Revision-Date: 2004-06-23 15:54+0200\n"
"Last-Translator: Janusz A. Urbanowicz <alex@bofh.net.pl>\n" "Last-Translator: Janusz A. Urbanowicz <alex@bofh.net.pl>\n"
"Language-Team: Polish <pl@li.org>\n" "Language-Team: Polish <pl@li.org>\n"
@ -751,13 +751,13 @@ msgstr "nie mo
msgid "--output doesn't work for this command\n" msgid "--output doesn't work for this command\n"
msgstr "opcja --output nie dzia³a z tym poleceniem\n" msgstr "opcja --output nie dzia³a z tym poleceniem\n"
#: g10/delkey.c:75 g10/export.c:178 g10/keyedit.c:3360 g10/keyserver.c:1569 #: g10/delkey.c:75 g10/export.c:178 g10/keyedit.c:3360 g10/keyserver.c:1571
#: g10/revoke.c:227 #: g10/revoke.c:227
#, fuzzy, c-format #, fuzzy, c-format
msgid "key \"%s\" not found: %s\n" msgid "key \"%s\" not found: %s\n"
msgstr "klucz ,,%s'' nie zosta³ odnaleziony: %s\n" msgstr "klucz ,,%s'' nie zosta³ odnaleziony: %s\n"
#: g10/delkey.c:83 g10/export.c:208 g10/import.c:2334 g10/keyserver.c:1583 #: g10/delkey.c:83 g10/export.c:208 g10/import.c:2334 g10/keyserver.c:1585
#: g10/revoke.c:233 g10/revoke.c:440 #: g10/revoke.c:233 g10/revoke.c:440
#, c-format #, c-format
msgid "error reading keyblock: %s\n" msgid "error reading keyblock: %s\n"
@ -964,12 +964,21 @@ msgstr "klucz %08lX: nie jest chroniony - pomini
msgid "key %s: PGP 2.x style key - skipped\n" msgid "key %s: PGP 2.x style key - skipped\n"
msgstr "klucz %08lX: klucz PGP 2.x - pominiêty\n" msgstr "klucz %08lX: klucz PGP 2.x - pominiêty\n"
#: g10/export.c:454 #: g10/export.c:409
msgid "about to export an unprotected subkey\n"
msgstr ""
#: g10/export.c:432
#, fuzzy, c-format
msgid "failed to unprotect the subkey: %s\n"
msgstr "inicjowanie Bazy Zaufania nie powiod³o siê: %s\n"
#: g10/export.c:453
#, fuzzy, c-format #, fuzzy, c-format
msgid "WARNING: secret key %s does not have a simple SK checksum\n" msgid "WARNING: secret key %s does not have a simple SK checksum\n"
msgstr "OSTRZE¯ENIE: klucz prywatny %08lX nie ma prostej sumy kontrolnej SK.\n" msgstr "OSTRZE¯ENIE: klucz prywatny %08lX nie ma prostej sumy kontrolnej SK.\n"
#: g10/export.c:486 #: g10/export.c:485
msgid "WARNING: nothing exported\n" msgid "WARNING: nothing exported\n"
msgstr "OSTRZE¯ENIE: nic nie zosta³o wyeksportowane!\n" msgstr "OSTRZE¯ENIE: nic nie zosta³o wyeksportowane!\n"
@ -4202,7 +4211,7 @@ msgstr "wy
msgid "Enter number(s), N)ext, or Q)uit > " msgid "Enter number(s), N)ext, or Q)uit > "
msgstr "" msgstr ""
#: g10/keyserver.c:724 g10/keyserver.c:1294 #: g10/keyserver.c:724 g10/keyserver.c:1296
#, fuzzy, c-format #, fuzzy, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n" msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "niepoprawne opcje eksportu kluczy\n" msgstr "niepoprawne opcje eksportu kluczy\n"
@ -4217,106 +4226,106 @@ msgstr "klucz ,,%s'' nie zosta
msgid "key not found on keyserver\n" msgid "key not found on keyserver\n"
msgstr "klucz ,,%s'' nie zosta³ odnaleziony: %s\n" msgstr "klucz ,,%s'' nie zosta³ odnaleziony: %s\n"
#: g10/keyserver.c:1041 #: g10/keyserver.c:1043
#, fuzzy, c-format #, fuzzy, c-format
msgid "requesting key %s from %s server %s\n" msgid "requesting key %s from %s server %s\n"
msgstr "zapytanie o klucz %08lX w %s\n" msgstr "zapytanie o klucz %08lX w %s\n"
#: g10/keyserver.c:1045 #: g10/keyserver.c:1047
#, fuzzy, c-format #, fuzzy, c-format
msgid "requesting key %s from %s\n" msgid "requesting key %s from %s\n"
msgstr "zapytanie o klucz %08lX w %s\n" msgstr "zapytanie o klucz %08lX w %s\n"
#: g10/keyserver.c:1197 #: g10/keyserver.c:1199
#, fuzzy, c-format #, fuzzy, c-format
msgid "sending key %s to %s server %s\n" msgid "sending key %s to %s server %s\n"
msgstr "zapytanie o ,,%s'' w serwerze HKP %s\n" msgstr "zapytanie o ,,%s'' w serwerze HKP %s\n"
#: g10/keyserver.c:1201 #: g10/keyserver.c:1203
#, fuzzy, c-format #, fuzzy, c-format
msgid "sending key %s to %s\n" msgid "sending key %s to %s\n"
msgstr "" msgstr ""
"\"\n" "\"\n"
"podpisano Twoim kluczem %08lX w %s\n" "podpisano Twoim kluczem %08lX w %s\n"
#: g10/keyserver.c:1244 #: g10/keyserver.c:1246
#, fuzzy, c-format #, fuzzy, c-format
msgid "searching for \"%s\" from %s server %s\n" msgid "searching for \"%s\" from %s server %s\n"
msgstr "zapytanie o ,,%s'' w serwerze HKP %s\n" msgstr "zapytanie o ,,%s'' w serwerze HKP %s\n"
#: g10/keyserver.c:1247 #: g10/keyserver.c:1249
#, fuzzy, c-format #, fuzzy, c-format
msgid "searching for \"%s\" from %s\n" msgid "searching for \"%s\" from %s\n"
msgstr "zapytanie o ,,%s'' w serwerze HKP %s\n" msgstr "zapytanie o ,,%s'' w serwerze HKP %s\n"
#: g10/keyserver.c:1254 g10/keyserver.c:1349 #: g10/keyserver.c:1256 g10/keyserver.c:1351
#, fuzzy #, fuzzy
msgid "no keyserver action!\n" msgid "no keyserver action!\n"
msgstr "niepoprawne opcje eksportu kluczy\n" msgstr "niepoprawne opcje eksportu kluczy\n"
#: g10/keyserver.c:1302 #: g10/keyserver.c:1304
#, c-format #, c-format
msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n" msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1311 #: g10/keyserver.c:1313
msgid "keyserver did not send VERSION\n" msgid "keyserver did not send VERSION\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1371 #: g10/keyserver.c:1373
msgid "no keyserver known (use option --keyserver)\n" msgid "no keyserver known (use option --keyserver)\n"
msgstr "brak znanyk serwerów kluczy (u¿yj opcji --keyserver)\n" msgstr "brak znanyk serwerów kluczy (u¿yj opcji --keyserver)\n"
#: g10/keyserver.c:1377 #: g10/keyserver.c:1379
msgid "external keyserver calls are not supported in this build\n" msgid "external keyserver calls are not supported in this build\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1389 #: g10/keyserver.c:1391
#, c-format #, c-format
msgid "no handler for keyserver scheme `%s'\n" msgid "no handler for keyserver scheme `%s'\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1394 #: g10/keyserver.c:1396
#, c-format #, c-format
msgid "action `%s' not supported with keyserver scheme `%s'\n" msgid "action `%s' not supported with keyserver scheme `%s'\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1402 #: g10/keyserver.c:1404
#, c-format #, c-format
msgid "%s does not support handler version %d\n" msgid "%s does not support handler version %d\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1409 #: g10/keyserver.c:1411
#, fuzzy #, fuzzy
msgid "keyserver timed out\n" msgid "keyserver timed out\n"
msgstr "b³±d serwera kluczy" msgstr "b³±d serwera kluczy"
#: g10/keyserver.c:1414 #: g10/keyserver.c:1416
#, fuzzy #, fuzzy
msgid "keyserver internal error\n" msgid "keyserver internal error\n"
msgstr "b³±d serwera kluczy" msgstr "b³±d serwera kluczy"
#: g10/keyserver.c:1423 #: g10/keyserver.c:1425
#, fuzzy, c-format #, fuzzy, c-format
msgid "keyserver communications error: %s\n" msgid "keyserver communications error: %s\n"
msgstr "odbiór z serwera kluczy nie powiód³ siê: %s\n" msgstr "odbiór z serwera kluczy nie powiód³ siê: %s\n"
#: g10/keyserver.c:1448 g10/keyserver.c:1482 #: g10/keyserver.c:1450 g10/keyserver.c:1484
#, fuzzy, c-format #, fuzzy, c-format
msgid "\"%s\" not a key ID: skipping\n" msgid "\"%s\" not a key ID: skipping\n"
msgstr "%s: nie jest poprawnym identyfikatorem klucza\n" msgstr "%s: nie jest poprawnym identyfikatorem klucza\n"
#: g10/keyserver.c:1739 #: g10/keyserver.c:1741
#, fuzzy, c-format #, fuzzy, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n" msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr "OSTRZE¯ENIE: nie mo¿na skasowaæ pliku tymczasowego (%s) ,,%s'': %s.\n" msgstr "OSTRZE¯ENIE: nie mo¿na skasowaæ pliku tymczasowego (%s) ,,%s'': %s.\n"
#: g10/keyserver.c:1761 #: g10/keyserver.c:1763
#, fuzzy, c-format #, fuzzy, c-format
msgid "refreshing 1 key from %s\n" msgid "refreshing 1 key from %s\n"
msgstr "zapytanie o klucz %08lX w %s\n" msgstr "zapytanie o klucz %08lX w %s\n"
#: g10/keyserver.c:1763 #: g10/keyserver.c:1765
#, fuzzy, c-format #, fuzzy, c-format
msgid "refreshing %d keys from %s\n" msgid "refreshing %d keys from %s\n"
msgstr "zapytanie o klucz %08lX w %s\n" msgstr "zapytanie o klucz %08lX w %s\n"

63
po/pt.po
View File

@ -9,7 +9,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: gnupg\n" "Project-Id-Version: gnupg\n"
"Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n"
"POT-Creation-Date: 2005-07-26 18:08+0200\n" "POT-Creation-Date: 2005-07-27 19:41+0200\n"
"PO-Revision-Date: 2002-09-13 18:26+0100\n" "PO-Revision-Date: 2002-09-13 18:26+0100\n"
"Last-Translator: Pedro Morais <morais@kde.org>\n" "Last-Translator: Pedro Morais <morais@kde.org>\n"
"Language-Team: pt <morais@kde.org>\n" "Language-Team: pt <morais@kde.org>\n"
@ -730,13 +730,13 @@ msgstr "imposs
msgid "--output doesn't work for this command\n" msgid "--output doesn't work for this command\n"
msgstr "--output não funciona para este comando\n" msgstr "--output não funciona para este comando\n"
#: g10/delkey.c:75 g10/export.c:178 g10/keyedit.c:3360 g10/keyserver.c:1569 #: g10/delkey.c:75 g10/export.c:178 g10/keyedit.c:3360 g10/keyserver.c:1571
#: g10/revoke.c:227 #: g10/revoke.c:227
#, fuzzy, c-format #, fuzzy, c-format
msgid "key \"%s\" not found: %s\n" msgid "key \"%s\" not found: %s\n"
msgstr "chave `%s' não encontrada: %s\n" msgstr "chave `%s' não encontrada: %s\n"
#: g10/delkey.c:83 g10/export.c:208 g10/import.c:2334 g10/keyserver.c:1583 #: g10/delkey.c:83 g10/export.c:208 g10/import.c:2334 g10/keyserver.c:1585
#: g10/revoke.c:233 g10/revoke.c:440 #: g10/revoke.c:233 g10/revoke.c:440
#, c-format #, c-format
msgid "error reading keyblock: %s\n" msgid "error reading keyblock: %s\n"
@ -944,12 +944,21 @@ msgstr "chave %08lX: n
msgid "key %s: PGP 2.x style key - skipped\n" msgid "key %s: PGP 2.x style key - skipped\n"
msgstr "chave %08lX: tipo PGP 2.x - ignorada\n" msgstr "chave %08lX: tipo PGP 2.x - ignorada\n"
#: g10/export.c:454 #: g10/export.c:409
msgid "about to export an unprotected subkey\n"
msgstr ""
#: g10/export.c:432
#, fuzzy, c-format
msgid "failed to unprotect the subkey: %s\n"
msgstr "falha ao inicializar a base de dados de confiança: %s\n"
#: g10/export.c:453
#, c-format #, c-format
msgid "WARNING: secret key %s does not have a simple SK checksum\n" msgid "WARNING: secret key %s does not have a simple SK checksum\n"
msgstr "" msgstr ""
#: g10/export.c:486 #: g10/export.c:485
msgid "WARNING: nothing exported\n" msgid "WARNING: nothing exported\n"
msgstr "AVISO: nada exportado\n" msgstr "AVISO: nada exportado\n"
@ -4170,7 +4179,7 @@ msgstr "disable"
msgid "Enter number(s), N)ext, or Q)uit > " msgid "Enter number(s), N)ext, or Q)uit > "
msgstr "" msgstr ""
#: g10/keyserver.c:724 g10/keyserver.c:1294 #: g10/keyserver.c:724 g10/keyserver.c:1296
#, fuzzy, c-format #, fuzzy, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n" msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "opções de exportação inválidas\n" msgstr "opções de exportação inválidas\n"
@ -4185,106 +4194,106 @@ msgstr "chave `%s' n
msgid "key not found on keyserver\n" msgid "key not found on keyserver\n"
msgstr "chave `%s' não encontrada: %s\n" msgstr "chave `%s' não encontrada: %s\n"
#: g10/keyserver.c:1041 #: g10/keyserver.c:1043
#, fuzzy, c-format #, fuzzy, c-format
msgid "requesting key %s from %s server %s\n" msgid "requesting key %s from %s server %s\n"
msgstr "a pedir a chave %08lX de %s\n" msgstr "a pedir a chave %08lX de %s\n"
#: g10/keyserver.c:1045 #: g10/keyserver.c:1047
#, fuzzy, c-format #, fuzzy, c-format
msgid "requesting key %s from %s\n" msgid "requesting key %s from %s\n"
msgstr "a pedir a chave %08lX de %s\n" msgstr "a pedir a chave %08lX de %s\n"
#: g10/keyserver.c:1197 #: g10/keyserver.c:1199
#, fuzzy, c-format #, fuzzy, c-format
msgid "sending key %s to %s server %s\n" msgid "sending key %s to %s server %s\n"
msgstr "a procurar por \"%s\" no servidor HKP %s\n" msgstr "a procurar por \"%s\" no servidor HKP %s\n"
#: g10/keyserver.c:1201 #: g10/keyserver.c:1203
#, fuzzy, c-format #, fuzzy, c-format
msgid "sending key %s to %s\n" msgid "sending key %s to %s\n"
msgstr "" msgstr ""
"\"\n" "\"\n"
"assinado com a sua chave %08lX em %s\n" "assinado com a sua chave %08lX em %s\n"
#: g10/keyserver.c:1244 #: g10/keyserver.c:1246
#, fuzzy, c-format #, fuzzy, c-format
msgid "searching for \"%s\" from %s server %s\n" msgid "searching for \"%s\" from %s server %s\n"
msgstr "a procurar por \"%s\" no servidor HKP %s\n" msgstr "a procurar por \"%s\" no servidor HKP %s\n"
#: g10/keyserver.c:1247 #: g10/keyserver.c:1249
#, fuzzy, c-format #, fuzzy, c-format
msgid "searching for \"%s\" from %s\n" msgid "searching for \"%s\" from %s\n"
msgstr "a procurar por \"%s\" no servidor HKP %s\n" msgstr "a procurar por \"%s\" no servidor HKP %s\n"
#: g10/keyserver.c:1254 g10/keyserver.c:1349 #: g10/keyserver.c:1256 g10/keyserver.c:1351
#, fuzzy #, fuzzy
msgid "no keyserver action!\n" msgid "no keyserver action!\n"
msgstr "opções de exportação inválidas\n" msgstr "opções de exportação inválidas\n"
#: g10/keyserver.c:1302 #: g10/keyserver.c:1304
#, c-format #, c-format
msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n" msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1311 #: g10/keyserver.c:1313
msgid "keyserver did not send VERSION\n" msgid "keyserver did not send VERSION\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1371 #: g10/keyserver.c:1373
msgid "no keyserver known (use option --keyserver)\n" msgid "no keyserver known (use option --keyserver)\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1377 #: g10/keyserver.c:1379
msgid "external keyserver calls are not supported in this build\n" msgid "external keyserver calls are not supported in this build\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1389 #: g10/keyserver.c:1391
#, c-format #, c-format
msgid "no handler for keyserver scheme `%s'\n" msgid "no handler for keyserver scheme `%s'\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1394 #: g10/keyserver.c:1396
#, c-format #, c-format
msgid "action `%s' not supported with keyserver scheme `%s'\n" msgid "action `%s' not supported with keyserver scheme `%s'\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1402 #: g10/keyserver.c:1404
#, c-format #, c-format
msgid "%s does not support handler version %d\n" msgid "%s does not support handler version %d\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1409 #: g10/keyserver.c:1411
#, fuzzy #, fuzzy
msgid "keyserver timed out\n" msgid "keyserver timed out\n"
msgstr "erro do servidor de chaves" msgstr "erro do servidor de chaves"
#: g10/keyserver.c:1414 #: g10/keyserver.c:1416
#, fuzzy #, fuzzy
msgid "keyserver internal error\n" msgid "keyserver internal error\n"
msgstr "erro do servidor de chaves" msgstr "erro do servidor de chaves"
#: g10/keyserver.c:1423 #: g10/keyserver.c:1425
#, fuzzy, c-format #, fuzzy, c-format
msgid "keyserver communications error: %s\n" msgid "keyserver communications error: %s\n"
msgstr "A geração de chaves falhou: %s\n" msgstr "A geração de chaves falhou: %s\n"
#: g10/keyserver.c:1448 g10/keyserver.c:1482 #: g10/keyserver.c:1450 g10/keyserver.c:1484
#, c-format #, c-format
msgid "\"%s\" not a key ID: skipping\n" msgid "\"%s\" not a key ID: skipping\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1739 #: g10/keyserver.c:1741
#, fuzzy, c-format #, fuzzy, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n" msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr "AVISO: dono pouco seguro em %s \"%s\"\n" msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
#: g10/keyserver.c:1761 #: g10/keyserver.c:1763
#, fuzzy, c-format #, fuzzy, c-format
msgid "refreshing 1 key from %s\n" msgid "refreshing 1 key from %s\n"
msgstr "a pedir a chave %08lX de %s\n" msgstr "a pedir a chave %08lX de %s\n"
#: g10/keyserver.c:1763 #: g10/keyserver.c:1765
#, fuzzy, c-format #, fuzzy, c-format
msgid "refreshing %d keys from %s\n" msgid "refreshing %d keys from %s\n"
msgstr "a pedir a chave %08lX de %s\n" msgstr "a pedir a chave %08lX de %s\n"

63
po/pt_BR.po
View File

@ -13,7 +13,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: GNU gnupg 1.0\n" "Project-Id-Version: GNU gnupg 1.0\n"
"Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n"
"POT-Creation-Date: 2005-07-26 18:08+0200\n" "POT-Creation-Date: 2005-07-27 19:41+0200\n"
"PO-Revision-Date: 1998-11-20 23:46:36-0200\n" "PO-Revision-Date: 1998-11-20 23:46:36-0200\n"
"Last-Translator:\n" "Last-Translator:\n"
"Language-Team: ?\n" "Language-Team: ?\n"
@ -740,13 +740,13 @@ msgstr "imposs
msgid "--output doesn't work for this command\n" msgid "--output doesn't work for this command\n"
msgstr "" msgstr ""
#: g10/delkey.c:75 g10/export.c:178 g10/keyedit.c:3360 g10/keyserver.c:1569 #: g10/delkey.c:75 g10/export.c:178 g10/keyedit.c:3360 g10/keyserver.c:1571
#: g10/revoke.c:227 #: g10/revoke.c:227
#, fuzzy, c-format #, fuzzy, c-format
msgid "key \"%s\" not found: %s\n" msgid "key \"%s\" not found: %s\n"
msgstr "usuário `%s' não encontrado: %s\n" msgstr "usuário `%s' não encontrado: %s\n"
#: g10/delkey.c:83 g10/export.c:208 g10/import.c:2334 g10/keyserver.c:1583 #: g10/delkey.c:83 g10/export.c:208 g10/import.c:2334 g10/keyserver.c:1585
#: g10/revoke.c:233 g10/revoke.c:440 #: g10/revoke.c:233 g10/revoke.c:440
#, fuzzy, c-format #, fuzzy, c-format
msgid "error reading keyblock: %s\n" msgid "error reading keyblock: %s\n"
@ -950,12 +950,21 @@ msgstr "chave %08lX: n
msgid "key %s: PGP 2.x style key - skipped\n" msgid "key %s: PGP 2.x style key - skipped\n"
msgstr "chave %08lX: não é uma chave rfc2440 - ignorada\n" msgstr "chave %08lX: não é uma chave rfc2440 - ignorada\n"
#: g10/export.c:454 #: g10/export.c:409
msgid "about to export an unprotected subkey\n"
msgstr ""
#: g10/export.c:432
#, fuzzy, c-format
msgid "failed to unprotect the subkey: %s\n"
msgstr "falha ao inicializar o banco de dados de confiabilidade: %s\n"
#: g10/export.c:453
#, c-format #, c-format
msgid "WARNING: secret key %s does not have a simple SK checksum\n" msgid "WARNING: secret key %s does not have a simple SK checksum\n"
msgstr "" msgstr ""
#: g10/export.c:486 #: g10/export.c:485
msgid "WARNING: nothing exported\n" msgid "WARNING: nothing exported\n"
msgstr "AVISO: nada exportado\n" msgstr "AVISO: nada exportado\n"
@ -4126,7 +4135,7 @@ msgstr "disable"
msgid "Enter number(s), N)ext, or Q)uit > " msgid "Enter number(s), N)ext, or Q)uit > "
msgstr "" msgstr ""
#: g10/keyserver.c:724 g10/keyserver.c:1294 #: g10/keyserver.c:724 g10/keyserver.c:1296
#, fuzzy, c-format #, fuzzy, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n" msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "chaveiro inválido" msgstr "chaveiro inválido"
@ -4141,106 +4150,106 @@ msgstr "usu
msgid "key not found on keyserver\n" msgid "key not found on keyserver\n"
msgstr "usuário `%s' não encontrado: %s\n" msgstr "usuário `%s' não encontrado: %s\n"
#: g10/keyserver.c:1041 #: g10/keyserver.c:1043
#, fuzzy, c-format #, fuzzy, c-format
msgid "requesting key %s from %s server %s\n" msgid "requesting key %s from %s server %s\n"
msgstr "impossível escrever para o chaveiro: %s\n" msgstr "impossível escrever para o chaveiro: %s\n"
#: g10/keyserver.c:1045 #: g10/keyserver.c:1047
#, fuzzy, c-format #, fuzzy, c-format
msgid "requesting key %s from %s\n" msgid "requesting key %s from %s\n"
msgstr "impossível escrever para o chaveiro: %s\n" msgstr "impossível escrever para o chaveiro: %s\n"
#: g10/keyserver.c:1197 #: g10/keyserver.c:1199
#, c-format #, c-format
msgid "sending key %s to %s server %s\n" msgid "sending key %s to %s server %s\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1201 #: g10/keyserver.c:1203
#, fuzzy, c-format #, fuzzy, c-format
msgid "sending key %s to %s\n" msgid "sending key %s to %s\n"
msgstr "" msgstr ""
"\"\n" "\"\n"
"assinado com sua chave %08lX em %s\n" "assinado com sua chave %08lX em %s\n"
#: g10/keyserver.c:1244 #: g10/keyserver.c:1246
#, fuzzy, c-format #, fuzzy, c-format
msgid "searching for \"%s\" from %s server %s\n" msgid "searching for \"%s\" from %s server %s\n"
msgstr "exportar chaves para um servidor" msgstr "exportar chaves para um servidor"
#: g10/keyserver.c:1247 #: g10/keyserver.c:1249
#, fuzzy, c-format #, fuzzy, c-format
msgid "searching for \"%s\" from %s\n" msgid "searching for \"%s\" from %s\n"
msgstr "lendo opções de `%s'\n" msgstr "lendo opções de `%s'\n"
#: g10/keyserver.c:1254 g10/keyserver.c:1349 #: g10/keyserver.c:1256 g10/keyserver.c:1351
#, fuzzy #, fuzzy
msgid "no keyserver action!\n" msgid "no keyserver action!\n"
msgstr "chaveiro inválido" msgstr "chaveiro inválido"
#: g10/keyserver.c:1302 #: g10/keyserver.c:1304
#, c-format #, c-format
msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n" msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1311 #: g10/keyserver.c:1313
msgid "keyserver did not send VERSION\n" msgid "keyserver did not send VERSION\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1371 #: g10/keyserver.c:1373
msgid "no keyserver known (use option --keyserver)\n" msgid "no keyserver known (use option --keyserver)\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1377 #: g10/keyserver.c:1379
msgid "external keyserver calls are not supported in this build\n" msgid "external keyserver calls are not supported in this build\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1389 #: g10/keyserver.c:1391
#, c-format #, c-format
msgid "no handler for keyserver scheme `%s'\n" msgid "no handler for keyserver scheme `%s'\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1394 #: g10/keyserver.c:1396
#, c-format #, c-format
msgid "action `%s' not supported with keyserver scheme `%s'\n" msgid "action `%s' not supported with keyserver scheme `%s'\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1402 #: g10/keyserver.c:1404
#, c-format #, c-format
msgid "%s does not support handler version %d\n" msgid "%s does not support handler version %d\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1409 #: g10/keyserver.c:1411
#, fuzzy #, fuzzy
msgid "keyserver timed out\n" msgid "keyserver timed out\n"
msgstr "erro geral" msgstr "erro geral"
#: g10/keyserver.c:1414 #: g10/keyserver.c:1416
#, fuzzy #, fuzzy
msgid "keyserver internal error\n" msgid "keyserver internal error\n"
msgstr "erro geral" msgstr "erro geral"
#: g10/keyserver.c:1423 #: g10/keyserver.c:1425
#, fuzzy, c-format #, fuzzy, c-format
msgid "keyserver communications error: %s\n" msgid "keyserver communications error: %s\n"
msgstr "enumeração de chaves secretas falhou: %s\n" msgstr "enumeração de chaves secretas falhou: %s\n"
#: g10/keyserver.c:1448 g10/keyserver.c:1482 #: g10/keyserver.c:1450 g10/keyserver.c:1484
#, fuzzy, c-format #, fuzzy, c-format
msgid "\"%s\" not a key ID: skipping\n" msgid "\"%s\" not a key ID: skipping\n"
msgstr "%s não é um mapa de caracteres válido\n" msgstr "%s não é um mapa de caracteres válido\n"
#: g10/keyserver.c:1739 #: g10/keyserver.c:1741
#, fuzzy, c-format #, fuzzy, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n" msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr "%s: novo arquivo de opções criado\n" msgstr "%s: novo arquivo de opções criado\n"
#: g10/keyserver.c:1761 #: g10/keyserver.c:1763
#, fuzzy, c-format #, fuzzy, c-format
msgid "refreshing 1 key from %s\n" msgid "refreshing 1 key from %s\n"
msgstr "impossível escrever para o chaveiro: %s\n" msgstr "impossível escrever para o chaveiro: %s\n"
#: g10/keyserver.c:1763 #: g10/keyserver.c:1765
#, fuzzy, c-format #, fuzzy, c-format
msgid "refreshing %d keys from %s\n" msgid "refreshing %d keys from %s\n"
msgstr "impossível escrever para o chaveiro: %s\n" msgstr "impossível escrever para o chaveiro: %s\n"

63
po/ro.po
View File

@ -9,7 +9,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: gnupg 1.4.2rc1\n" "Project-Id-Version: gnupg 1.4.2rc1\n"
"Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n"
"POT-Creation-Date: 2005-07-26 18:08+0200\n" "POT-Creation-Date: 2005-07-27 19:41+0200\n"
"PO-Revision-Date: 2005-05-31 22:00-0500\n" "PO-Revision-Date: 2005-05-31 22:00-0500\n"
"Last-Translator: Laurentiu Buzdugan <lbuz@rolix.org>\n" "Last-Translator: Laurentiu Buzdugan <lbuz@rolix.org>\n"
"Language-Team: Romanian <translation-team-ro@lists.sourceforge.net>\n" "Language-Team: Romanian <translation-team-ro@lists.sourceforge.net>\n"
@ -707,13 +707,13 @@ msgstr "nu pot deschide `%s'\n"
msgid "--output doesn't work for this command\n" msgid "--output doesn't work for this command\n"
msgstr "--output nu merge pentru aceastã comandã\n" msgstr "--output nu merge pentru aceastã comandã\n"
#: g10/delkey.c:75 g10/export.c:178 g10/keyedit.c:3360 g10/keyserver.c:1569 #: g10/delkey.c:75 g10/export.c:178 g10/keyedit.c:3360 g10/keyserver.c:1571
#: g10/revoke.c:227 #: g10/revoke.c:227
#, c-format #, c-format
msgid "key \"%s\" not found: %s\n" msgid "key \"%s\" not found: %s\n"
msgstr "cheia \"%s\" nu a fost gãsitã: %s\n" msgstr "cheia \"%s\" nu a fost gãsitã: %s\n"
#: g10/delkey.c:83 g10/export.c:208 g10/import.c:2334 g10/keyserver.c:1583 #: g10/delkey.c:83 g10/export.c:208 g10/import.c:2334 g10/keyserver.c:1585
#: g10/revoke.c:233 g10/revoke.c:440 #: g10/revoke.c:233 g10/revoke.c:440
#, c-format #, c-format
msgid "error reading keyblock: %s\n" msgid "error reading keyblock: %s\n"
@ -921,12 +921,21 @@ msgstr "cheia %s: nu e protejat
msgid "key %s: PGP 2.x style key - skipped\n" msgid "key %s: PGP 2.x style key - skipped\n"
msgstr "cheia %s: cheie stil PGP 2.x - sãritã\n" msgstr "cheia %s: cheie stil PGP 2.x - sãritã\n"
#: g10/export.c:454 #: g10/export.c:409
msgid "about to export an unprotected subkey\n"
msgstr ""
#: g10/export.c:432
#, fuzzy, c-format
msgid "failed to unprotect the subkey: %s\n"
msgstr "am eºuat sã stochez cheia: %s\n"
#: g10/export.c:453
#, c-format #, c-format
msgid "WARNING: secret key %s does not have a simple SK checksum\n" msgid "WARNING: secret key %s does not have a simple SK checksum\n"
msgstr "AVERTISMENT: cheia secretã %s nu are un checksum SK simplu\n" msgstr "AVERTISMENT: cheia secretã %s nu are un checksum SK simplu\n"
#: g10/export.c:486 #: g10/export.c:485
msgid "WARNING: nothing exported\n" msgid "WARNING: nothing exported\n"
msgstr "AVERTISMENT: nimic exportat\n" msgstr "AVERTISMENT: nimic exportat\n"
@ -4095,7 +4104,7 @@ msgstr "deactivat(
msgid "Enter number(s), N)ext, or Q)uit > " msgid "Enter number(s), N)ext, or Q)uit > "
msgstr "Introduceþi numãr/numere, N)ext (urmãtor), sau Q)uit (terminã) > " msgstr "Introduceþi numãr/numere, N)ext (urmãtor), sau Q)uit (terminã) > "
#: g10/keyserver.c:724 g10/keyserver.c:1294 #: g10/keyserver.c:724 g10/keyserver.c:1296
#, c-format #, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n" msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "protocol server de chei invalid (us %d!=handler %d)\n" msgstr "protocol server de chei invalid (us %d!=handler %d)\n"
@ -4109,104 +4118,104 @@ msgstr "cheia \"%s\" nu a fost g
msgid "key not found on keyserver\n" msgid "key not found on keyserver\n"
msgstr "cheia nu a fost gãsitã pe serverul de chei\n" msgstr "cheia nu a fost gãsitã pe serverul de chei\n"
#: g10/keyserver.c:1041 #: g10/keyserver.c:1043
#, c-format #, c-format
msgid "requesting key %s from %s server %s\n" msgid "requesting key %s from %s server %s\n"
msgstr "cer cheia %s de la serverul %s %s\n" msgstr "cer cheia %s de la serverul %s %s\n"
#: g10/keyserver.c:1045 #: g10/keyserver.c:1047
#, c-format #, c-format
msgid "requesting key %s from %s\n" msgid "requesting key %s from %s\n"
msgstr "cer cheia %s de la %s\n" msgstr "cer cheia %s de la %s\n"
#: g10/keyserver.c:1197 #: g10/keyserver.c:1199
#, c-format #, c-format
msgid "sending key %s to %s server %s\n" msgid "sending key %s to %s server %s\n"
msgstr "trimit cheia %s serverului %s %s\n" msgstr "trimit cheia %s serverului %s %s\n"
#: g10/keyserver.c:1201 #: g10/keyserver.c:1203
#, c-format #, c-format
msgid "sending key %s to %s\n" msgid "sending key %s to %s\n"
msgstr "trimit cheia %s lui %s\n" msgstr "trimit cheia %s lui %s\n"
#: g10/keyserver.c:1244 #: g10/keyserver.c:1246
#, c-format #, c-format
msgid "searching for \"%s\" from %s server %s\n" msgid "searching for \"%s\" from %s server %s\n"
msgstr "caut \"%s\" de pe serverul %s %s\n" msgstr "caut \"%s\" de pe serverul %s %s\n"
#: g10/keyserver.c:1247 #: g10/keyserver.c:1249
#, c-format #, c-format
msgid "searching for \"%s\" from %s\n" msgid "searching for \"%s\" from %s\n"
msgstr "caut \"%s\" de pe %s\n" msgstr "caut \"%s\" de pe %s\n"
#: g10/keyserver.c:1254 g10/keyserver.c:1349 #: g10/keyserver.c:1256 g10/keyserver.c:1351
msgid "no keyserver action!\n" msgid "no keyserver action!\n"
msgstr "nici o acþiune pentru serverul de chei!\n" msgstr "nici o acþiune pentru serverul de chei!\n"
#: g10/keyserver.c:1302 #: g10/keyserver.c:1304
#, c-format #, c-format
msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n" msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
msgstr "" msgstr ""
"AVERTISMENT: manipulator server de chei dintr-o versiune diferitã de GnuPG (%" "AVERTISMENT: manipulator server de chei dintr-o versiune diferitã de GnuPG (%"
"s)\n" "s)\n"
#: g10/keyserver.c:1311 #: g10/keyserver.c:1313
msgid "keyserver did not send VERSION\n" msgid "keyserver did not send VERSION\n"
msgstr "serverul de chei nu a trimis VERSION (versiune)\n" msgstr "serverul de chei nu a trimis VERSION (versiune)\n"
#: g10/keyserver.c:1371 #: g10/keyserver.c:1373
msgid "no keyserver known (use option --keyserver)\n" msgid "no keyserver known (use option --keyserver)\n"
msgstr "nici un server de chei cunoscut (folosiþi opþiunea --keyserver)\n" msgstr "nici un server de chei cunoscut (folosiþi opþiunea --keyserver)\n"
#: g10/keyserver.c:1377 #: g10/keyserver.c:1379
msgid "external keyserver calls are not supported in this build\n" msgid "external keyserver calls are not supported in this build\n"
msgstr "" msgstr ""
"apeluri cãtre server de chei extern nu este suportat de acest program\n" "apeluri cãtre server de chei extern nu este suportat de acest program\n"
#: g10/keyserver.c:1389 #: g10/keyserver.c:1391
#, c-format #, c-format
msgid "no handler for keyserver scheme `%s'\n" msgid "no handler for keyserver scheme `%s'\n"
msgstr "nici un manipulator (handler) pentru schema serverului de chei `%s'\n" msgstr "nici un manipulator (handler) pentru schema serverului de chei `%s'\n"
#: g10/keyserver.c:1394 #: g10/keyserver.c:1396
#, c-format #, c-format
msgid "action `%s' not supported with keyserver scheme `%s'\n" msgid "action `%s' not supported with keyserver scheme `%s'\n"
msgstr "acþiunea `%s' nu este suportatã cu schema serverului de chei `%s'\n" msgstr "acþiunea `%s' nu este suportatã cu schema serverului de chei `%s'\n"
#: g10/keyserver.c:1402 #: g10/keyserver.c:1404
#, c-format #, c-format
msgid "%s does not support handler version %d\n" msgid "%s does not support handler version %d\n"
msgstr "%s nu suportã versiunea de manipulator (handler) %d\n" msgstr "%s nu suportã versiunea de manipulator (handler) %d\n"
#: g10/keyserver.c:1409 #: g10/keyserver.c:1411
msgid "keyserver timed out\n" msgid "keyserver timed out\n"
msgstr "serverul de chei a epuizat timpul de aºteptare (timed out)\n" msgstr "serverul de chei a epuizat timpul de aºteptare (timed out)\n"
#: g10/keyserver.c:1414 #: g10/keyserver.c:1416
msgid "keyserver internal error\n" msgid "keyserver internal error\n"
msgstr "eroare internã server de chei\n" msgstr "eroare internã server de chei\n"
#: g10/keyserver.c:1423 #: g10/keyserver.c:1425
#, c-format #, c-format
msgid "keyserver communications error: %s\n" msgid "keyserver communications error: %s\n"
msgstr "eroare de comunicare server de chei: %s\n" msgstr "eroare de comunicare server de chei: %s\n"
#: g10/keyserver.c:1448 g10/keyserver.c:1482 #: g10/keyserver.c:1450 g10/keyserver.c:1484
#, c-format #, c-format
msgid "\"%s\" not a key ID: skipping\n" msgid "\"%s\" not a key ID: skipping\n"
msgstr "\"%s\" nu este un ID de cheie: sãrit\n" msgstr "\"%s\" nu este un ID de cheie: sãrit\n"
#: g10/keyserver.c:1739 #: g10/keyserver.c:1741
#, c-format #, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n" msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr "AVERTISMENT: nu pot reactualiza cheia %s via %s: %s\n" msgstr "AVERTISMENT: nu pot reactualiza cheia %s via %s: %s\n"
#: g10/keyserver.c:1761 #: g10/keyserver.c:1763
#, c-format #, c-format
msgid "refreshing 1 key from %s\n" msgid "refreshing 1 key from %s\n"
msgstr "reactualizez 1 cheie de la %s\n" msgstr "reactualizez 1 cheie de la %s\n"
#: g10/keyserver.c:1763 #: g10/keyserver.c:1765
#, c-format #, c-format
msgid "refreshing %d keys from %s\n" msgid "refreshing %d keys from %s\n"
msgstr "reactualizez %d chei de la %s\n" msgstr "reactualizez %d chei de la %s\n"

63
po/ru.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: GnuPG 1.4.2\n" "Project-Id-Version: GnuPG 1.4.2\n"
"Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n"
"POT-Creation-Date: 2005-07-26 18:08+0200\n" "POT-Creation-Date: 2005-07-27 19:41+0200\n"
"PO-Revision-Date: 2005-06-22 02:53+0200\n" "PO-Revision-Date: 2005-06-22 02:53+0200\n"
"Last-Translator: Maxim Britov <maxbritov@tut.by>\n" "Last-Translator: Maxim Britov <maxbritov@tut.by>\n"
"Language-Team: Russian <gnupg-ru@gnupg.org>\n" "Language-Team: Russian <gnupg-ru@gnupg.org>\n"
@ -703,13 +703,13 @@ msgstr "не могу открыть `%s'\n"
msgid "--output doesn't work for this command\n" msgid "--output doesn't work for this command\n"
msgstr "--output не работает для данной команды\n" msgstr "--output не работает для данной команды\n"
#: g10/delkey.c:75 g10/export.c:178 g10/keyedit.c:3360 g10/keyserver.c:1569 #: g10/delkey.c:75 g10/export.c:178 g10/keyedit.c:3360 g10/keyserver.c:1571
#: g10/revoke.c:227 #: g10/revoke.c:227
#, c-format #, c-format
msgid "key \"%s\" not found: %s\n" msgid "key \"%s\" not found: %s\n"
msgstr "ключ \"%s\" не найден: %s\n" msgstr "ключ \"%s\" не найден: %s\n"
#: g10/delkey.c:83 g10/export.c:208 g10/import.c:2334 g10/keyserver.c:1583 #: g10/delkey.c:83 g10/export.c:208 g10/import.c:2334 g10/keyserver.c:1585
#: g10/revoke.c:233 g10/revoke.c:440 #: g10/revoke.c:233 g10/revoke.c:440
#, c-format #, c-format
msgid "error reading keyblock: %s\n" msgid "error reading keyblock: %s\n"
@ -908,12 +908,21 @@ msgstr "ключ %s: не защищен - пропущен\n"
msgid "key %s: PGP 2.x style key - skipped\n" msgid "key %s: PGP 2.x style key - skipped\n"
msgstr "ключ %s: стиля PGP 2.x - пропущен\n" msgstr "ключ %s: стиля PGP 2.x - пропущен\n"
#: g10/export.c:454 #: g10/export.c:409
msgid "about to export an unprotected subkey\n"
msgstr ""
#: g10/export.c:432
#, fuzzy, c-format
msgid "failed to unprotect the subkey: %s\n"
msgstr "сбой сохранения ключа: %s\n"
#: g10/export.c:453
#, c-format #, c-format
msgid "WARNING: secret key %s does not have a simple SK checksum\n" msgid "WARNING: secret key %s does not have a simple SK checksum\n"
msgstr "ВНИМАНИЕ: секретный ключ %s не имеет простой контрольной суммы SK\n" msgstr "ВНИМАНИЕ: секретный ключ %s не имеет простой контрольной суммы SK\n"
#: g10/export.c:486 #: g10/export.c:485
msgid "WARNING: nothing exported\n" msgid "WARNING: nothing exported\n"
msgstr "ВНИМАНИЕ: нечего экспортировать\n" msgstr "ВНИМАНИЕ: нечего экспортировать\n"
@ -4047,7 +4056,7 @@ msgid "Enter number(s), N)ext, or Q)uit > "
msgstr "Введите число(а), N) Следующий или Q) Выход> " msgstr "Введите число(а), N) Следующий или Q) Выход> "
# test it # test it
#: g10/keyserver.c:724 g10/keyserver.c:1294 #: g10/keyserver.c:724 g10/keyserver.c:1296
#, c-format #, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n" msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "invalid keyserver protocol (us %d!=handler %d)\n" msgstr "invalid keyserver protocol (us %d!=handler %d)\n"
@ -4061,102 +4070,102 @@ msgstr "ключ \"%s\" не найден на сервере ключей\n"
msgid "key not found on keyserver\n" msgid "key not found on keyserver\n"
msgstr "ключ не найден на сервере ключей\n" msgstr "ключ не найден на сервере ключей\n"
#: g10/keyserver.c:1041 #: g10/keyserver.c:1043
#, c-format #, c-format
msgid "requesting key %s from %s server %s\n" msgid "requesting key %s from %s server %s\n"
msgstr "запрашиваю ключ %s с %s сервера %s\n" msgstr "запрашиваю ключ %s с %s сервера %s\n"
#: g10/keyserver.c:1045 #: g10/keyserver.c:1047
#, c-format #, c-format
msgid "requesting key %s from %s\n" msgid "requesting key %s from %s\n"
msgstr "получение ключа %s с %s\n" msgstr "получение ключа %s с %s\n"
#: g10/keyserver.c:1197 #: g10/keyserver.c:1199
#, c-format #, c-format
msgid "sending key %s to %s server %s\n" msgid "sending key %s to %s server %s\n"
msgstr "отправляю ключ %s на %s сервер %s\n" msgstr "отправляю ключ %s на %s сервер %s\n"
#: g10/keyserver.c:1201 #: g10/keyserver.c:1203
#, c-format #, c-format
msgid "sending key %s to %s\n" msgid "sending key %s to %s\n"
msgstr "отправка ключа %s на %s\n" msgstr "отправка ключа %s на %s\n"
#: g10/keyserver.c:1244 #: g10/keyserver.c:1246
#, c-format #, c-format
msgid "searching for \"%s\" from %s server %s\n" msgid "searching for \"%s\" from %s server %s\n"
msgstr "поиск \"%s\" на %s сервере %s\n" msgstr "поиск \"%s\" на %s сервере %s\n"
#: g10/keyserver.c:1247 #: g10/keyserver.c:1249
#, c-format #, c-format
msgid "searching for \"%s\" from %s\n" msgid "searching for \"%s\" from %s\n"
msgstr "поиск \"%s\" на %s\n" msgstr "поиск \"%s\" на %s\n"
# test it # test it
#: g10/keyserver.c:1254 g10/keyserver.c:1349 #: g10/keyserver.c:1256 g10/keyserver.c:1351
msgid "no keyserver action!\n" msgid "no keyserver action!\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1302 #: g10/keyserver.c:1304
#, c-format #, c-format
msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n" msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
msgstr "ВНИМАНИЕ: обработчик сервера ключей от другой версии GnuPG (%s)\n" msgstr "ВНИМАНИЕ: обработчик сервера ключей от другой версии GnuPG (%s)\n"
#: g10/keyserver.c:1311 #: g10/keyserver.c:1313
msgid "keyserver did not send VERSION\n" msgid "keyserver did not send VERSION\n"
msgstr "сервер ключей не прислал VERSION\n" msgstr "сервер ключей не прислал VERSION\n"
#: g10/keyserver.c:1371 #: g10/keyserver.c:1373
msgid "no keyserver known (use option --keyserver)\n" msgid "no keyserver known (use option --keyserver)\n"
msgstr "не заданы серверы ключей (используйте --keyserver)\n" msgstr "не заданы серверы ключей (используйте --keyserver)\n"
#: g10/keyserver.c:1377 #: g10/keyserver.c:1379
msgid "external keyserver calls are not supported in this build\n" msgid "external keyserver calls are not supported in this build\n"
msgstr "Данная сборка не поддерживает внешние вызовы для сервера ключей.\n" msgstr "Данная сборка не поддерживает внешние вызовы для сервера ключей.\n"
#: g10/keyserver.c:1389 #: g10/keyserver.c:1391
#, c-format #, c-format
msgid "no handler for keyserver scheme `%s'\n" msgid "no handler for keyserver scheme `%s'\n"
msgstr "нет обработчика для схемы сервера ключей `%s'\n" msgstr "нет обработчика для схемы сервера ключей `%s'\n"
#: g10/keyserver.c:1394 #: g10/keyserver.c:1396
#, c-format #, c-format
msgid "action `%s' not supported with keyserver scheme `%s'\n" msgid "action `%s' not supported with keyserver scheme `%s'\n"
msgstr "действие `%s' не поддерживается серверами ключей `%s'\n" msgstr "действие `%s' не поддерживается серверами ключей `%s'\n"
#: g10/keyserver.c:1402 #: g10/keyserver.c:1404
#, c-format #, c-format
msgid "%s does not support handler version %d\n" msgid "%s does not support handler version %d\n"
msgstr "%s не поддерживает версию обработчика %d\n" msgstr "%s не поддерживает версию обработчика %d\n"
#: g10/keyserver.c:1409 #: g10/keyserver.c:1411
msgid "keyserver timed out\n" msgid "keyserver timed out\n"
msgstr "превышено время ожидания сервера ключей\n" msgstr "превышено время ожидания сервера ключей\n"
#: g10/keyserver.c:1414 #: g10/keyserver.c:1416
msgid "keyserver internal error\n" msgid "keyserver internal error\n"
msgstr "ошибка сервера ключей\n" msgstr "ошибка сервера ключей\n"
#: g10/keyserver.c:1423 #: g10/keyserver.c:1425
#, c-format #, c-format
msgid "keyserver communications error: %s\n" msgid "keyserver communications error: %s\n"
msgstr "ошибка связи с сервером ключей: %s\n" msgstr "ошибка связи с сервером ключей: %s\n"
#: g10/keyserver.c:1448 g10/keyserver.c:1482 #: g10/keyserver.c:1450 g10/keyserver.c:1484
#, c-format #, c-format
msgid "\"%s\" not a key ID: skipping\n" msgid "\"%s\" not a key ID: skipping\n"
msgstr "\"%s\" не идентификатор ключа: пропущен\n" msgstr "\"%s\" не идентификатор ключа: пропущен\n"
#: g10/keyserver.c:1739 #: g10/keyserver.c:1741
#, c-format #, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n" msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr "ВНИМАНИЕ: невозможно обновить ключ %s с %s: %s\n" msgstr "ВНИМАНИЕ: невозможно обновить ключ %s с %s: %s\n"
#: g10/keyserver.c:1761 #: g10/keyserver.c:1763
#, c-format #, c-format
msgid "refreshing 1 key from %s\n" msgid "refreshing 1 key from %s\n"
msgstr "обновление 1 ключа из %s\n" msgstr "обновление 1 ключа из %s\n"
#: g10/keyserver.c:1763 #: g10/keyserver.c:1765
#, c-format #, c-format
msgid "refreshing %d keys from %s\n" msgid "refreshing %d keys from %s\n"
msgstr "обновление %d ключей из %s\n" msgstr "обновление %d ключей из %s\n"

63
po/sk.po
View File

@ -5,7 +5,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: gnupg 1.2.5\n" "Project-Id-Version: gnupg 1.2.5\n"
"Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n"
"POT-Creation-Date: 2005-07-26 18:08+0200\n" "POT-Creation-Date: 2005-07-27 19:41+0200\n"
"PO-Revision-Date: 2004-07-20 15:52+0200\n" "PO-Revision-Date: 2004-07-20 15:52+0200\n"
"Last-Translator: Michal Majer <mmajer@econ.umb.sk>\n" "Last-Translator: Michal Majer <mmajer@econ.umb.sk>\n"
"Language-Team: Slovak <sk-i18n@lists.linux.sk>\n" "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@ -727,13 +727,13 @@ msgstr "nemo
msgid "--output doesn't work for this command\n" msgid "--output doesn't work for this command\n"
msgstr "--output pre tento príkaz nefunguje\n" msgstr "--output pre tento príkaz nefunguje\n"
#: g10/delkey.c:75 g10/export.c:178 g10/keyedit.c:3360 g10/keyserver.c:1569 #: g10/delkey.c:75 g10/export.c:178 g10/keyedit.c:3360 g10/keyserver.c:1571
#: g10/revoke.c:227 #: g10/revoke.c:227
#, fuzzy, c-format #, fuzzy, c-format
msgid "key \"%s\" not found: %s\n" msgid "key \"%s\" not found: %s\n"
msgstr "kµúè `%s' nebol nájdený: %s\n" msgstr "kµúè `%s' nebol nájdený: %s\n"
#: g10/delkey.c:83 g10/export.c:208 g10/import.c:2334 g10/keyserver.c:1583 #: g10/delkey.c:83 g10/export.c:208 g10/import.c:2334 g10/keyserver.c:1585
#: g10/revoke.c:233 g10/revoke.c:440 #: g10/revoke.c:233 g10/revoke.c:440
#, c-format #, c-format
msgid "error reading keyblock: %s\n" msgid "error reading keyblock: %s\n"
@ -941,12 +941,21 @@ msgstr "k
msgid "key %s: PGP 2.x style key - skipped\n" msgid "key %s: PGP 2.x style key - skipped\n"
msgstr "kµúè %08lX: PGP 2.x kµúè - preskoèené\n" msgstr "kµúè %08lX: PGP 2.x kµúè - preskoèené\n"
#: g10/export.c:454 #: g10/export.c:409
msgid "about to export an unprotected subkey\n"
msgstr ""
#: g10/export.c:432
#, fuzzy, c-format
msgid "failed to unprotect the subkey: %s\n"
msgstr "nemô¾em inicializova» databázu dôvery: %s\n"
#: g10/export.c:453
#, fuzzy, c-format #, fuzzy, c-format
msgid "WARNING: secret key %s does not have a simple SK checksum\n" msgid "WARNING: secret key %s does not have a simple SK checksum\n"
msgstr "VAROVANIE: tajný kµúè %08lX nemá jednoduchý SK kontrolný súèet\n" msgstr "VAROVANIE: tajný kµúè %08lX nemá jednoduchý SK kontrolný súèet\n"
#: g10/export.c:486 #: g10/export.c:485
msgid "WARNING: nothing exported\n" msgid "WARNING: nothing exported\n"
msgstr "VAROVANIE: niè nebolo vyexportované\n" msgstr "VAROVANIE: niè nebolo vyexportované\n"
@ -4174,7 +4183,7 @@ msgstr "disable"
msgid "Enter number(s), N)ext, or Q)uit > " msgid "Enter number(s), N)ext, or Q)uit > "
msgstr "" msgstr ""
#: g10/keyserver.c:724 g10/keyserver.c:1294 #: g10/keyserver.c:724 g10/keyserver.c:1296
#, fuzzy, c-format #, fuzzy, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n" msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "neplatný parameter pre export\n" msgstr "neplatný parameter pre export\n"
@ -4189,106 +4198,106 @@ msgstr "k
msgid "key not found on keyserver\n" msgid "key not found on keyserver\n"
msgstr "kµúè `%s' nebol nájdený: %s\n" msgstr "kµúè `%s' nebol nájdený: %s\n"
#: g10/keyserver.c:1041 #: g10/keyserver.c:1043
#, fuzzy, c-format #, fuzzy, c-format
msgid "requesting key %s from %s server %s\n" msgid "requesting key %s from %s server %s\n"
msgstr "po¾adujem kµúè %08lX z %s\n" msgstr "po¾adujem kµúè %08lX z %s\n"
#: g10/keyserver.c:1045 #: g10/keyserver.c:1047
#, fuzzy, c-format #, fuzzy, c-format
msgid "requesting key %s from %s\n" msgid "requesting key %s from %s\n"
msgstr "po¾adujem kµúè %08lX z %s\n" msgstr "po¾adujem kµúè %08lX z %s\n"
#: g10/keyserver.c:1197 #: g10/keyserver.c:1199
#, fuzzy, c-format #, fuzzy, c-format
msgid "sending key %s to %s server %s\n" msgid "sending key %s to %s server %s\n"
msgstr "vyhµadávam \"%s\" na HKP serveri %s\n" msgstr "vyhµadávam \"%s\" na HKP serveri %s\n"
#: g10/keyserver.c:1201 #: g10/keyserver.c:1203
#, fuzzy, c-format #, fuzzy, c-format
msgid "sending key %s to %s\n" msgid "sending key %s to %s\n"
msgstr "" msgstr ""
"\"\n" "\"\n"
"podpísané Va¹ím kµúèom %08lX v %s\n" "podpísané Va¹ím kµúèom %08lX v %s\n"
#: g10/keyserver.c:1244 #: g10/keyserver.c:1246
#, fuzzy, c-format #, fuzzy, c-format
msgid "searching for \"%s\" from %s server %s\n" msgid "searching for \"%s\" from %s server %s\n"
msgstr "vyhµadávam \"%s\" na HKP serveri %s\n" msgstr "vyhµadávam \"%s\" na HKP serveri %s\n"
#: g10/keyserver.c:1247 #: g10/keyserver.c:1249
#, fuzzy, c-format #, fuzzy, c-format
msgid "searching for \"%s\" from %s\n" msgid "searching for \"%s\" from %s\n"
msgstr "vyhµadávam \"%s\" na HKP serveri %s\n" msgstr "vyhµadávam \"%s\" na HKP serveri %s\n"
#: g10/keyserver.c:1254 g10/keyserver.c:1349 #: g10/keyserver.c:1256 g10/keyserver.c:1351
#, fuzzy #, fuzzy
msgid "no keyserver action!\n" msgid "no keyserver action!\n"
msgstr "neplatný parameter pre export\n" msgstr "neplatný parameter pre export\n"
#: g10/keyserver.c:1302 #: g10/keyserver.c:1304
#, c-format #, c-format
msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n" msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1311 #: g10/keyserver.c:1313
msgid "keyserver did not send VERSION\n" msgid "keyserver did not send VERSION\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1371 #: g10/keyserver.c:1373
msgid "no keyserver known (use option --keyserver)\n" msgid "no keyserver known (use option --keyserver)\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1377 #: g10/keyserver.c:1379
msgid "external keyserver calls are not supported in this build\n" msgid "external keyserver calls are not supported in this build\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1389 #: g10/keyserver.c:1391
#, c-format #, c-format
msgid "no handler for keyserver scheme `%s'\n" msgid "no handler for keyserver scheme `%s'\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1394 #: g10/keyserver.c:1396
#, c-format #, c-format
msgid "action `%s' not supported with keyserver scheme `%s'\n" msgid "action `%s' not supported with keyserver scheme `%s'\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1402 #: g10/keyserver.c:1404
#, c-format #, c-format
msgid "%s does not support handler version %d\n" msgid "%s does not support handler version %d\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1409 #: g10/keyserver.c:1411
#, fuzzy #, fuzzy
msgid "keyserver timed out\n" msgid "keyserver timed out\n"
msgstr "chyba servera kµúèov" msgstr "chyba servera kµúèov"
#: g10/keyserver.c:1414 #: g10/keyserver.c:1416
#, fuzzy #, fuzzy
msgid "keyserver internal error\n" msgid "keyserver internal error\n"
msgstr "chyba servera kµúèov" msgstr "chyba servera kµúèov"
#: g10/keyserver.c:1423 #: g10/keyserver.c:1425
#, fuzzy, c-format #, fuzzy, c-format
msgid "keyserver communications error: %s\n" msgid "keyserver communications error: %s\n"
msgstr "nepodarilo sa prija» kµúè zo servera: %s\n" msgstr "nepodarilo sa prija» kµúè zo servera: %s\n"
#: g10/keyserver.c:1448 g10/keyserver.c:1482 #: g10/keyserver.c:1450 g10/keyserver.c:1484
#, c-format #, c-format
msgid "\"%s\" not a key ID: skipping\n" msgid "\"%s\" not a key ID: skipping\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1739 #: g10/keyserver.c:1741
#, fuzzy, c-format #, fuzzy, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n" msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr "VAROVANIE: nemô¾em vymaza» doèasný súbor (%s) `%s': %s\n" msgstr "VAROVANIE: nemô¾em vymaza» doèasný súbor (%s) `%s': %s\n"
#: g10/keyserver.c:1761 #: g10/keyserver.c:1763
#, fuzzy, c-format #, fuzzy, c-format
msgid "refreshing 1 key from %s\n" msgid "refreshing 1 key from %s\n"
msgstr "po¾adujem kµúè %08lX z %s\n" msgstr "po¾adujem kµúè %08lX z %s\n"
#: g10/keyserver.c:1763 #: g10/keyserver.c:1765
#, fuzzy, c-format #, fuzzy, c-format
msgid "refreshing %d keys from %s\n" msgid "refreshing %d keys from %s\n"
msgstr "po¾adujem kµúè %08lX z %s\n" msgstr "po¾adujem kµúè %08lX z %s\n"

63
po/sv.po
View File

@ -23,7 +23,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: gnupg 1.2.6\n" "Project-Id-Version: gnupg 1.2.6\n"
"Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n"
"POT-Creation-Date: 2005-07-26 18:08+0200\n" "POT-Creation-Date: 2005-07-27 19:41+0200\n"
"PO-Revision-Date: 2004-12-01 17:49+0100\n" "PO-Revision-Date: 2004-12-01 17:49+0100\n"
"Last-Translator: Per Tunedal <info@clipanish.com>\n" "Last-Translator: Per Tunedal <info@clipanish.com>\n"
"Language-Team: Swedish <sv@li.org>\n" "Language-Team: Swedish <sv@li.org>\n"
@ -751,13 +751,13 @@ msgstr "kan inte öppna \"%s\"\n"
msgid "--output doesn't work for this command\n" msgid "--output doesn't work for this command\n"
msgstr "--output kan inte användas för detta kommando\n" msgstr "--output kan inte användas för detta kommando\n"
#: g10/delkey.c:75 g10/export.c:178 g10/keyedit.c:3360 g10/keyserver.c:1569 #: g10/delkey.c:75 g10/export.c:178 g10/keyedit.c:3360 g10/keyserver.c:1571
#: g10/revoke.c:227 #: g10/revoke.c:227
#, fuzzy, c-format #, fuzzy, c-format
msgid "key \"%s\" not found: %s\n" msgid "key \"%s\" not found: %s\n"
msgstr "hittade inte nyckeln `%s': %s\n" msgstr "hittade inte nyckeln `%s': %s\n"
#: g10/delkey.c:83 g10/export.c:208 g10/import.c:2334 g10/keyserver.c:1583 #: g10/delkey.c:83 g10/export.c:208 g10/import.c:2334 g10/keyserver.c:1585
#: g10/revoke.c:233 g10/revoke.c:440 #: g10/revoke.c:233 g10/revoke.c:440
#, c-format #, c-format
msgid "error reading keyblock: %s\n" msgid "error reading keyblock: %s\n"
@ -971,12 +971,21 @@ msgstr "nyckeln %08lX är inte skyddad - hoppade över den\n"
msgid "key %s: PGP 2.x style key - skipped\n" msgid "key %s: PGP 2.x style key - skipped\n"
msgstr "nyckeln %08lX: nyckel av PGP 2.x-typ - hoppade över den\n" msgstr "nyckeln %08lX: nyckel av PGP 2.x-typ - hoppade över den\n"
#: g10/export.c:454 #: g10/export.c:409
msgid "about to export an unprotected subkey\n"
msgstr ""
#: g10/export.c:432
#, fuzzy, c-format
msgid "failed to unprotect the subkey: %s\n"
msgstr "misslyckades med att initialisera tillitsdatabasen: %s\n"
#: g10/export.c:453
#, fuzzy, c-format #, fuzzy, c-format
msgid "WARNING: secret key %s does not have a simple SK checksum\n" msgid "WARNING: secret key %s does not have a simple SK checksum\n"
msgstr "VARNING: hemliga nyckeln %08lX har ingen enkel SK-kontrollsumma\n" msgstr "VARNING: hemliga nyckeln %08lX har ingen enkel SK-kontrollsumma\n"
#: g10/export.c:486 #: g10/export.c:485
msgid "WARNING: nothing exported\n" msgid "WARNING: nothing exported\n"
msgstr "VARNING: exporterade ingenting\n" msgstr "VARNING: exporterade ingenting\n"
@ -4271,7 +4280,7 @@ msgstr "disable"
msgid "Enter number(s), N)ext, or Q)uit > " msgid "Enter number(s), N)ext, or Q)uit > "
msgstr "" msgstr ""
#: g10/keyserver.c:724 g10/keyserver.c:1294 #: g10/keyserver.c:724 g10/keyserver.c:1296
#, c-format #, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n" msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "" msgstr ""
@ -4286,104 +4295,104 @@ msgstr "hittade inte nyckeln `%s': %s\n"
msgid "key not found on keyserver\n" msgid "key not found on keyserver\n"
msgstr "hittade inte nyckeln `%s': %s\n" msgstr "hittade inte nyckeln `%s': %s\n"
#: g10/keyserver.c:1041 #: g10/keyserver.c:1043
#, fuzzy, c-format #, fuzzy, c-format
msgid "requesting key %s from %s server %s\n" msgid "requesting key %s from %s server %s\n"
msgstr "begär nyckel %08lX från %s\n" msgstr "begär nyckel %08lX från %s\n"
#: g10/keyserver.c:1045 #: g10/keyserver.c:1047
#, fuzzy, c-format #, fuzzy, c-format
msgid "requesting key %s from %s\n" msgid "requesting key %s from %s\n"
msgstr "begär nyckel %08lX från %s\n" msgstr "begär nyckel %08lX från %s\n"
#: g10/keyserver.c:1197 #: g10/keyserver.c:1199
#, fuzzy, c-format #, fuzzy, c-format
msgid "sending key %s to %s server %s\n" msgid "sending key %s to %s server %s\n"
msgstr "söker \"%s\" från HKP-server %s\n" msgstr "söker \"%s\" från HKP-server %s\n"
#: g10/keyserver.c:1201 #: g10/keyserver.c:1203
#, fuzzy, c-format #, fuzzy, c-format
msgid "sending key %s to %s\n" msgid "sending key %s to %s\n"
msgstr "begär nyckel %08lX från %s\n" msgstr "begär nyckel %08lX från %s\n"
#: g10/keyserver.c:1244 #: g10/keyserver.c:1246
#, fuzzy, c-format #, fuzzy, c-format
msgid "searching for \"%s\" from %s server %s\n" msgid "searching for \"%s\" from %s server %s\n"
msgstr "söker \"%s\" från HKP-server %s\n" msgstr "söker \"%s\" från HKP-server %s\n"
#: g10/keyserver.c:1247 #: g10/keyserver.c:1249
#, fuzzy, c-format #, fuzzy, c-format
msgid "searching for \"%s\" from %s\n" msgid "searching for \"%s\" from %s\n"
msgstr "söker \"%s\" från HKP-server %s\n" msgstr "söker \"%s\" från HKP-server %s\n"
#: g10/keyserver.c:1254 g10/keyserver.c:1349 #: g10/keyserver.c:1256 g10/keyserver.c:1351
#, fuzzy #, fuzzy
msgid "no keyserver action!\n" msgid "no keyserver action!\n"
msgstr "nyckelserverfel" msgstr "nyckelserverfel"
#: g10/keyserver.c:1302 #: g10/keyserver.c:1304
#, c-format #, c-format
msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n" msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1311 #: g10/keyserver.c:1313
msgid "keyserver did not send VERSION\n" msgid "keyserver did not send VERSION\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1371 #: g10/keyserver.c:1373
msgid "no keyserver known (use option --keyserver)\n" msgid "no keyserver known (use option --keyserver)\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1377 #: g10/keyserver.c:1379
msgid "external keyserver calls are not supported in this build\n" msgid "external keyserver calls are not supported in this build\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1389 #: g10/keyserver.c:1391
#, c-format #, c-format
msgid "no handler for keyserver scheme `%s'\n" msgid "no handler for keyserver scheme `%s'\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1394 #: g10/keyserver.c:1396
#, c-format #, c-format
msgid "action `%s' not supported with keyserver scheme `%s'\n" msgid "action `%s' not supported with keyserver scheme `%s'\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1402 #: g10/keyserver.c:1404
#, c-format #, c-format
msgid "%s does not support handler version %d\n" msgid "%s does not support handler version %d\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1409 #: g10/keyserver.c:1411
#, fuzzy #, fuzzy
msgid "keyserver timed out\n" msgid "keyserver timed out\n"
msgstr "nyckelserverfel" msgstr "nyckelserverfel"
#: g10/keyserver.c:1414 #: g10/keyserver.c:1416
#, fuzzy #, fuzzy
msgid "keyserver internal error\n" msgid "keyserver internal error\n"
msgstr "nyckelserverfel" msgstr "nyckelserverfel"
#: g10/keyserver.c:1423 #: g10/keyserver.c:1425
#, fuzzy, c-format #, fuzzy, c-format
msgid "keyserver communications error: %s\n" msgid "keyserver communications error: %s\n"
msgstr "Hämtning från nyckelservern misslyckades: %s\n" msgstr "Hämtning från nyckelservern misslyckades: %s\n"
#: g10/keyserver.c:1448 g10/keyserver.c:1482 #: g10/keyserver.c:1450 g10/keyserver.c:1484
#, c-format #, c-format
msgid "\"%s\" not a key ID: skipping\n" msgid "\"%s\" not a key ID: skipping\n"
msgstr "" msgstr ""
#: g10/keyserver.c:1739 #: g10/keyserver.c:1741
#, fuzzy, c-format #, fuzzy, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n" msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr "VARNING: kan inte ta bort tempfil (%s) `%s': %s\n" msgstr "VARNING: kan inte ta bort tempfil (%s) `%s': %s\n"
#: g10/keyserver.c:1761 #: g10/keyserver.c:1763
#, fuzzy, c-format #, fuzzy, c-format
msgid "refreshing 1 key from %s\n" msgid "refreshing 1 key from %s\n"
msgstr "begär nyckel %08lX från %s\n" msgstr "begär nyckel %08lX från %s\n"
#: g10/keyserver.c:1763 #: g10/keyserver.c:1765
#, fuzzy, c-format #, fuzzy, c-format
msgid "refreshing %d keys from %s\n" msgid "refreshing %d keys from %s\n"
msgstr "begär nyckel %08lX från %s\n" msgstr "begär nyckel %08lX från %s\n"

63
po/tr.po
View File

@ -6,7 +6,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: gnupg 1.4.1\n" "Project-Id-Version: gnupg 1.4.1\n"
"Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n"
"POT-Creation-Date: 2005-07-26 18:08+0200\n" "POT-Creation-Date: 2005-07-27 19:41+0200\n"
"PO-Revision-Date: 2005-03-16 07:30+0300\n" "PO-Revision-Date: 2005-03-16 07:30+0300\n"
"Last-Translator: Nilgün Belma Bugüner <nilgun@superonline.com>\n" "Last-Translator: Nilgün Belma Bugüner <nilgun@superonline.com>\n"
"Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n" "Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
@ -700,13 +700,13 @@ msgstr "`%s' açılamadı\n"
msgid "--output doesn't work for this command\n" msgid "--output doesn't work for this command\n"
msgstr "--output seçeneği bu komutla çalışmaz\n" msgstr "--output seçeneği bu komutla çalışmaz\n"
#: g10/delkey.c:75 g10/export.c:178 g10/keyedit.c:3360 g10/keyserver.c:1569 #: g10/delkey.c:75 g10/export.c:178 g10/keyedit.c:3360 g10/keyserver.c:1571
#: g10/revoke.c:227 #: g10/revoke.c:227
#, c-format #, c-format
msgid "key \"%s\" not found: %s\n" msgid "key \"%s\" not found: %s\n"
msgstr "anahtar \"%s\" yok: %s\n" msgstr "anahtar \"%s\" yok: %s\n"
#: g10/delkey.c:83 g10/export.c:208 g10/import.c:2334 g10/keyserver.c:1583 #: g10/delkey.c:83 g10/export.c:208 g10/import.c:2334 g10/keyserver.c:1585
#: g10/revoke.c:233 g10/revoke.c:440 #: g10/revoke.c:233 g10/revoke.c:440
#, c-format #, c-format
msgid "error reading keyblock: %s\n" msgid "error reading keyblock: %s\n"
@ -911,12 +911,21 @@ msgstr "anahtar %s: korunmamış - atlandı\n"
msgid "key %s: PGP 2.x style key - skipped\n" msgid "key %s: PGP 2.x style key - skipped\n"
msgstr "anahtar %s: PGP 2.x tarzı bir anahtar - atlandı\n" msgstr "anahtar %s: PGP 2.x tarzı bir anahtar - atlandı\n"
#: g10/export.c:454 #: g10/export.c:409
msgid "about to export an unprotected subkey\n"
msgstr ""
#: g10/export.c:432
#, fuzzy, c-format
msgid "failed to unprotect the subkey: %s\n"
msgstr "anahtarın saklanması başarısız: %s\n"
#: g10/export.c:453
#, c-format #, c-format
msgid "WARNING: secret key %s does not have a simple SK checksum\n" msgid "WARNING: secret key %s does not have a simple SK checksum\n"
msgstr "UYARI: gizli anahtar %s basit bir SK sağlamasına sahip değil\n" msgstr "UYARI: gizli anahtar %s basit bir SK sağlamasına sahip değil\n"
#: g10/export.c:486 #: g10/export.c:485
msgid "WARNING: nothing exported\n" msgid "WARNING: nothing exported\n"
msgstr "UYARI: hiçbir şey dışarı aktarılmadı\n" msgstr "UYARI: hiçbir şey dışarı aktarılmadı\n"
@ -4077,7 +4086,7 @@ msgstr "iptal edildi"
msgid "Enter number(s), N)ext, or Q)uit > " msgid "Enter number(s), N)ext, or Q)uit > "
msgstr "Sayıyı/sayıları girin veya S)onraki ya da Ç)ık >" msgstr "Sayıyı/sayıları girin veya S)onraki ya da Ç)ık >"
#: g10/keyserver.c:724 g10/keyserver.c:1294 #: g10/keyserver.c:724 g10/keyserver.c:1296
#, c-format #, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n" msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "anahtar sunucu protokolü geçersiz (bizimki %d!=eylemci %d)\n" msgstr "anahtar sunucu protokolü geçersiz (bizimki %d!=eylemci %d)\n"
@ -4091,101 +4100,101 @@ msgstr "anahtar \"%s\" anahtar sunucusunda yok\n"
msgid "key not found on keyserver\n" msgid "key not found on keyserver\n"
msgstr "anahtar, anahtar sunucusunda yok\n" msgstr "anahtar, anahtar sunucusunda yok\n"
#: g10/keyserver.c:1041 #: g10/keyserver.c:1043
#, c-format #, c-format
msgid "requesting key %s from %s server %s\n" msgid "requesting key %s from %s server %s\n"
msgstr "%1$s anahtarı %3$s sunucusunun %2$s adresinden isteniyor\n" msgstr "%1$s anahtarı %3$s sunucusunun %2$s adresinden isteniyor\n"
#: g10/keyserver.c:1045 #: g10/keyserver.c:1047
#, c-format #, c-format
msgid "requesting key %s from %s\n" msgid "requesting key %s from %s\n"
msgstr "%s anahtarı %s adresinden isteniyor\n" msgstr "%s anahtarı %s adresinden isteniyor\n"
#: g10/keyserver.c:1197 #: g10/keyserver.c:1199
#, c-format #, c-format
msgid "sending key %s to %s server %s\n" msgid "sending key %s to %s server %s\n"
msgstr "anahtar %1$s, %3$s sunucusunun %2$s adresine gönderiliyor\n" msgstr "anahtar %1$s, %3$s sunucusunun %2$s adresine gönderiliyor\n"
#: g10/keyserver.c:1201 #: g10/keyserver.c:1203
#, c-format #, c-format
msgid "sending key %s to %s\n" msgid "sending key %s to %s\n"
msgstr "%s anahtarı %s adresine gönderiliyor\n" msgstr "%s anahtarı %s adresine gönderiliyor\n"
#: g10/keyserver.c:1244 #: g10/keyserver.c:1246
#, c-format #, c-format
msgid "searching for \"%s\" from %s server %s\n" msgid "searching for \"%s\" from %s server %s\n"
msgstr "%3$s sunucusunun %2$s adresinde \"%1$s\" aranıyor\n" msgstr "%3$s sunucusunun %2$s adresinde \"%1$s\" aranıyor\n"
#: g10/keyserver.c:1247 #: g10/keyserver.c:1249
#, c-format #, c-format
msgid "searching for \"%s\" from %s\n" msgid "searching for \"%s\" from %s\n"
msgstr "%2$s adresinde \"%1$s\" aranıyor\n" msgstr "%2$s adresinde \"%1$s\" aranıyor\n"
#: g10/keyserver.c:1254 g10/keyserver.c:1349 #: g10/keyserver.c:1256 g10/keyserver.c:1351
msgid "no keyserver action!\n" msgid "no keyserver action!\n"
msgstr "bir anahtar sunucusu eylemi yok!\n" msgstr "bir anahtar sunucusu eylemi yok!\n"
#: g10/keyserver.c:1302 #: g10/keyserver.c:1304
#, c-format #, c-format
msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n" msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
msgstr "UYARI: GnuPG'nin başka bir sürümünün anahtar sunucusu eylemcisi (%s)\n" msgstr "UYARI: GnuPG'nin başka bir sürümünün anahtar sunucusu eylemcisi (%s)\n"
#: g10/keyserver.c:1311 #: g10/keyserver.c:1313
msgid "keyserver did not send VERSION\n" msgid "keyserver did not send VERSION\n"
msgstr "anahtar sunucusu VERSION göndermiyor\n" msgstr "anahtar sunucusu VERSION göndermiyor\n"
#: g10/keyserver.c:1371 #: g10/keyserver.c:1373
msgid "no keyserver known (use option --keyserver)\n" msgid "no keyserver known (use option --keyserver)\n"
msgstr "bilinen bir anahtar sunucusu yok (--keyserver seçeneğini kullanın)\n" msgstr "bilinen bir anahtar sunucusu yok (--keyserver seçeneğini kullanın)\n"
#: g10/keyserver.c:1377 #: g10/keyserver.c:1379
msgid "external keyserver calls are not supported in this build\n" msgid "external keyserver calls are not supported in this build\n"
msgstr "harici anahtar sunucusu çağrıları bu kurulumda desteklenmiyor\n" msgstr "harici anahtar sunucusu çağrıları bu kurulumda desteklenmiyor\n"
#: g10/keyserver.c:1389 #: g10/keyserver.c:1391
#, c-format #, c-format
msgid "no handler for keyserver scheme `%s'\n" msgid "no handler for keyserver scheme `%s'\n"
msgstr "`%s' anahtar sunucusu şeması için eylemci yok\n" msgstr "`%s' anahtar sunucusu şeması için eylemci yok\n"
#: g10/keyserver.c:1394 #: g10/keyserver.c:1396
#, c-format #, c-format
msgid "action `%s' not supported with keyserver scheme `%s'\n" msgid "action `%s' not supported with keyserver scheme `%s'\n"
msgstr "`%s' eylemi `%s' anahtar sunucusu şeması ile desteklenmiyor\n" msgstr "`%s' eylemi `%s' anahtar sunucusu şeması ile desteklenmiyor\n"
#: g10/keyserver.c:1402 #: g10/keyserver.c:1404
#, fuzzy, c-format #, fuzzy, c-format
msgid "%s does not support handler version %d\n" msgid "%s does not support handler version %d\n"
msgstr "gpgkeys_%s %d sürümü eylemciyi desteklemiyor\n" msgstr "gpgkeys_%s %d sürümü eylemciyi desteklemiyor\n"
#: g10/keyserver.c:1409 #: g10/keyserver.c:1411
msgid "keyserver timed out\n" msgid "keyserver timed out\n"
msgstr "anahtar sunucusu zamanaşımına uğradı\n" msgstr "anahtar sunucusu zamanaşımına uğradı\n"
#: g10/keyserver.c:1414 #: g10/keyserver.c:1416
msgid "keyserver internal error\n" msgid "keyserver internal error\n"
msgstr "anahtar sunucusu iç hatası\n" msgstr "anahtar sunucusu iç hatası\n"
#: g10/keyserver.c:1423 #: g10/keyserver.c:1425
#, c-format #, c-format
msgid "keyserver communications error: %s\n" msgid "keyserver communications error: %s\n"
msgstr "anahtar sunucusuyla iletişim hatası: %s\n" msgstr "anahtar sunucusuyla iletişim hatası: %s\n"
#: g10/keyserver.c:1448 g10/keyserver.c:1482 #: g10/keyserver.c:1450 g10/keyserver.c:1484
#, c-format #, c-format
msgid "\"%s\" not a key ID: skipping\n" msgid "\"%s\" not a key ID: skipping\n"
msgstr "\"%s\" bir anahtar kimliği değil: atlanıyor\n" msgstr "\"%s\" bir anahtar kimliği değil: atlanıyor\n"
#: g10/keyserver.c:1739 #: g10/keyserver.c:1741
#, c-format #, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n" msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr "UYARI: %s anahtarı %s üzerinden tazelenemiyor: %s\n" msgstr "UYARI: %s anahtarı %s üzerinden tazelenemiyor: %s\n"
#: g10/keyserver.c:1761 #: g10/keyserver.c:1763
#, c-format #, c-format
msgid "refreshing 1 key from %s\n" msgid "refreshing 1 key from %s\n"
msgstr "1 anahtar %s adresinden tazeleniyor\n" msgstr "1 anahtar %s adresinden tazeleniyor\n"
#: g10/keyserver.c:1763 #: g10/keyserver.c:1765
#, c-format #, c-format
msgid "refreshing %d keys from %s\n" msgid "refreshing %d keys from %s\n"
msgstr "%d anahtar %s adresinden tazeleniyor\n" msgstr "%d anahtar %s adresinden tazeleniyor\n"

63
po/zh_CN.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: gnupg 1.4.1\n" "Project-Id-Version: gnupg 1.4.1\n"
"Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n"
"POT-Creation-Date: 2005-07-26 18:08+0200\n" "POT-Creation-Date: 2005-07-27 19:41+0200\n"
"PO-Revision-Date: 2005-03-17 22:24+0800\n" "PO-Revision-Date: 2005-03-17 22:24+0800\n"
"Last-Translator: Meng Jie <zuxyhere@eastday.com>\n" "Last-Translator: Meng Jie <zuxyhere@eastday.com>\n"
"Language-Team: Chinese (simplified) <i18n-translation@lists.linux.net.cn>\n" "Language-Team: Chinese (simplified) <i18n-translation@lists.linux.net.cn>\n"
@ -698,13 +698,13 @@ msgstr "无法打开‘%s’\n"
msgid "--output doesn't work for this command\n" msgid "--output doesn't work for this command\n"
msgstr "--output 在这个命令中不起作用\n" msgstr "--output 在这个命令中不起作用\n"
#: g10/delkey.c:75 g10/export.c:178 g10/keyedit.c:3360 g10/keyserver.c:1569 #: g10/delkey.c:75 g10/export.c:178 g10/keyedit.c:3360 g10/keyserver.c:1571
#: g10/revoke.c:227 #: g10/revoke.c:227
#, c-format #, c-format
msgid "key \"%s\" not found: %s\n" msgid "key \"%s\" not found: %s\n"
msgstr "密钥‘%s’找不到：%s\n" msgstr "密钥‘%s’找不到：%s\n"
#: g10/delkey.c:83 g10/export.c:208 g10/import.c:2334 g10/keyserver.c:1583 #: g10/delkey.c:83 g10/export.c:208 g10/import.c:2334 g10/keyserver.c:1585
#: g10/revoke.c:233 g10/revoke.c:440 #: g10/revoke.c:233 g10/revoke.c:440
#, c-format #, c-format
msgid "error reading keyblock: %s\n" msgid "error reading keyblock: %s\n"
@ -899,13 +899,22 @@ msgstr "密钥 %s：未被保护――已跳过\n"
msgid "key %s: PGP 2.x style key - skipped\n" msgid "key %s: PGP 2.x style key - skipped\n"
msgstr "密钥 %s：PGP 2.x 样式的密钥――已跳过\n" msgstr "密钥 %s：PGP 2.x 样式的密钥――已跳过\n"
#: g10/export.c:409
msgid "about to export an unprotected subkey\n"
msgstr ""
#: g10/export.c:432
#, fuzzy, c-format
msgid "failed to unprotect the subkey: %s\n"
msgstr "无法存储密钥：%s\n"
# I hope this warning doesn't confuse people. # I hope this warning doesn't confuse people.
#: g10/export.c:454 #: g10/export.c:453
#, c-format #, c-format
msgid "WARNING: secret key %s does not have a simple SK checksum\n" msgid "WARNING: secret key %s does not have a simple SK checksum\n"
msgstr "警告：私钥 %s 不存在简单 SK 检验和\n" msgstr "警告：私钥 %s 不存在简单 SK 检验和\n"
#: g10/export.c:486 #: g10/export.c:485
msgid "WARNING: nothing exported\n" msgid "WARNING: nothing exported\n"
msgstr "警告：没有导出任何东西\n" msgstr "警告：没有导出任何东西\n"
@ -3975,7 +3984,7 @@ msgstr "已禁用"
msgid "Enter number(s), N)ext, or Q)uit > " msgid "Enter number(s), N)ext, or Q)uit > "
msgstr "输入数字以选择，输入 N 翻页，输入 Q 退出 >" msgstr "输入数字以选择，输入 N 翻页，输入 Q 退出 >"
#: g10/keyserver.c:724 g10/keyserver.c:1294 #: g10/keyserver.c:724 g10/keyserver.c:1296
#, c-format #, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n" msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "无效的公钥服务器协议(us %d!=handler %d)\n" msgstr "无效的公钥服务器协议(us %d!=handler %d)\n"
@ -3989,101 +3998,101 @@ msgstr "在公钥服务器上找不到密钥“%s”\n"
msgid "key not found on keyserver\n" msgid "key not found on keyserver\n"
msgstr "在公钥服务器上找不到密钥\n" msgstr "在公钥服务器上找不到密钥\n"
#: g10/keyserver.c:1041 #: g10/keyserver.c:1043
#, c-format #, c-format
msgid "requesting key %s from %s server %s\n" msgid "requesting key %s from %s server %s\n"
msgstr "下载密钥‘%s’，从 %s 服务器 %s\n" msgstr "下载密钥‘%s’，从 %s 服务器 %s\n"
#: g10/keyserver.c:1045 #: g10/keyserver.c:1047
#, c-format #, c-format
msgid "requesting key %s from %s\n" msgid "requesting key %s from %s\n"
msgstr "下载密钥 %s，从 %s\n" msgstr "下载密钥 %s，从 %s\n"
#: g10/keyserver.c:1197 #: g10/keyserver.c:1199
#, c-format #, c-format
msgid "sending key %s to %s server %s\n" msgid "sending key %s to %s server %s\n"
msgstr "将密钥‘%s’上传到 %s 服务器 %s\n" msgstr "将密钥‘%s’上传到 %s 服务器 %s\n"
#: g10/keyserver.c:1201 #: g10/keyserver.c:1203
#, c-format #, c-format
msgid "sending key %s to %s\n" msgid "sending key %s to %s\n"
msgstr "将密钥‘%s’上传到 %s\n" msgstr "将密钥‘%s’上传到 %s\n"
#: g10/keyserver.c:1244 #: g10/keyserver.c:1246
#, c-format #, c-format
msgid "searching for \"%s\" from %s server %s\n" msgid "searching for \"%s\" from %s server %s\n"
msgstr "搜索“%s”，在 %s 服务器 %s 上\n" msgstr "搜索“%s”，在 %s 服务器 %s 上\n"
#: g10/keyserver.c:1247 #: g10/keyserver.c:1249
#, c-format #, c-format
msgid "searching for \"%s\" from %s\n" msgid "searching for \"%s\" from %s\n"
msgstr "搜索“%s”，在 %s 上\n" msgstr "搜索“%s”，在 %s 上\n"
#: g10/keyserver.c:1254 g10/keyserver.c:1349 #: g10/keyserver.c:1256 g10/keyserver.c:1351
msgid "no keyserver action!\n" msgid "no keyserver action!\n"
msgstr "公钥服务器无动作！\n" msgstr "公钥服务器无动作！\n"
#: g10/keyserver.c:1302 #: g10/keyserver.c:1304
#, c-format #, c-format
msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n" msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
msgstr "警告：处理公钥服务器的程序来自不同版本的 GnuPG (%s)\n" msgstr "警告：处理公钥服务器的程序来自不同版本的 GnuPG (%s)\n"
#: g10/keyserver.c:1311 #: g10/keyserver.c:1313
msgid "keyserver did not send VERSION\n" msgid "keyserver did not send VERSION\n"
msgstr "公钥服务器未发送 VERSION\n" msgstr "公钥服务器未发送 VERSION\n"
#: g10/keyserver.c:1371 #: g10/keyserver.c:1373
msgid "no keyserver known (use option --keyserver)\n" msgid "no keyserver known (use option --keyserver)\n"
msgstr "未给出公钥服务器(使用 --keyserver 选项)\n" msgstr "未给出公钥服务器(使用 --keyserver 选项)\n"
#: g10/keyserver.c:1377 #: g10/keyserver.c:1379
msgid "external keyserver calls are not supported in this build\n" msgid "external keyserver calls are not supported in this build\n"
msgstr "这一编译版本不支持外部调用公钥服务器\n" msgstr "这一编译版本不支持外部调用公钥服务器\n"
#: g10/keyserver.c:1389 #: g10/keyserver.c:1391
#, c-format #, c-format
msgid "no handler for keyserver scheme `%s'\n" msgid "no handler for keyserver scheme `%s'\n"
msgstr "没有处理‘%s’公钥服务器的程序\n" msgstr "没有处理‘%s’公钥服务器的程序\n"
#: g10/keyserver.c:1394 #: g10/keyserver.c:1396
#, c-format #, c-format
msgid "action `%s' not supported with keyserver scheme `%s'\n" msgid "action `%s' not supported with keyserver scheme `%s'\n"
msgstr "‘%s’操作不为‘%s’公钥服务器所支持\n" msgstr "‘%s’操作不为‘%s’公钥服务器所支持\n"
#: g10/keyserver.c:1402 #: g10/keyserver.c:1404
#, fuzzy, c-format #, fuzzy, c-format
msgid "%s does not support handler version %d\n" msgid "%s does not support handler version %d\n"
msgstr "gpgkeys_%s 不支持对版本 %d 的处理\n" msgstr "gpgkeys_%s 不支持对版本 %d 的处理\n"
#: g10/keyserver.c:1409 #: g10/keyserver.c:1411
msgid "keyserver timed out\n" msgid "keyserver timed out\n"
msgstr "公钥服务器超时\n" msgstr "公钥服务器超时\n"
#: g10/keyserver.c:1414 #: g10/keyserver.c:1416
msgid "keyserver internal error\n" msgid "keyserver internal error\n"
msgstr "公钥服务器内部错误\n" msgstr "公钥服务器内部错误\n"
#: g10/keyserver.c:1423 #: g10/keyserver.c:1425
#, c-format #, c-format
msgid "keyserver communications error: %s\n" msgid "keyserver communications error: %s\n"
msgstr "公钥服务器通讯错误：%s\n" msgstr "公钥服务器通讯错误：%s\n"
#: g10/keyserver.c:1448 g10/keyserver.c:1482 #: g10/keyserver.c:1450 g10/keyserver.c:1484
#, c-format #, c-format
msgid "\"%s\" not a key ID: skipping\n" msgid "\"%s\" not a key ID: skipping\n"
msgstr "“%s”不是一个用户标识：跳过\n" msgstr "“%s”不是一个用户标识：跳过\n"
#: g10/keyserver.c:1739 #: g10/keyserver.c:1741
#, c-format #, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n" msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr "警告：无法更新密钥 %s，通过 %s：%s\n" msgstr "警告：无法更新密钥 %s，通过 %s：%s\n"
#: g10/keyserver.c:1761 #: g10/keyserver.c:1763
#, c-format #, c-format
msgid "refreshing 1 key from %s\n" msgid "refreshing 1 key from %s\n"
msgstr "1 个密钥正从 %s 得到更新\n" msgstr "1 个密钥正从 %s 得到更新\n"
#: g10/keyserver.c:1763 #: g10/keyserver.c:1765
#, c-format #, c-format
msgid "refreshing %d keys from %s\n" msgid "refreshing %d keys from %s\n"
msgstr "%d 个密钥正从 %s 得到更新\n" msgstr "%d 个密钥正从 %s 得到更新\n"

63
po/zh_TW.po
View File

@ -9,7 +9,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: gnupg 1.4.2\n" "Project-Id-Version: gnupg 1.4.2\n"
"Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n"
"POT-Creation-Date: 2005-07-26 18:08+0200\n" "POT-Creation-Date: 2005-07-27 19:41+0200\n"
"PO-Revision-Date: 2005-06-23 02:36+0800\n" "PO-Revision-Date: 2005-06-23 02:36+0800\n"
"Last-Translator: Jedi <Jedi@Jedi.org>\n" "Last-Translator: Jedi <Jedi@Jedi.org>\n"
"Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n" "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@ -696,13 +696,13 @@ msgstr "無法開啟 `%s'\n"
msgid "--output doesn't work for this command\n" msgid "--output doesn't work for this command\n"
msgstr "--output 在這個命令中沒有作用\n" msgstr "--output 在這個命令中沒有作用\n"
#: g10/delkey.c:75 g10/export.c:178 g10/keyedit.c:3360 g10/keyserver.c:1569 #: g10/delkey.c:75 g10/export.c:178 g10/keyedit.c:3360 g10/keyserver.c:1571
#: g10/revoke.c:227 #: g10/revoke.c:227
#, c-format #, c-format
msgid "key \"%s\" not found: %s\n" msgid "key \"%s\" not found: %s\n"
msgstr "金鑰 \"%s\" 找不到: %s\n" msgstr "金鑰 \"%s\" 找不到: %s\n"
#: g10/delkey.c:83 g10/export.c:208 g10/import.c:2334 g10/keyserver.c:1583 #: g10/delkey.c:83 g10/export.c:208 g10/import.c:2334 g10/keyserver.c:1585
#: g10/revoke.c:233 g10/revoke.c:440 #: g10/revoke.c:233 g10/revoke.c:440
#, c-format #, c-format
msgid "error reading keyblock: %s\n" msgid "error reading keyblock: %s\n"
@ -897,13 +897,22 @@ msgstr "金鑰 %s: 未被保護 - 已跳過\n"
msgid "key %s: PGP 2.x style key - skipped\n" msgid "key %s: PGP 2.x style key - skipped\n"
msgstr "金鑰 %s: PGP 2.x 樣式的金鑰 - 已跳過\n" msgstr "金鑰 %s: PGP 2.x 樣式的金鑰 - 已跳過\n"
#: g10/export.c:409
msgid "about to export an unprotected subkey\n"
msgstr ""
#: g10/export.c:432
#, fuzzy, c-format
msgid "failed to unprotect the subkey: %s\n"
msgstr "存放金鑰失敗: %s\n"
# I hope this warning doesn't confuse people. # I hope this warning doesn't confuse people.
#: g10/export.c:454 #: g10/export.c:453
#, c-format #, c-format
msgid "WARNING: secret key %s does not have a simple SK checksum\n" msgid "WARNING: secret key %s does not have a simple SK checksum\n"
msgstr "警告: 私鑰 %s 並沒有任的何單一 SK 加總檢查\n" msgstr "警告: 私鑰 %s 並沒有任的何單一 SK 加總檢查\n"
#: g10/export.c:486 #: g10/export.c:485
msgid "WARNING: nothing exported\n" msgid "WARNING: nothing exported\n"
msgstr "警告: 沒有匯出任何東西\n" msgstr "警告: 沒有匯出任何東西\n"
@ -3986,7 +3995,7 @@ msgstr "已禁用"
msgid "Enter number(s), N)ext, or Q)uit > " msgid "Enter number(s), N)ext, or Q)uit > "
msgstr "請輸入數字, N)ext, 或 Q)uit > " msgstr "請輸入數字, N)ext, 或 Q)uit > "
#: g10/keyserver.c:724 g10/keyserver.c:1294 #: g10/keyserver.c:724 g10/keyserver.c:1296
#, c-format #, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n" msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "無效的金鑰伺服器協定 (我們用 %d != 經手程式 %d)\n" msgstr "無效的金鑰伺服器協定 (我們用 %d != 經手程式 %d)\n"
@ -4000,101 +4009,101 @@ msgstr "在金鑰伺服器上找不到金鑰 \"%s\"\n"
msgid "key not found on keyserver\n" msgid "key not found on keyserver\n"
msgstr "在金鑰伺服器上找不到金鑰\n" msgstr "在金鑰伺服器上找不到金鑰\n"
#: g10/keyserver.c:1041 #: g10/keyserver.c:1043
#, c-format #, c-format
msgid "requesting key %s from %s server %s\n" msgid "requesting key %s from %s server %s\n"
msgstr "正在請求金鑰 %s 自 %s 伺服器 %s\n" msgstr "正在請求金鑰 %s 自 %s 伺服器 %s\n"
#: g10/keyserver.c:1045 #: g10/keyserver.c:1047
#, c-format #, c-format
msgid "requesting key %s from %s\n" msgid "requesting key %s from %s\n"
msgstr "正在請求金鑰 %s 自 %s\n" msgstr "正在請求金鑰 %s 自 %s\n"
#: g10/keyserver.c:1197 #: g10/keyserver.c:1199
#, c-format #, c-format
msgid "sending key %s to %s server %s\n" msgid "sending key %s to %s server %s\n"
msgstr "遞送金鑰 %s 至 %s 伺服器 %s\n" msgstr "遞送金鑰 %s 至 %s 伺服器 %s\n"
#: g10/keyserver.c:1201 #: g10/keyserver.c:1203
#, c-format #, c-format
msgid "sending key %s to %s\n" msgid "sending key %s to %s\n"
msgstr "遞送金鑰 %s 至 %s\n" msgstr "遞送金鑰 %s 至 %s\n"
#: g10/keyserver.c:1244 #: g10/keyserver.c:1246
#, c-format #, c-format
msgid "searching for \"%s\" from %s server %s\n" msgid "searching for \"%s\" from %s server %s\n"
msgstr "正在搜尋 \"%s\" 於 %s 伺服器 %s\n" msgstr "正在搜尋 \"%s\" 於 %s 伺服器 %s\n"
#: g10/keyserver.c:1247 #: g10/keyserver.c:1249
#, c-format #, c-format
msgid "searching for \"%s\" from %s\n" msgid "searching for \"%s\" from %s\n"
msgstr "正在搜尋 \"%s\" 於 %s\n" msgstr "正在搜尋 \"%s\" 於 %s\n"
#: g10/keyserver.c:1254 g10/keyserver.c:1349 #: g10/keyserver.c:1256 g10/keyserver.c:1351
msgid "no keyserver action!\n" msgid "no keyserver action!\n"
msgstr "沒有金鑰伺服器動作!\n" msgstr "沒有金鑰伺服器動作!\n"
#: g10/keyserver.c:1302 #: g10/keyserver.c:1304
#, c-format #, c-format
msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n" msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
msgstr "警告: 金鑰伺服器經手程式 (handler) 係來自不同版本的 GnuPG (%s)\n" msgstr "警告: 金鑰伺服器經手程式 (handler) 係來自不同版本的 GnuPG (%s)\n"
#: g10/keyserver.c:1311 #: g10/keyserver.c:1313
msgid "keyserver did not send VERSION\n" msgid "keyserver did not send VERSION\n"
msgstr "金鑰伺服器並未送出版本 (VERSION)\n" msgstr "金鑰伺服器並未送出版本 (VERSION)\n"
#: g10/keyserver.c:1371 #: g10/keyserver.c:1373
msgid "no keyserver known (use option --keyserver)\n" msgid "no keyserver known (use option --keyserver)\n"
msgstr "沒有已知的金鑰伺服器 (使用 --keyserver 選項)\n" msgstr "沒有已知的金鑰伺服器 (使用 --keyserver 選項)\n"
#: g10/keyserver.c:1377 #: g10/keyserver.c:1379
msgid "external keyserver calls are not supported in this build\n" msgid "external keyserver calls are not supported in this build\n"
msgstr "本版並不支援外部金鑰伺服器叫用\n" msgstr "本版並不支援外部金鑰伺服器叫用\n"
#: g10/keyserver.c:1389 #: g10/keyserver.c:1391
#, c-format #, c-format
msgid "no handler for keyserver scheme `%s'\n" msgid "no handler for keyserver scheme `%s'\n"
msgstr "沒有金鑰伺服器方案 (scheme) `%s' 的經手程式 (handler)\n" msgstr "沒有金鑰伺服器方案 (scheme) `%s' 的經手程式 (handler)\n"
#: g10/keyserver.c:1394 #: g10/keyserver.c:1396
#, c-format #, c-format
msgid "action `%s' not supported with keyserver scheme `%s'\n" msgid "action `%s' not supported with keyserver scheme `%s'\n"
msgstr "動作 `%s' 並未被金鑰伺服器方案 (scheme) `%s' 所支援\n" msgstr "動作 `%s' 並未被金鑰伺服器方案 (scheme) `%s' 所支援\n"
#: g10/keyserver.c:1402 #: g10/keyserver.c:1404
#, c-format #, c-format
msgid "%s does not support handler version %d\n" msgid "%s does not support handler version %d\n"
msgstr "%s 並不支援經手程式 (handler) 版本 %d\n" msgstr "%s 並不支援經手程式 (handler) 版本 %d\n"
#: g10/keyserver.c:1409 #: g10/keyserver.c:1411
msgid "keyserver timed out\n" msgid "keyserver timed out\n"
msgstr "金鑰伺服器逾時\n" msgstr "金鑰伺服器逾時\n"
#: g10/keyserver.c:1414 #: g10/keyserver.c:1416
msgid "keyserver internal error\n" msgid "keyserver internal error\n"
msgstr "金鑰伺服器內部出錯\n" msgstr "金鑰伺服器內部出錯\n"
#: g10/keyserver.c:1423 #: g10/keyserver.c:1425
#, c-format #, c-format
msgid "keyserver communications error: %s\n" msgid "keyserver communications error: %s\n"
msgstr "金鑰伺服器通訊出錯: %s\n" msgstr "金鑰伺服器通訊出錯: %s\n"
#: g10/keyserver.c:1448 g10/keyserver.c:1482 #: g10/keyserver.c:1450 g10/keyserver.c:1484
#, c-format #, c-format
msgid "\"%s\" not a key ID: skipping\n" msgid "\"%s\" not a key ID: skipping\n"
msgstr "\"%s\" 並非金鑰 ID: 正跳過\n" msgstr "\"%s\" 並非金鑰 ID: 正跳過\n"
#: g10/keyserver.c:1739 #: g10/keyserver.c:1741
#, c-format #, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n" msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr "警告: 無法更新金鑰 %s 於 %s: %s\n" msgstr "警告: 無法更新金鑰 %s 於 %s: %s\n"
#: g10/keyserver.c:1761 #: g10/keyserver.c:1763
#, c-format #, c-format
msgid "refreshing 1 key from %s\n" msgid "refreshing 1 key from %s\n"
msgstr "正從 %s 更新 1 份金鑰\n" msgstr "正從 %s 更新 1 份金鑰\n"
#: g10/keyserver.c:1763 #: g10/keyserver.c:1765
#, c-format #, c-format
msgid "refreshing %d keys from %s\n" msgid "refreshing %d keys from %s\n"
msgstr "正在更新 %d 份金鑰自 %s\n" msgstr "正在更新 %d 份金鑰自 %s\n"

12
tools/gpgsplit.c
View File

@ -205,7 +205,7 @@ create_filename (int pkttype)
static char *name; static char *name;
if (!name) if (!name)
name = m_alloc (strlen (opt_prefix) + 100 ); name = xmalloc (strlen (opt_prefix) + 100 );
assert (pkttype < 1000 && pkttype >= 0 ); assert (pkttype < 1000 && pkttype >= 0 );
partno++; partno++;
@ -376,9 +376,9 @@ handle_zlib(int algo,FILE *fpin,FILE *fpout)
memset (&zs, 0, sizeof zs); memset (&zs, 0, sizeof zs);
inbufsize = 2048; inbufsize = 2048;
inbuf = m_alloc (inbufsize); inbuf = xmalloc (inbufsize);
outbufsize = 8192; outbufsize = 8192;
outbuf = m_alloc (outbufsize); outbuf = xmalloc (outbufsize);
zs.avail_in = 0; zs.avail_in = 0;
zinit_done = 0; zinit_done = 0;
@ -461,9 +461,9 @@ handle_bzip2(int algo,FILE *fpin,FILE *fpout)
memset (&bzs, 0, sizeof bzs); memset (&bzs, 0, sizeof bzs);
inbufsize = 2048; inbufsize = 2048;
inbuf = m_alloc (inbufsize); inbuf = xmalloc (inbufsize);
outbufsize = 8192; outbufsize = 8192;
outbuf = m_alloc (outbufsize); outbuf = xmalloc (outbufsize);
bzs.avail_in = 0; bzs.avail_in = 0;
zinit_done = 0; zinit_done = 0;
@ -554,7 +554,7 @@ write_part ( const char *fname, FILE *fpin, unsigned long pktlen,
if (opt_secret_to_public if (opt_secret_to_public
&& (pkttype == PKT_SECRET_KEY || pkttype == PKT_SECRET_SUBKEY)) && (pkttype == PKT_SECRET_KEY || pkttype == PKT_SECRET_SUBKEY))
{ {
unsigned char *blob = m_alloc (pktlen); unsigned char *blob = xmalloc (pktlen);
int i, len; int i, len;
pkttype = pkttype == PKT_SECRET_KEY? PKT_PUBLIC_KEY:PKT_PUBLIC_SUBKEY; pkttype = pkttype == PKT_SECRET_KEY? PKT_PUBLIC_KEY:PKT_PUBLIC_SUBKEY;

6
tools/shmtest.c
View File

@ -83,7 +83,7 @@ do_get_string( int mode, const char *keyword, byte *area, size_t areasize )
memcpy( area+n+2, p, len ); memcpy( area+n+2, p, len );
area[n] = len >> 8; area[n] = len >> 8;
area[n+1] = len; area[n+1] = len;
m_free(p); xfree(p);
} }
else { /* bool */ else { /* bool */
area[n] = 0; area[n] = 0;
@ -118,7 +118,7 @@ main(int argc, char **argv)
for(n=0,i=1; i < argc; i++ ) for(n=0,i=1; i < argc; i++ )
n += strlen(argv[i]) + 1; n += strlen(argv[i]) + 1;
p = m_alloc( 100 + n ); p = xmalloc( 100 + n );
strcpy( p, "../g10/gpg --status-fd 1 --run-as-shm-coprocess 0"); strcpy( p, "../g10/gpg --status-fd 1 --run-as-shm-coprocess 0");
for(i=1; i < argc; i++ ) { for(i=1; i < argc; i++ ) {
strcat(p, " " ); strcat(p, " " );
@ -126,7 +126,7 @@ main(int argc, char **argv)
} }
fp = popen( p, "r" ); fp = popen( p, "r" );
m_free( p ); xfree( p );
if( !fp ) if( !fp )
log_error("popen failed: %s\n", strerror(errno)); log_error("popen failed: %s\n", strerror(errno));

5
util/ChangeLog
View File

@ -1,3 +1,8 @@
2005-07-27 Werner Koch <wk@g10code.com>
* memory.c (FNAMEX, FNAMEXM): New macros to cope with the now used
names xmalloc style names.
2005-07-18 Werner Koch <wk@g10code.com> 2005-07-18 Werner Koch <wk@g10code.com>
* ttyio.c (do_get): Move printing of the prompt after disabling * ttyio.c (do_get): Move printing of the prompt after disabling

12
util/argparse.c
View File

@ -215,7 +215,7 @@ store_alias( ARGPARSE_ARGS *arg, char *name, char *value )
* used as lvalue * used as lvalue
*/ */
#if 0 #if 0
ALIAS_DEF a = m_alloc( sizeof *a ); ALIAS_DEF a = xmalloc( sizeof *a );
a->name = name; a->name = name;
a->value = value; a->value = value;
a->next = (ALIAS_DEF)arg->internal.aliases; a->next = (ALIAS_DEF)arg->internal.aliases;
@ -310,7 +310,7 @@ optfile_parse( FILE *fp, const char *filename, unsigned *lineno,
trim_spaces( p ); trim_spaces( p );
} }
if( !p || !*p ) { if( !p || !*p ) {
m_free( buffer ); xfree( buffer );
arg->r_opt = -10; arg->r_opt = -10;
} }
else { else {
@ -324,7 +324,7 @@ optfile_parse( FILE *fp, const char *filename, unsigned *lineno,
char *p; char *p;
if( !buffer ) { if( !buffer ) {
keyword[i] = 0; keyword[i] = 0;
buffer = m_strdup(keyword); buffer = xstrdup(keyword);
} }
else else
buffer[i] = 0; buffer[i] = 0;
@ -346,7 +346,7 @@ optfile_parse( FILE *fp, const char *filename, unsigned *lineno,
} }
} }
if( !set_opt_arg(arg, opts[idx].flags, p) ) if( !set_opt_arg(arg, opts[idx].flags, p) )
m_free(buffer); xfree(buffer);
} }
break; break;
} }
@ -401,7 +401,7 @@ optfile_parse( FILE *fp, const char *filename, unsigned *lineno,
buffer[i++] = c; buffer[i++] = c;
else { else {
buflen += 50; buflen += 50;
buffer = m_realloc(buffer, buflen); buffer = xrealloc(buffer, buflen);
buffer[i++] = c; buffer[i++] = c;
} }
} }
@ -409,7 +409,7 @@ optfile_parse( FILE *fp, const char *filename, unsigned *lineno,
keyword[i++] = c; keyword[i++] = c;
else { else {
buflen = DIM(keyword)+50; buflen = DIM(keyword)+50;
buffer = m_alloc(buflen); buffer = xmalloc(buflen);
memcpy(buffer, keyword, i); memcpy(buffer, keyword, i);
buffer[i++] = c; buffer[i++] = c;
} }

24
util/dotlock.c
View File

@ -96,7 +96,7 @@ create_dotlock( const char *file_to_lock )
if( !file_to_lock ) if( !file_to_lock )
return NULL; return NULL;
h = m_alloc_clear( sizeof *h ); h = xmalloc_clear( sizeof *h );
if( never_lock ) { if( never_lock ) {
h->disable = 1; h->disable = 1;
#ifdef _REENTRANT #ifdef _REENTRANT
@ -142,7 +142,7 @@ create_dotlock( const char *file_to_lock )
h->next = all_lockfiles; h->next = all_lockfiles;
all_lockfiles = h; all_lockfiles = h;
h->tname = m_alloc( dirpartlen + 6+30+ strlen(nodename) + 11 ); h->tname = xmalloc( dirpartlen + 6+30+ strlen(nodename) + 11 );
#ifndef __riscos__ #ifndef __riscos__
sprintf( h->tname, "%.*s/.#lk%p.%s.%d", sprintf( h->tname, "%.*s/.#lk%p.%s.%d",
dirpartlen, dirpart, h, nodename, (int)getpid() ); dirpartlen, dirpart, h, nodename, (int)getpid() );
@ -160,8 +160,8 @@ create_dotlock( const char *file_to_lock )
all_lockfiles = h->next; all_lockfiles = h->next;
log_error( "failed to create temporary file `%s': %s\n", log_error( "failed to create temporary file `%s': %s\n",
h->tname, strerror(errno)); h->tname, strerror(errno));
m_free(h->tname); xfree(h->tname);
m_free(h); xfree(h);
return NULL; return NULL;
} }
if( write(fd, pidstr, 11 ) != 11 ) { if( write(fd, pidstr, 11 ) != 11 ) {
@ -172,8 +172,8 @@ create_dotlock( const char *file_to_lock )
log_fatal( "error writing to `%s': %s\n", h->tname, strerror(errno) ); log_fatal( "error writing to `%s': %s\n", h->tname, strerror(errno) );
close(fd); close(fd);
unlink(h->tname); unlink(h->tname);
m_free(h->tname); xfree(h->tname);
m_free(h); xfree(h);
return NULL; return NULL;
} }
if( close(fd) ) { if( close(fd) ) {
@ -183,8 +183,8 @@ create_dotlock( const char *file_to_lock )
#endif #endif
log_error( "error closing `%s': %s\n", h->tname, strerror(errno)); log_error( "error closing `%s': %s\n", h->tname, strerror(errno));
unlink(h->tname); unlink(h->tname);
m_free(h->tname); xfree(h->tname);
m_free(h); xfree(h);
return NULL; return NULL;
} }
@ -192,7 +192,7 @@ create_dotlock( const char *file_to_lock )
/* release mutex */ /* release mutex */
#endif #endif
#endif #endif
h->lockname = m_alloc( strlen(file_to_lock) + 6 ); h->lockname = xmalloc( strlen(file_to_lock) + 6 );
strcpy(stpcpy(h->lockname, file_to_lock), EXTSEP_S "lock"); strcpy(stpcpy(h->lockname, file_to_lock), EXTSEP_S "lock");
return h; return h;
} }
@ -225,10 +225,10 @@ destroy_dotlock ( DOTLOCK h )
unlink (h->lockname); unlink (h->lockname);
if (h->tname) if (h->tname)
unlink (h->tname); unlink (h->tname);
m_free (h->tname); xfree (h->tname);
m_free (h->lockname); xfree (h->lockname);
} }
m_free(h); xfree(h);
} }
#endif #endif

16
util/fileutil.c
View File

@ -50,10 +50,10 @@ make_basename(const char *filepath, const char *inputpath)
if ( !(p=strrchr(filepath, ':')) ) if ( !(p=strrchr(filepath, ':')) )
#endif #endif
{ {
return m_strdup(filepath); return xstrdup(filepath);
} }
return m_strdup(p+1); return xstrdup(p+1);
} }
@ -77,11 +77,11 @@ make_dirname(const char *filepath)
if ( !(p=strrchr(filepath, ':')) ) if ( !(p=strrchr(filepath, ':')) )
#endif #endif
{ {
return m_strdup(EXTSEP_S); return xstrdup(EXTSEP_S);
} }
dirname_length = p-filepath; dirname_length = p-filepath;
dirname = m_alloc(dirname_length+1); dirname = xmalloc(dirname_length+1);
strncpy(dirname, filepath, dirname_length); strncpy(dirname, filepath, dirname_length);
dirname[dirname_length] = 0; dirname[dirname_length] = 0;
@ -114,7 +114,7 @@ make_filename( const char *first_part, ... )
&& (home = getenv("HOME")) && *home ) && (home = getenv("HOME")) && *home )
n += strlen(home); n += strlen(home);
#endif #endif
name = m_alloc(n); name = xmalloc(n);
p = home ? stpcpy(stpcpy(name,home), first_part+1) p = home ? stpcpy(stpcpy(name,home), first_part+1)
: stpcpy(name, first_part); : stpcpy(name, first_part);
va_start( arg_ptr, first_part ) ; va_start( arg_ptr, first_part ) ;
@ -126,7 +126,7 @@ make_filename( const char *first_part, ... )
return name; return name;
#else /* __riscos__ */ #else /* __riscos__ */
p = riscos_gstrans(name); p = riscos_gstrans(name);
m_free(name); xfree(name);
return p; return p;
#endif /* __riscos__ */ #endif /* __riscos__ */
} }
@ -153,8 +153,8 @@ compare_filenames( const char *a, const char *b )
c = ascii_strcasecmp (abuf, bbuf); c = ascii_strcasecmp (abuf, bbuf);
m_free(abuf); xfree(abuf);
m_free(bbuf); xfree(bbuf);
return c; return c;
#endif /* __riscos__ */ #endif /* __riscos__ */

42
util/http.c
View File

@ -125,7 +125,7 @@ make_radix64_string( const byte *data, size_t len )
{ {
char *buffer, *p; char *buffer, *p;
buffer = p = m_alloc( (len+2)/3*4 + 1 ); buffer = p = xmalloc( (len+2)/3*4 + 1 );
for( ; len >= 3 ; len -= 3, data += 3 ) { for( ; len >= 3 ; len -= 3, data += 3 ) {
*p++ = bintoasc[(data[0] >> 2) & 077]; *p++ = bintoasc[(data[0] >> 2) & 077];
*p++ = bintoasc[(((data[0] <<4)&060)|((data[1] >> 4)&017))&077]; *p++ = bintoasc[(((data[0] <<4)&060)|((data[1] >> 4)&017))&077];
@ -256,7 +256,7 @@ http_close( HTTP_HD hd )
iobuf_close( hd->fp_read ); iobuf_close( hd->fp_read );
iobuf_close( hd->fp_write ); iobuf_close( hd->fp_write );
release_parsed_uri( hd->uri ); release_parsed_uri( hd->uri );
m_free( hd->buffer ); xfree( hd->buffer );
hd->initialized = 0; hd->initialized = 0;
} }
@ -270,7 +270,7 @@ http_close( HTTP_HD hd )
static int static int
parse_uri( PARSED_URI *ret_uri, const char *uri ) parse_uri( PARSED_URI *ret_uri, const char *uri )
{ {
*ret_uri = m_alloc_clear( sizeof(**ret_uri) + strlen(uri) ); *ret_uri = xmalloc_clear( sizeof(**ret_uri) + strlen(uri) );
strcpy( (*ret_uri)->buffer, uri ); strcpy( (*ret_uri)->buffer, uri );
return do_parse_uri( *ret_uri, 0 ); return do_parse_uri( *ret_uri, 0 );
} }
@ -284,9 +284,9 @@ release_parsed_uri( PARSED_URI uri )
for( r = uri->query; r; r = r2 ) { for( r = uri->query; r; r = r2 ) {
r2 = r->next; r2 = r->next;
m_free( r ); xfree( r );
} }
m_free( uri ); xfree( uri );
} }
} }
@ -483,7 +483,7 @@ parse_tuple( byte *string )
return NULL; /* bad URI */ return NULL; /* bad URI */
if( n != strlen( p ) ) if( n != strlen( p ) )
return NULL; /* name with a Nul in it */ return NULL; /* name with a Nul in it */
tuple = m_alloc_clear( sizeof *tuple ); tuple = xmalloc_clear( sizeof *tuple );
tuple->name = p; tuple->name = p;
if( !p2 ) { if( !p2 ) {
/* we have only the name, so we assume an empty value string */ /* we have only the name, so we assume an empty value string */
@ -492,7 +492,7 @@ parse_tuple( byte *string )
} }
else { /* name and value */ else { /* name and value */
if( (n = remove_escapes( p2 )) < 0 ) { if( (n = remove_escapes( p2 )) < 0 ) {
m_free( tuple ); xfree( tuple );
return NULL; /* bad URI */ return NULL; /* bad URI */
} }
tuple->value = p2; tuple->value = p2;
@ -536,9 +536,9 @@ send_request( HTTP_HD hd, const char *auth, const char *proxy )
char *x; char *x;
remove_escapes(uri->auth); remove_escapes(uri->auth);
x=make_radix64_string(uri->auth,strlen(uri->auth)); x=make_radix64_string(uri->auth,strlen(uri->auth));
proxy_authstr=m_alloc(52+strlen(x)); proxy_authstr=xmalloc(52+strlen(x));
sprintf(proxy_authstr,"Proxy-Authorization: Basic %s\r\n",x); sprintf(proxy_authstr,"Proxy-Authorization: Basic %s\r\n",x);
m_free(x); xfree(x);
} }
release_parsed_uri( uri ); release_parsed_uri( uri );
@ -552,7 +552,7 @@ send_request( HTTP_HD hd, const char *auth, const char *proxy )
if(auth) if(auth)
{ {
tempauth=m_strdup(auth); tempauth=xstrdup(auth);
remove_escapes(tempauth); remove_escapes(tempauth);
} }
else if(hd->uri->auth) else if(hd->uri->auth)
@ -560,10 +560,10 @@ send_request( HTTP_HD hd, const char *auth, const char *proxy )
x=make_radix64_string(tempauth?tempauth:hd->uri->auth, x=make_radix64_string(tempauth?tempauth:hd->uri->auth,
strlen(tempauth?tempauth:hd->uri->auth)); strlen(tempauth?tempauth:hd->uri->auth));
authstr=m_alloc(52+strlen(x)); authstr=xmalloc(52+strlen(x));
sprintf(authstr,"Authorization: Basic %s\r\n",x); sprintf(authstr,"Authorization: Basic %s\r\n",x);
m_free(x); xfree(x);
m_free(tempauth); xfree(tempauth);
} }
if( hd->sock == -1 ) if( hd->sock == -1 )
@ -571,7 +571,7 @@ send_request( HTTP_HD hd, const char *auth, const char *proxy )
p = build_rel_path( hd->uri ); p = build_rel_path( hd->uri );
request=m_alloc(strlen(server)*2 + strlen(p) request=xmalloc(strlen(server)*2 + strlen(p)
+ (authstr?strlen(authstr):0) + (authstr?strlen(authstr):0)
+ (proxy_authstr?strlen(proxy_authstr):0) + 65); + (proxy_authstr?strlen(proxy_authstr):0) + 65);
if( proxy ) if( proxy )
@ -596,12 +596,12 @@ send_request( HTTP_HD hd, const char *auth, const char *proxy )
authstr?authstr:""); authstr?authstr:"");
} }
m_free(p); xfree(p);
rc = write_server( hd->sock, request, strlen(request) ); rc = write_server( hd->sock, request, strlen(request) );
m_free( request ); xfree( request );
m_free(proxy_authstr); xfree(proxy_authstr);
m_free(authstr); xfree(authstr);
return rc; return rc;
} }
@ -630,7 +630,7 @@ build_rel_path( PARSED_URI uri )
n++; n++;
/* now allocate and copy */ /* now allocate and copy */
p = rel_path = m_alloc( n ); p = rel_path = xmalloc( n );
n = insert_escapes( p, uri->path, "%;?&" ); n = insert_escapes( p, uri->path, "%;?&" );
p += n; p += n;
/* todo: add params */ /* todo: add params */
@ -845,7 +845,7 @@ connect_server( const char *server, ushort port, unsigned int flags,
{ {
/* Either we're not using SRV, or the SRV lookup failed. Make /* Either we're not using SRV, or the SRV lookup failed. Make
up a fake SRV record. */ up a fake SRV record. */
srvlist=m_alloc_clear(sizeof(struct srventry)); srvlist=xmalloc_clear(sizeof(struct srventry));
srvlist->port=port; srvlist->port=port;
strncpy(srvlist->target,server,MAXDNAME); strncpy(srvlist->target,server,MAXDNAME);
srvlist->target[MAXDNAME-1]='\0'; srvlist->target[MAXDNAME-1]='\0';
@ -948,7 +948,7 @@ connect_server( const char *server, ushort port, unsigned int flags,
} }
#endif /* !HAVE_GETADDRINFO */ #endif /* !HAVE_GETADDRINFO */
m_free(srvlist); xfree(srvlist);
if(!connected) if(!connected)
{ {

100
util/iobuf.c
View File

@ -284,7 +284,7 @@ fd_cache_close (const char *fname, FILEP_OR_FD fp)
/* add a new one */ /* add a new one */
if( DBG_IOBUF ) if( DBG_IOBUF )
log_debug ("fd_cache_close (%s) new slot created\n", fname); log_debug ("fd_cache_close (%s) new slot created\n", fname);
cc = m_alloc_clear (sizeof *cc + strlen (fname)); cc = xmalloc_clear (sizeof *cc + strlen (fname));
strcpy (cc->fname, fname); strcpy (cc->fname, fname);
cc->fp = fp; cc->fp = fp;
cc->next = close_cache; cc->next = close_cache;
@ -409,7 +409,7 @@ file_filter(void *opaque, int control, IOBUF chain, byte *buf, size_t *ret_len)
fclose(f); fclose(f);
} }
f = NULL; f = NULL;
m_free(a); /* we can free our context now */ xfree(a); /* we can free our context now */
} }
#else /* !stdio implementation */ #else /* !stdio implementation */
@ -531,7 +531,7 @@ file_filter(void *opaque, int control, IOBUF chain, byte *buf, size_t *ret_len)
} }
f = INVALID_FP; f = INVALID_FP;
#endif #endif
m_free (a); /* we can free our context now */ xfree (a); /* we can free our context now */
} }
#endif /* !stdio implementation */ #endif /* !stdio implementation */
return rc; return rc;
@ -605,7 +605,7 @@ sock_filter (void *opaque, int control, IOBUF chain, byte *buf, size_t *ret_len)
else if ( control == IOBUFCTRL_FREE ) { else if ( control == IOBUFCTRL_FREE ) {
if (!a->keep_open) if (!a->keep_open)
closesocket (a->sock); closesocket (a->sock);
m_free (a); /* we can free our context now */ xfree (a); /* we can free our context now */
} }
return rc; return rc;
} }
@ -731,7 +731,7 @@ block_filter(void *opaque, int control, IOBUF chain, byte *buf, size_t *ret_len)
if( nbytes < OP_MIN_PARTIAL_CHUNK ) { if( nbytes < OP_MIN_PARTIAL_CHUNK ) {
/* not enough to write a partial block out; so we store it*/ /* not enough to write a partial block out; so we store it*/
if( !a->buffer ) if( !a->buffer )
a->buffer = m_alloc( OP_MIN_PARTIAL_CHUNK ); a->buffer = xmalloc( OP_MIN_PARTIAL_CHUNK );
memcpy( a->buffer + a->buflen, buf, size ); memcpy( a->buffer + a->buflen, buf, size );
a->buflen += size; a->buflen += size;
} }
@ -769,7 +769,7 @@ block_filter(void *opaque, int control, IOBUF chain, byte *buf, size_t *ret_len)
assert( !a->buflen ); assert( !a->buflen );
assert( nbytes < OP_MIN_PARTIAL_CHUNK ); assert( nbytes < OP_MIN_PARTIAL_CHUNK );
if( !a->buffer ) if( !a->buffer )
a->buffer = m_alloc( OP_MIN_PARTIAL_CHUNK ); a->buffer = xmalloc( OP_MIN_PARTIAL_CHUNK );
memcpy( a->buffer, p, nbytes ); memcpy( a->buffer, p, nbytes );
a->buflen = nbytes; a->buflen = nbytes;
} }
@ -830,7 +830,7 @@ block_filter(void *opaque, int control, IOBUF chain, byte *buf, size_t *ret_len)
log_error("block_filter: write error: %s\n",strerror(errno)); log_error("block_filter: write error: %s\n",strerror(errno));
rc = G10ERR_WRITE_FILE; rc = G10ERR_WRITE_FILE;
} }
m_free( a->buffer ); a->buffer = NULL; a->buflen = 0; xfree( a->buffer ); a->buffer = NULL; a->buflen = 0;
} }
else else
BUG(); BUG();
@ -840,7 +840,7 @@ block_filter(void *opaque, int control, IOBUF chain, byte *buf, size_t *ret_len)
} }
if( DBG_IOBUF ) if( DBG_IOBUF )
log_debug("free block_filter %p\n", a ); log_debug("free block_filter %p\n", a );
m_free(a); /* we can free our context now */ xfree(a); /* we can free our context now */
} }
return rc; return rc;
@ -884,9 +884,9 @@ iobuf_alloc(int use, size_t bufsize)
IOBUF a; IOBUF a;
static int number=0; static int number=0;
a = m_alloc_clear(sizeof *a); a = xmalloc_clear(sizeof *a);
a->use = use; a->use = use;
a->d.buf = m_alloc( bufsize ); a->d.buf = xmalloc( bufsize );
a->d.size = bufsize; a->d.size = bufsize;
a->no = ++number; a->no = ++number;
a->subno = 0; a->subno = 0;
@ -904,7 +904,7 @@ iobuf_close ( IOBUF a )
if( a && a->directfp ) { if( a && a->directfp ) {
fclose( a->directfp ); fclose( a->directfp );
m_free( a->real_fname ); xfree( a->real_fname );
if( DBG_IOBUF ) if( DBG_IOBUF )
log_debug("iobuf_close -> %p\n", a->directfp ); log_debug("iobuf_close -> %p\n", a->directfp );
return 0; return 0;
@ -920,12 +920,12 @@ iobuf_close ( IOBUF a )
if( a->filter && (rc = a->filter(a->filter_ov, IOBUFCTRL_FREE, if( a->filter && (rc = a->filter(a->filter_ov, IOBUFCTRL_FREE,
a->chain, NULL, &dummy_len)) ) a->chain, NULL, &dummy_len)) )
log_error("IOBUFCTRL_FREE failed on close: %s\n", g10_errstr(rc) ); log_error("IOBUFCTRL_FREE failed on close: %s\n", g10_errstr(rc) );
m_free(a->real_fname); xfree(a->real_fname);
if (a->d.buf) { if (a->d.buf) {
memset (a->d.buf, 0, a->d.size); /* erase the buffer */ memset (a->d.buf, 0, a->d.size); /* erase the buffer */
m_free(a->d.buf); xfree(a->d.buf);
} }
m_free(a); xfree(a);
} }
return rc; return rc;
} }
@ -944,7 +944,7 @@ iobuf_cancel( IOBUF a )
s = iobuf_get_real_fname(a); s = iobuf_get_real_fname(a);
if( s && *s ) { if( s && *s ) {
#if defined(HAVE_DOSISH_SYSTEM) || defined(__riscos__) #if defined(HAVE_DOSISH_SYSTEM) || defined(__riscos__)
remove_name = m_strdup ( s ); remove_name = xstrdup ( s );
#else #else
remove(s); remove(s);
#endif #endif
@ -965,7 +965,7 @@ iobuf_cancel( IOBUF a )
/* Argg, MSDOS does not allow to remove open files. So /* Argg, MSDOS does not allow to remove open files. So
* we have to do it here */ * we have to do it here */
remove ( remove_name ); remove ( remove_name );
m_free ( remove_name ); xfree ( remove_name );
} }
#endif #endif
return rc; return rc;
@ -1063,12 +1063,12 @@ iobuf_open( const char *fname )
else if( (fp = my_fopen_ro(fname, "rb")) == INVALID_FP ) else if( (fp = my_fopen_ro(fname, "rb")) == INVALID_FP )
return NULL; return NULL;
a = iobuf_alloc(1, 8192 ); a = iobuf_alloc(1, 8192 );
fcx = m_alloc( sizeof *fcx + strlen(fname) ); fcx = xmalloc( sizeof *fcx + strlen(fname) );
fcx->fp = fp; fcx->fp = fp;
fcx->print_only_name = print_only; fcx->print_only_name = print_only;
strcpy(fcx->fname, fname ); strcpy(fcx->fname, fname );
if( !print_only ) if( !print_only )
a->real_fname = m_strdup( fname ); a->real_fname = xstrdup( fname );
a->filter = file_filter; a->filter = file_filter;
a->filter_ov = fcx; a->filter_ov = fcx;
file_filter( fcx, IOBUFCTRL_DESC, NULL, (byte*)&a->desc, &len ); file_filter( fcx, IOBUFCTRL_DESC, NULL, (byte*)&a->desc, &len );
@ -1099,7 +1099,7 @@ iobuf_fdopen( int fd, const char *mode )
fp = (FILEP_OR_FD)fd; fp = (FILEP_OR_FD)fd;
#endif #endif
a = iobuf_alloc( strchr( mode, 'w')? 2:1, 8192 ); a = iobuf_alloc( strchr( mode, 'w')? 2:1, 8192 );
fcx = m_alloc( sizeof *fcx + 20 ); fcx = xmalloc( sizeof *fcx + 20 );
fcx->fp = fp; fcx->fp = fp;
fcx->print_only_name = 1; fcx->print_only_name = 1;
sprintf(fcx->fname, "[fd %d]", fd ); sprintf(fcx->fname, "[fd %d]", fd );
@ -1123,7 +1123,7 @@ iobuf_sockopen ( int fd, const char *mode )
size_t len; size_t len;
a = iobuf_alloc( strchr( mode, 'w')? 2:1, 8192 ); a = iobuf_alloc( strchr( mode, 'w')? 2:1, 8192 );
scx = m_alloc( sizeof *scx + 25 ); scx = xmalloc( sizeof *scx + 25 );
scx->sock = fd; scx->sock = fd;
scx->print_only_name = 1; scx->print_only_name = 1;
sprintf(scx->fname, "[sock %d]", fd ); sprintf(scx->fname, "[sock %d]", fd );
@ -1166,12 +1166,12 @@ iobuf_create( const char *fname )
else if( (fp = my_fopen(fname, "wb")) == INVALID_FP ) else if( (fp = my_fopen(fname, "wb")) == INVALID_FP )
return NULL; return NULL;
a = iobuf_alloc(2, 8192 ); a = iobuf_alloc(2, 8192 );
fcx = m_alloc( sizeof *fcx + strlen(fname) ); fcx = xmalloc( sizeof *fcx + strlen(fname) );
fcx->fp = fp; fcx->fp = fp;
fcx->print_only_name = print_only; fcx->print_only_name = print_only;
strcpy(fcx->fname, fname ); strcpy(fcx->fname, fname );
if( !print_only ) if( !print_only )
a->real_fname = m_strdup( fname ); a->real_fname = xstrdup( fname );
a->filter = file_filter; a->filter = file_filter;
a->filter_ov = fcx; a->filter_ov = fcx;
file_filter( fcx, IOBUFCTRL_DESC, NULL, (byte*)&a->desc, &len ); file_filter( fcx, IOBUFCTRL_DESC, NULL, (byte*)&a->desc, &len );
@ -1201,10 +1201,10 @@ iobuf_append( const char *fname )
else if( !(fp = my_fopen(fname, "ab")) ) else if( !(fp = my_fopen(fname, "ab")) )
return NULL; return NULL;
a = iobuf_alloc(2, 8192 ); a = iobuf_alloc(2, 8192 );
fcx = m_alloc( sizeof *fcx + strlen(fname) ); fcx = xmalloc( sizeof *fcx + strlen(fname) );
fcx->fp = fp; fcx->fp = fp;
strcpy(fcx->fname, fname ); strcpy(fcx->fname, fname );
a->real_fname = m_strdup( fname ); a->real_fname = xstrdup( fname );
a->filter = file_filter; a->filter = file_filter;
a->filter_ov = fcx; a->filter_ov = fcx;
file_filter( fcx, IOBUFCTRL_DESC, NULL, (byte*)&a->desc, &len ); file_filter( fcx, IOBUFCTRL_DESC, NULL, (byte*)&a->desc, &len );
@ -1229,10 +1229,10 @@ iobuf_openrw( const char *fname )
else if( (fp = my_fopen(fname, "r+b")) == INVALID_FP ) else if( (fp = my_fopen(fname, "r+b")) == INVALID_FP )
return NULL; return NULL;
a = iobuf_alloc(2, 8192 ); a = iobuf_alloc(2, 8192 );
fcx = m_alloc( sizeof *fcx + strlen(fname) ); fcx = xmalloc( sizeof *fcx + strlen(fname) );
fcx->fp = fp; fcx->fp = fp;
strcpy(fcx->fname, fname ); strcpy(fcx->fname, fname );
a->real_fname = m_strdup( fname ); a->real_fname = xstrdup( fname );
a->filter = file_filter; a->filter = file_filter;
a->filter_ov = fcx; a->filter_ov = fcx;
file_filter( fcx, IOBUFCTRL_DESC, NULL, (byte*)&a->desc, &len ); file_filter( fcx, IOBUFCTRL_DESC, NULL, (byte*)&a->desc, &len );
@ -1330,12 +1330,12 @@ iobuf_push_filter2( IOBUF a,
* The contents of the buffers are transferred to the * The contents of the buffers are transferred to the
* new stream. * new stream.
*/ */
b = m_alloc(sizeof *b); b = xmalloc(sizeof *b);
memcpy(b, a, sizeof *b ); memcpy(b, a, sizeof *b );
/* fixme: it is stupid to keep a copy of the name at every level /* fixme: it is stupid to keep a copy of the name at every level
* but we need the name somewhere because the name known by file_filter * but we need the name somewhere because the name known by file_filter
* may have been released when we need the name of the file */ * may have been released when we need the name of the file */
b->real_fname = a->real_fname? m_strdup(a->real_fname):NULL; b->real_fname = a->real_fname? xstrdup(a->real_fname):NULL;
/* remove the filter stuff from the new stream */ /* remove the filter stuff from the new stream */
a->filter = NULL; a->filter = NULL;
a->filter_ov = NULL; a->filter_ov = NULL;
@ -1345,12 +1345,12 @@ iobuf_push_filter2( IOBUF a,
a->use = 2; /* make a write stream from a temp stream */ a->use = 2; /* make a write stream from a temp stream */
if( a->use == 2 ) { /* allocate a fresh buffer for the original stream */ if( a->use == 2 ) { /* allocate a fresh buffer for the original stream */
b->d.buf = m_alloc( a->d.size ); b->d.buf = xmalloc( a->d.size );
b->d.len = 0; b->d.len = 0;
b->d.start = 0; b->d.start = 0;
} }
else { /* allocate a fresh buffer for the new stream */ else { /* allocate a fresh buffer for the new stream */
a->d.buf = m_alloc( a->d.size ); a->d.buf = xmalloc( a->d.size );
a->d.len = 0; a->d.len = 0;
a->d.start = 0; a->d.start = 0;
} }
@ -1401,10 +1401,10 @@ pop_filter( IOBUF a, int (*f)(void *opaque, int control,
if( !a->filter ) { /* this is simple */ if( !a->filter ) { /* this is simple */
b = a->chain; b = a->chain;
assert(b); assert(b);
m_free(a->d.buf); xfree(a->d.buf);
m_free(a->real_fname); xfree(a->real_fname);
memcpy(a,b, sizeof *a); memcpy(a,b, sizeof *a);
m_free(b); xfree(b);
return 0; return 0;
} }
for(b=a ; b; b = b->chain ) for(b=a ; b; b = b->chain )
@ -1425,7 +1425,7 @@ pop_filter( IOBUF a, int (*f)(void *opaque, int control,
return rc; return rc;
} }
if( b->filter_ov && b->filter_ov_owner ) { if( b->filter_ov && b->filter_ov_owner ) {
m_free( b->filter_ov ); xfree( b->filter_ov );
b->filter_ov = NULL; b->filter_ov = NULL;
} }
@ -1438,10 +1438,10 @@ pop_filter( IOBUF a, int (*f)(void *opaque, int control,
* a flush has been done on the to be removed entry * a flush has been done on the to be removed entry
*/ */
b = a->chain; b = a->chain;
m_free(a->d.buf); xfree(a->d.buf);
m_free(a->real_fname); xfree(a->real_fname);
memcpy(a,b, sizeof *a); memcpy(a,b, sizeof *a);
m_free(b); xfree(b);
if( DBG_IOBUF ) if( DBG_IOBUF )
log_debug("iobuf-%d.%d: popped filter\n", a->no, a->subno ); log_debug("iobuf-%d.%d: popped filter\n", a->no, a->subno );
} }
@ -1476,10 +1476,10 @@ underflow(IOBUF a)
if( DBG_IOBUF ) if( DBG_IOBUF )
log_debug("iobuf-%d.%d: pop `%s' in underflow\n", log_debug("iobuf-%d.%d: pop `%s' in underflow\n",
a->no, a->subno, a->desc ); a->no, a->subno, a->desc );
m_free(a->d.buf); xfree(a->d.buf);
m_free(a->real_fname); xfree(a->real_fname);
memcpy(a, b, sizeof *a); memcpy(a, b, sizeof *a);
m_free(b); xfree(b);
print_chain(a); print_chain(a);
} }
else else
@ -1530,7 +1530,7 @@ underflow(IOBUF a)
NULL, &dummy_len)) ) NULL, &dummy_len)) )
log_error("IOBUFCTRL_FREE failed: %s\n", g10_errstr(rc) ); log_error("IOBUFCTRL_FREE failed: %s\n", g10_errstr(rc) );
if( a->filter_ov && a->filter_ov_owner ) { if( a->filter_ov && a->filter_ov_owner ) {
m_free( a->filter_ov ); xfree( a->filter_ov );
a->filter_ov = NULL; a->filter_ov = NULL;
} }
a->filter = NULL; a->filter = NULL;
@ -1542,10 +1542,10 @@ underflow(IOBUF a)
if( DBG_IOBUF ) if( DBG_IOBUF )
log_debug("iobuf-%d.%d: pop `%s' in underflow (!len)\n", log_debug("iobuf-%d.%d: pop `%s' in underflow (!len)\n",
a->no, a->subno, a->desc ); a->no, a->subno, a->desc );
m_free(a->d.buf); xfree(a->d.buf);
m_free(a->real_fname); xfree(a->real_fname);
memcpy(a,b, sizeof *a); memcpy(a,b, sizeof *a);
m_free(b); xfree(b);
print_chain(a); print_chain(a);
} }
} }
@ -1586,9 +1586,9 @@ iobuf_flush(IOBUF a)
if( DBG_IOBUF ) if( DBG_IOBUF )
log_debug("increasing temp iobuf from %lu to %lu\n", log_debug("increasing temp iobuf from %lu to %lu\n",
(ulong)a->d.size, (ulong)newsize ); (ulong)a->d.size, (ulong)newsize );
newbuf = m_alloc( newsize ); newbuf = xmalloc( newsize );
memcpy( newbuf, a->d.buf, a->d.len ); memcpy( newbuf, a->d.buf, a->d.len );
m_free(a->d.buf); xfree(a->d.buf);
a->d.buf = newbuf; a->d.buf = newbuf;
a->d.size = newsize; a->d.size = newsize;
return 0; return 0;
@ -1624,7 +1624,7 @@ iobuf_readbyte(IOBUF a)
if( a->unget.buf ) { if( a->unget.buf ) {
if( a->unget.start < a->unget.len ) if( a->unget.start < a->unget.len )
return a->unget.buf[a->unget.start++]; return a->unget.buf[a->unget.start++];
m_free(a->unget.buf); xfree(a->unget.buf);
a->unget.buf = NULL; a->unget.buf = NULL;
a->nofast &= ~2; a->nofast &= ~2;
} }
@ -2042,7 +2042,7 @@ iobuf_get_fname( IOBUF a )
void void
iobuf_set_partial_block_mode( IOBUF a, size_t len ) iobuf_set_partial_block_mode( IOBUF a, size_t len )
{ {
block_filter_ctx_t *ctx = m_alloc_clear( sizeof *ctx ); block_filter_ctx_t *ctx = xmalloc_clear( sizeof *ctx );
assert( a->use == 1 || a->use == 2 ); assert( a->use == 1 || a->use == 2 );
ctx->use = a->use; ctx->use = a->use;
@ -2084,7 +2084,7 @@ iobuf_read_line( IOBUF a, byte **addr_of_buffer,
if( !buffer ) { /* must allocate a new buffer */ if( !buffer ) { /* must allocate a new buffer */
length = 256; length = 256;
buffer = m_alloc( length ); buffer = xmalloc( length );
*addr_of_buffer = buffer; *addr_of_buffer = buffer;
*length_of_buffer = length; *length_of_buffer = length;
} }
@ -2104,7 +2104,7 @@ iobuf_read_line( IOBUF a, byte **addr_of_buffer,
} }
length += 3; /* correct for the reserved byte */ length += 3; /* correct for the reserved byte */
length += length < 1024? 256 : 1024; length += length < 1024? 256 : 1024;
buffer = m_realloc( buffer, length ); buffer = xrealloc( buffer, length );
*addr_of_buffer = buffer; *addr_of_buffer = buffer;
*length_of_buffer = length; *length_of_buffer = length;
length -= 3; /* and reserve again */ length -= 3; /* and reserve again */

Some files were not shown because too many files have changed in this diff Show More