security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-03 22:56:33 +02:00
Code Activity

See ChangeLog: Tue Dec 29 14:41:47 CET 1998 Werner Koch

Browse source
This commit is contained in:
Werner Koch 1998-12-29 13:47:31 +00:00
parent 1df0e1540d
commit 6e08b235cb
54 changed files with 2441 additions and 534 deletions
Download patch file Download diff file Expand all files Collapse all files

11
g10/ChangeLog
View file

@ -1,3 +1,14 @@
Tue Dec 29 14:41:47 CET 1998 Werner Koch <wk@isil.d.shuttle.de>
* misc.c (disable_core_dumps): Check for EINVAL (Atari)
* getkey (merge_one_pk_and_selfsig): Fixed search of expiredate.
(merge_keys_and_selfsig): Ditto.
* free-packet.c (cmp_public_keys): cmp expire only for v3 packets
(cmp_secret_keys): Ditto.
(cmp_public_secret_key): Ditto.
Wed Dec 23 17:12:24 CET 1998 Werner Koch <wk@isil.d.shuttle.de>
* armor.c (find_header): Reset not_dashed at every header

6
g10/armor.c
View file

@ -279,7 +279,6 @@ find_header( fhdr_state_t state, byte *buf, size_t *r_buflen,
buflen = *r_buflen;
assert(buflen >= 100 );
buflen -= 4; /* reserved room for CR,LF, and two extra */
do {
switch( state ) {
case fhdrHASArmor:
@ -630,8 +629,9 @@ find_header( fhdr_state_t state, byte *buf, size_t *r_buflen,
}
} while( cont );
if( clearsig && state == fhdrTEXT )
if( clearsig && state == fhdrTEXT ) {
state = fhdrCLEARSIG;
}
else if( clearsig && state == fhdrTEXTSimple ) {
state = fhdrCLEARSIGSimple;
buf[n] = '\n';
@ -1080,7 +1080,7 @@ armor_filter( void *opaque, int control,
}
else
iobuf_writestr(a,
"Comment: For info see www.gnupg.org");
"Comment: For info see http://www.gnupg.org\n");
if( afx->hdrlines )
iobuf_writestr(a, afx->hdrlines);
iobuf_put(a, '\n');

2
g10/decrypt.c
View file

@ -56,7 +56,7 @@ decrypt_message( const char *filename )
/* open the message file */
fp = iobuf_open(filename);
if( !fp ) {
log_error(_("can't open '%s'\n"), print_fname_stdin(filename));
log_error(_("can't open `%s'\n"), print_fname_stdin(filename));
return G10ERR_OPEN_FILE;
}

2
g10/encode.c
View file

@ -219,7 +219,7 @@ encode_crypt( const char *filename, STRLIST remusr )
goto leave;
}
else if( opt.verbose )
log_info(_("reading from '%s'\n"), filename? filename: "[stdin]");
log_info(_("reading from `%s'\n"), filename? filename: "[stdin]");
if( (rc = open_outfile( filename, opt.armor? 1:0, &out )) )
goto leave;

2
g10/encr-data.c
View file

@ -71,7 +71,7 @@ decrypt_data( PKT_encrypted *ed, DEK *dek )
dfx.cipher_hd = cipher_open( dek->algo, CIPHER_MODE_AUTO_CFB, 1 );
rc = cipher_setkey( dfx.cipher_hd, dek->key, dek->keylen );
if( rc == G10ERR_WEAK_KEY )
log_info(_("WARNING: Message was encrypted with "
log_info(_("WARNING: message was encrypted with "
"a weak key in the symmetric cipher.\n"));
else if( rc )
log_error("key setup failed: %s\n", g10_errstr(rc) );

6
g10/free-packet.c
View file

@ -354,7 +354,7 @@ cmp_public_keys( PKT_public_key *a, PKT_public_key *b )
if( a->timestamp != b->timestamp )
return -1;
if( a->expiredate != b->expiredate )
if( a->version < 4 && a->expiredate != b->expiredate )
return -1;
if( a->pubkey_algo != b->pubkey_algo )
return -1;
@ -381,7 +381,7 @@ cmp_secret_keys( PKT_secret_key *a, PKT_secret_key *b )
if( a->timestamp != b->timestamp )
return -1;
if( a->expiredate != b->expiredate )
if( a->version < 4 && a->expiredate != b->expiredate )
return -1;
if( a->pubkey_algo != b->pubkey_algo )
return -1;
@ -407,7 +407,7 @@ cmp_public_secret_key( PKT_public_key *pk, PKT_secret_key *sk )
if( pk->timestamp != sk->timestamp )
return -1;
if( pk->expiredate != sk->expiredate )
if( pk->version < 4 && pk->expiredate != sk->expiredate )
return -1;
if( pk->pubkey_algo != sk->pubkey_algo )
return -1;

14
g10/g10.c
View file

@ -615,18 +615,18 @@ main( int argc, char **argv )
if( !configfp ) {
if( default_config ) {
if( parse_debug )
log_info(_("NOTE: no default option file '%s'\n"),
log_info(_("NOTE: no default option file `%s'\n"),
configname );
}
else {
log_error(_("option file '%s': %s\n"),
log_error(_("option file `%s': %s\n"),
configname, strerror(errno) );
g10_exit(2);
}
m_free(configname); configname = NULL;
}
if( parse_debug && configname )
log_info(_("reading options from '%s'\n"), configname );
log_info(_("reading options from `%s'\n"), configname );
default_config = 0;
}
@ -855,7 +855,7 @@ main( int argc, char **argv )
for( ; *p && (isdigit(*p) || *p=='.'); p++ )
;
if( *p )
log_info("NOTE: This is a development version!\n");
log_info("NOTE: this is a development version!\n");
}
if( log_get_errorcount(0) )
@ -1088,7 +1088,7 @@ main( int argc, char **argv )
for( ; argc; argc--, argv++ ) {
rc = import_keys( *argv, (cmd == aFastImport) );
if( rc )
log_error("import from '%s' failed: %s\n",
log_error("import from `%s' failed: %s\n",
*argv, g10_errstr(rc) );
}
break;
@ -1198,7 +1198,7 @@ main( int argc, char **argv )
int algo = string_to_digest_algo(*argv);
if( !algo )
log_error(_("invalid hash algorithm '%s'\n"), *argv );
log_error(_("invalid hash algorithm `%s'\n"), *argv );
else {
argc--; argv++;
if( !argc )
@ -1284,7 +1284,7 @@ main( int argc, char **argv )
log_info(_("Go ahead and type your message ...\n"));
if( !(a = iobuf_open(fname)) )
log_error(_("can't open '%s'\n"), print_fname_stdin(fname));
log_error(_("can't open `%s'\n"), print_fname_stdin(fname));
else {
if( !opt.no_armor ) {

18
g10/getkey.c
View file

@ -723,7 +723,8 @@ compare_name( const char *uid, size_t uidlen, const char *name, int mode )
*/
static void
merge_one_pk_and_selfsig( KBNODE keyblock, KBNODE knode )
merge_one_pk_and_selfsig( KBNODE keyblock, KBNODE knode,
PKT_public_key *orig_pk )
{
PKT_public_key *pk = knode->pkt->pkt.public_key;
PKT_signature *sig;
@ -737,6 +738,7 @@ merge_one_pk_and_selfsig( KBNODE keyblock, KBNODE knode )
if( pk->version < 4 )
return; /* this is only needed for version >=4 packets */
/* find the selfsignature */
if( knode->pkt->pkttype == PKT_PUBLIC_SUBKEY ) {
k = find_kbnode( keyblock, PKT_PUBLIC_KEY );
@ -747,7 +749,7 @@ merge_one_pk_and_selfsig( KBNODE keyblock, KBNODE knode )
else
keyid_from_pk( pk, kid );
for(k=keyblock; k; k = k->next ) {
for(k=knode->next; k; k = k->next ) {
if( k->pkt->pkttype == PKT_SIGNATURE
&& (sig=k->pkt->pkt.signature)->sig_class >= 0x10
&& sig->sig_class <= 0x30
@ -765,12 +767,16 @@ merge_one_pk_and_selfsig( KBNODE keyblock, KBNODE knode )
p = parse_sig_subpkt( sig->hashed_data, SIGSUBPKT_KEY_EXPIRE, NULL );
ed = p? pk->timestamp + buffer_to_u32(p):0;
/* use the latest self signature */
if( sig->timestamp > sigdate ) {
pk->expiredate = ed;
orig_pk->expiredate = ed;
sigdate = sig->timestamp;
}
/* fixme: add usage etc. to pk */
}
else if( k->pkt->pkttype == PKT_PUBLIC_SUBKEY )
break; /* stop here */
}
}
@ -796,6 +802,7 @@ merge_keys_and_selfsig( KBNODE keyblock )
pk = NULL; /* not needed for old keys */
else if( k->pkt->pkttype == PKT_PUBLIC_KEY )
keyid_from_pk( pk, kid );
sigdate = 0;
}
else if( k->pkt->pkttype == PKT_SECRET_KEY
|| k->pkt->pkttype == PKT_SECRET_SUBKEY ) {
@ -804,6 +811,7 @@ merge_keys_and_selfsig( KBNODE keyblock )
sk = NULL;
else if( k->pkt->pkttype == PKT_SECRET_KEY )
keyid_from_sk( sk, kid );
sigdate = 0;
}
else if( (pk || sk ) && k->pkt->pkttype == PKT_SIGNATURE
&& (sig=k->pkt->pkt.signature)->sig_class >= 0x10
@ -982,7 +990,7 @@ finish_lookup( KBNODE keyblock, PKT_public_key *pk, KBNODE k, byte *namehash,
if( primary && !pk->pubkey_usage ) {
copy_public_key_new_namehash( pk, keyblock->pkt->pkt.public_key,
use_namehash? namehash:NULL);
merge_one_pk_and_selfsig( keyblock, keyblock );
merge_one_pk_and_selfsig( keyblock, keyblock, pk );
}
else {
if( primary && pk->pubkey_usage
@ -1027,7 +1035,7 @@ finish_lookup( KBNODE keyblock, PKT_public_key *pk, KBNODE k, byte *namehash,
copy_public_key_new_namehash( pk, k->pkt->pkt.public_key,
use_namehash? namehash:NULL);
merge_one_pk_and_selfsig( keyblock, k );
merge_one_pk_and_selfsig( keyblock, k, pk );
}
}
@ -1395,7 +1403,7 @@ enum_secret_keys( void **context, PKT_secret_key *sk, int with_subkeys )
for( ; c->name; c->name = enum_keyblock_resources( &c->sequence, 1 ) ) {
if( !c->iobuf ) {
if( !(c->iobuf = iobuf_open( c->name ) ) ) {
log_error("enum_secret_keys: can't open '%s'\n", c->name );
log_error("enum_secret_keys: can't open `%s'\n", c->name );
continue; /* try next file */
}
}

6
g10/gpgd.c
View file

@ -195,18 +195,18 @@ main( int argc, char **argv )
if( !configfp ) {
if( default_config ) {
if( parse_debug )
log_info("note: no default option file '%s'\n",
log_info("note: no default option file `%s'\n",
configname );
}
else {
log_error("option file '%s': %s\n",
log_error("option file `%s': %s\n",
configname, strerror(errno) );
g10_exit(1);
}
m_free(configname); configname = NULL;
}
if( parse_debug && configname )
log_info("reading options from '%s'\n", configname );
log_info("reading options from `%s'\n", configname );
default_config = 0;
}

2
g10/helptext.c
View file

@ -213,7 +213,7 @@ display_online_help( const char *keyword )
for(i=0; (p=helptexts[i].key) && strcmp( p, keyword ); i++ )
;
if( !p || !*helptexts[i].help )
tty_printf(_("No help available for '%s'"), keyword );
tty_printf(_("No help available for `%s'"), keyword );
else
tty_printf("%s", helptexts[i].help );
}

2
g10/import.c
View file

@ -359,7 +359,7 @@ import_one( const char *fname, KBNODE keyblock, int fast )
return G10ERR_GENERAL;
}
if( opt.verbose > 1 )
log_info_f( fname, _("writing to '%s'\n"),
log_info_f( fname, _("writing to `%s'\n"),
keyblock_resource_name(&kbpos) );
if( (rc=lock_keyblock( &kbpos )) )
log_error_f( keyblock_resource_name(&kbpos),

4
g10/keyedit.c
View file

@ -666,7 +666,7 @@ keyedit_menu( const char *username, STRLIST locusr, STRLIST commands )
tty_printf(_("Key not changed so no update needed.\n"));
rc = update_trust_record( keyblock, 0, NULL );
if( rc )
log_error(_("update of trust db failed: %s\n"),
log_error(_("update of trustdb failed: %s\n"),
g10_errstr(rc) );
goto leave;
@ -724,7 +724,7 @@ keyedit_menu( const char *username, STRLIST locusr, STRLIST commands )
* get listed correctly */
rc = update_trust_record( keyblock, 0, NULL );
if( rc ) {
log_error(_("update of trust db failed: %s\n"),
log_error(_("update of trustdb failed: %s\n"),
g10_errstr(rc) );
rc = 0;
}

12
g10/keygen.c
View file

@ -848,8 +848,8 @@ generate_keypair()
pub_fname = make_filename(opt.homedir, "pubring.gpg", NULL );
sec_fname = make_filename(opt.homedir, "secring.gpg", NULL );
if( opt.verbose ) {
tty_printf(_("writing public certificate to '%s'\n"), pub_fname );
tty_printf(_("writing secret certificate to '%s'\n"), sec_fname );
tty_printf(_("writing public certificate to `%s'\n"), pub_fname );
tty_printf(_("writing secret certificate to `%s'\n"), sec_fname );
}
/* we create the packets as a tree of kbnodes. Because the structure
@ -894,11 +894,11 @@ generate_keypair()
/* we can now write the certificates */
if( get_keyblock_handle( pub_fname, 0, &pub_kbpos ) ) {
if( add_keyblock_resource( pub_fname, 1, 0 ) ) {
log_error("can add keyblock file '%s'\n", pub_fname );
log_error("can add keyblock file `%s'\n", pub_fname );
rc = G10ERR_CREATE_FILE;
}
else if( get_keyblock_handle( pub_fname, 0, &pub_kbpos ) ) {
log_error("can get keyblock handle for '%s'\n", pub_fname );
log_error("can get keyblock handle for `%s'\n", pub_fname );
rc = G10ERR_CREATE_FILE;
}
}
@ -906,11 +906,11 @@ generate_keypair()
;
else if( get_keyblock_handle( sec_fname, 1, &sec_kbpos ) ) {
if( add_keyblock_resource( sec_fname, 1, 1 ) ) {
log_error("can add keyblock file '%s'\n", sec_fname );
log_error("can add keyblock file `%s'\n", sec_fname );
rc = G10ERR_CREATE_FILE;
}
else if( get_keyblock_handle( sec_fname, 1, &sec_kbpos ) ) {
log_error("can get keyblock handle for '%s'\n", sec_fname );
log_error("can get keyblock handle for `%s'\n", sec_fname );
rc = G10ERR_CREATE_FILE;
}
}

4
g10/mainproc.c
View file

@ -195,7 +195,7 @@ proc_pubkey_enc( CTX c, PACKET *pkt )
;
else if( !result ) {
if( opt.verbose > 1 )
log_info( _("public key encrypted data: Good DEK\n") );
log_info( _("public key encrypted data: good DEK\n") );
}
else {
log_error(_("public key decryption failed: %s\n"), g10_errstr(result));
@ -278,7 +278,7 @@ proc_plaintext( CTX c, PACKET *pkt )
md_enable( c->mfx.md, DIGEST_ALGO_SHA1 );
md_enable( c->mfx.md, DIGEST_ALGO_MD5 );
}
/*md_start_debug( c->mfx.md, "verify" );*/
md_start_debug( c->mfx.md, "verify" );
rc = handle_plaintext( pt, &c->mfx, c->sigs_only, clearsig );
if( rc == G10ERR_CREATE_FILE && !c->sigs_only) {
/* can't write output but we hash it anyway to

10
g10/misc.c
View file

@ -84,11 +84,13 @@ disable_core_dumps()
limit.rlim_cur = 0;
limit.rlim_max = 0;
if( setrlimit( RLIMIT_CORE, &limit ) )
if( !setrlimit( RLIMIT_CORE, &limit ) )
return;
if( errno != EINVAL )
log_fatal(_("can't disable core dumps: %s\n"), strerror(errno) );
#else
log_info(_("WARNING: Program may create a core file!\n"));
#endif
if( !opt.quiet )
log_info(_("WARNING: program may create a core file!\n"));
}
@ -230,7 +232,7 @@ print_cipher_algo_note( int algo )
if( !did_note ) {
did_note = 1;
log_info(_("This cipher algorithm is depreciated; "
log_info(_("this cipher algorithm is depreciated; "
"please use a more standard one!\n"));
}
}

6
g10/openfile.c
View file

@ -55,7 +55,7 @@ overwrite_filep( const char *fname )
if( opt.answer_no || opt.batch )
return 0; /* do not overwrite */
tty_printf(_("File '%s' exists. "), fname);
tty_printf(_("File `%s' exists. "), fname);
if( cpr_get_answer_is_yes("openfile.overwrite.okay",
_("Overwrite (y/N)? ")) )
return 1;
@ -102,7 +102,7 @@ open_outfile( const char *iname, int mode, IOBUF *a )
rc = G10ERR_CREATE_FILE;
}
else if( opt.verbose )
log_info(_("writing to '%s'\n"), name );
log_info(_("writing to `%s'\n"), name );
}
else
rc = G10ERR_FILE_EXISTS;
@ -131,7 +131,7 @@ open_sigfile( const char *iname )
buf[len-4] = 0 ;
a = iobuf_open( buf );
if( opt.verbose )
log_info(_("assuming signed data in '%s'\n"), buf );
log_info(_("assuming signed data in `%s'\n"), buf );
m_free(buf);
}
}

2
g10/pkclist.c
View file

@ -541,7 +541,7 @@ build_pk_list( STRLIST remusr, PK_LIST *ret_pk_list, unsigned usage )
rc = check_trust( pk, &trustlevel );
if( rc ) {
log_error("error checking pk of '%s': %s\n",
log_error("error checking pk of `%s': %s\n",
answer, g10_errstr(rc) );
}
else if( do_we_trust_pre( pk, trustlevel ) ) {

12
g10/plaintext.c
View file

@ -123,7 +123,7 @@ handle_plaintext( PKT_plaintext *pt, md_filter_context_t *mfx,
if( fp || nooutput )
;
else if( !(fp = fopen(fname,"wb")) ) {
log_error("Error creating '%s': %s\n", fname, strerror(errno) );
log_error("Error creating `%s': %s\n", fname, strerror(errno) );
rc = G10ERR_CREATE_FILE;
goto leave;
}
@ -146,7 +146,7 @@ handle_plaintext( PKT_plaintext *pt, md_filter_context_t *mfx,
continue; /* fixme: this hack might be too simple */
if( fp ) {
if( putc( c, fp ) == EOF ) {
log_error("Error writing to '%s': %s\n",
log_error("Error writing to `%s': %s\n",
fname, strerror(errno) );
rc = G10ERR_WRITE_FILE;
goto leave;
@ -166,7 +166,7 @@ handle_plaintext( PKT_plaintext *pt, md_filter_context_t *mfx,
continue; /* fixme: this hack might be too simple */
if( fp ) {
if( putc( c, fp ) == EOF ) {
log_error("Error writing to '%s': %s\n",
log_error("Error writing to `%s': %s\n",
fname, strerror(errno) );
rc = G10ERR_WRITE_FILE;
goto leave;
@ -179,7 +179,7 @@ handle_plaintext( PKT_plaintext *pt, md_filter_context_t *mfx,
special_md_putc(mfx->md, -1, &special_state ); /* flush */
if( fp && fp != stdout && fclose(fp) ) {
log_error("Error closing '%s': %s\n", fname, strerror(errno) );
log_error("Error closing `%s': %s\n", fname, strerror(errno) );
fp = NULL;
rc = G10ERR_WRITE_FILE;
goto leave;
@ -225,7 +225,7 @@ ask_for_detached_datafile( md_filter_context_t *mfx, const char *inname )
any++;
}
else if( !fp ) {
log_error("can't open '%s': %s\n", answer, strerror(errno) );
log_error("can't open `%s': %s\n", answer, strerror(errno) );
rc = G10ERR_READ_FILE;
goto leave;
}
@ -297,7 +297,7 @@ hash_datafiles( MD_HANDLE md, STRLIST files,
for( ; sl; sl = sl->next ) {
fp = iobuf_open( sl->d );
if( !fp ) {
log_error(_("can't open signed data '%s'\n"),
log_error(_("can't open signed data `%s'\n"),
print_fname_stdin(sl->d));
if( !files )
free_strlist(sl);

2
g10/pubkey-enc.c
View file

@ -81,7 +81,7 @@ get_session_key( PKT_pubkey_enc *k, DEK *dek )
if( !rc )
rc = get_it( k, dek, sk, keyid );
if( !rc ) {
log_info(_("okay, we are the anonymous receiver.\n") );
log_info(_("okay, we are the anonymous recipient.\n") );
break;
}
}

2
g10/revoke.c
View file

@ -70,7 +70,7 @@ gen_revoke( const char *uname )
/* search the userid */
rc = find_secret_keyblock_byname( &kbpos, uname );
if( rc ) {
log_error(_("secret key for user '%s' not found\n"), uname );
log_error(_("secret key for user `%s' not found\n"), uname );
goto leave;
}

8
g10/ringedit.c
View file

@ -334,7 +334,7 @@ add_keyblock_resource( const char *url, int force, int secret )
resource_table[i].rt = rt;
leave:
if( rc )
log_error("keyblock resource '%s': %s\n", filename, g10_errstr(rc) );
log_error("keyblock resource `%s': %s\n", filename, g10_errstr(rc) );
else if( secret )
any_secret = 1;
else
@ -692,7 +692,7 @@ enum_keyblocks( int mode, KBPOS *kbpos, KBNODE *ret_root )
case rt_RING:
kbpos->fp = iobuf_open( rentry->fname );
if( !kbpos->fp ) {
log_error("can't open '%s'\n", rentry->fname );
log_error("can't open `%s'\n", rentry->fname );
return G10ERR_OPEN_FILE;
}
break;
@ -1089,7 +1089,7 @@ keyring_read( KBPOS *kbpos, KBNODE *ret_root )
a = iobuf_open( rentry->fname );
if( !a ) {
log_error("can't open '%s'\n", rentry->fname );
log_error("can't open `%s'\n", rentry->fname );
return G10ERR_OPEN_FILE;
}
@ -1262,7 +1262,7 @@ keyring_copy( KBPOS *kbpos, int mode, KBNODE root )
if( !keyring_lock );
keyring_lock = make_dotlock( rentry->fname, -1 );
if( !keyring_lock )
log_fatal("can't lock '%s'\n", rentry->fname );
log_fatal("can't lock `%s'\n", rentry->fname );
/* open the source file */
fp = iobuf_open( rentry->fname );

10
g10/sign.c
View file

@ -202,7 +202,7 @@ sign_file( STRLIST filenames, int detached, STRLIST locusr,
goto leave;
}
else if( opt.verbose )
log_info(_("writing to '%s'\n"), outfile );
log_info(_("writing to `%s'\n"), outfile );
}
else if( (rc = open_outfile( fname, opt.armor? 1: detached? 2:0, &out )))
goto leave;
@ -304,7 +304,7 @@ sign_file( STRLIST filenames, int detached, STRLIST locusr,
goto leave;
}
if( opt.verbose )
fprintf(stderr, " '%s'", sl->d );
fprintf(stderr, " `%s'", sl->d );
iobuf_push_filter( inp, md_filter, &mfx );
while( iobuf_get(inp) != -1 )
;
@ -333,7 +333,7 @@ sign_file( STRLIST filenames, int detached, STRLIST locusr,
}
if( fname ) {
if( !(filesize = iobuf_get_filelength(inp)) )
log_info(_("WARNING: '%s' is an empty file\n"), fname );
log_info(_("WARNING: `%s' is an empty file\n"), fname );
/* because the text_filter modifies the length of the
* data, it is not possible to know the used length
@ -589,7 +589,7 @@ clearsign_file( const char *fname, STRLIST locusr, const char *outfile )
goto leave;
}
else if( opt.verbose )
log_info(_("writing to '%s'\n"), outfile );
log_info(_("writing to `%s'\n"), outfile );
}
else if( (rc = open_outfile( fname, 1, &out )) )
goto leave;
@ -637,7 +637,7 @@ clearsign_file( const char *fname, STRLIST locusr, const char *outfile )
PKT_secret_key *sk = sk_rover->sk;
md_enable(textmd, hash_for(sk->pubkey_algo));
}
/*md_start_debug( textmd, "create" );*/
md_start_debug( textmd, "create" );
if( !opt.not_dash_escaped )
iobuf_push_filter( inp, text_filter, &tfx );
rc = write_dash_escaped( inp, out, textmd );

6
g10/skclist.c
View file

@ -91,13 +91,13 @@ build_sk_list( STRLIST locusr, SK_LIST *ret_sk_list, int unlock,
sk->pubkey_usage = usage;
if( (rc = get_seckey_byname( sk, locusr->d, unlock )) ) {
free_secret_key( sk ); sk = NULL;
log_error(_("skipped '%s': %s\n"), locusr->d, g10_errstr(rc) );
log_error(_("skipped `%s': %s\n"), locusr->d, g10_errstr(rc) );
}
else if( !(rc=check_pubkey_algo2(sk->pubkey_algo, usage)) ) {
SK_LIST r;
if( sk->version == 4 && (usage & PUBKEY_USAGE_SIG)
&& sk->pubkey_algo == PUBKEY_ALGO_ELGAMAL_E ) {
log_info(_("skipped '%s': this is a PGP generated "
log_info(_("skipped `%s': this is a PGP generated "
"ElGamal key which is not secure for signatures!\n"),
locusr->d );
free_secret_key( sk ); sk = NULL;
@ -112,7 +112,7 @@ build_sk_list( STRLIST locusr, SK_LIST *ret_sk_list, int unlock,
}
else {
free_secret_key( sk ); sk = NULL;
log_error("skipped '%s': %s\n", locusr->d, g10_errstr(rc) );
log_error("skipped `%s': %s\n", locusr->d, g10_errstr(rc) );
}
}
}

8
g10/tdbio.c
View file

@ -229,7 +229,7 @@ put_record_into_cache( ulong recno, const char *data )
cache_entries++;
return 0;
}
log_info(_("trustdb transaction to large\n"));
log_info(_("trustdb transaction too large\n"));
return G10ERR_RESOURCE_LIMIT;
}
if( dirty_count ) {
@ -460,9 +460,9 @@ tdbio_set_dbname( const char *new_dbname, int create )
fname, g10_errstr(rc));
/* and read again to check that we are okay */
if( tdbio_read_record( 0, &rec, RECTYPE_VER ) )
log_fatal( _("%s: invalid trust-db created\n"), db_name );
log_fatal( _("%s: invalid trustdb created\n"), db_name );
log_info(_("%s: trust-db created\n"), db_name);
log_info(_("%s: trustdb created\n"), db_name);
return 0;
}
@ -503,7 +503,7 @@ open_db()
if( db_fd == -1 )
log_fatal( _("%s: can't open: %s\n"), db_name, strerror(errno) );
if( tdbio_read_record( 0, &rec, RECTYPE_VER ) )
log_fatal( _("%s: invalid trust-db\n"), db_name );
log_fatal( _("%s: invalid trustdb\n"), db_name );
atexit( cleanup );
}

8
g10/trustdb.c
View file

@ -139,7 +139,7 @@ static void
die_invalid_db()
{
log_error(_(
"The trust DB is corrupted; please run \"gpgm --fix-trust-db\".\n") );
"The trustdb is corrupted; please run \"gpgm --fix-trustdb\".\n") );
g10_exit(2);
}
@ -195,7 +195,7 @@ do_sync( )
int rc = tdbio_sync();
if( !rc )
return;
log_error(_("trust db: sync failed: %s\n"), g10_errstr(rc) );
log_error(_("trustdb: sync failed: %s\n"), g10_errstr(rc) );
g10_exit(2);
}
@ -1220,10 +1220,10 @@ import_ownertrust( const char *fname )
rc = tdbio_search_dir_byfpr( line, fprlen, 0, &rec );
if( !rc ) { /* found: update */
if( rec.r.dir.ownertrust )
log_info(_("LID %lu: changing trust from %u to %u\n"),
log_info("LID %lu: changing trust from %u to %u\n",
rec.r.dir.lid, rec.r.dir.ownertrust, otrust );
else
log_info(_("LID %lu: setting trust to %u\n"),
log_info("LID %lu: setting trust to %u\n",
rec.r.dir.lid, otrust );
rec.r.dir.ownertrust = otrust;
write_record( &rec );

2
g10/verify.c
View file

@ -63,7 +63,7 @@ verify_signatures( int nfiles, char **files )
/* open the signature file */
fp = iobuf_open(sigfile);
if( !fp ) {
log_error(_("can't open '%s'\n"), print_fname_stdin(sigfile));
log_error(_("can't open `%s'\n"), print_fname_stdin(sigfile));
return G10ERR_OPEN_FILE;
}