mirror of
git://git.gnupg.org/gnupg.git
synced 2025-03-24 22:09:57 +01:00
* encode.c (encode_crypt): Missed one call to setup_plaintext_name().
This is bug#809.
This commit is contained in:
parent
0a42be5773
commit
de50a5a1e7
@ -1,3 +1,8 @@
|
||||
2007-07-06 David Shaw <dshaw@jabberwocky.com>
|
||||
|
||||
* encode.c (encode_crypt): Missed one call to
|
||||
setup_plaintext_name(). This is bug#809.
|
||||
|
||||
2007-06-12 David Shaw <dshaw@jabberwocky.com>
|
||||
|
||||
* sign.c (mk_notation_policy_etc): expect all sigs that this is
|
||||
|
18
g10/encode.c
18
g10/encode.c
@ -557,22 +557,8 @@ encode_crypt( const char *filename, STRLIST remusr, int use_symkey )
|
||||
if(use_symkey && (rc=write_symkey_enc(symkey_s2k,symkey_dek,cfx.dek,out)))
|
||||
goto leave;
|
||||
|
||||
if (!opt.no_literal) {
|
||||
/* setup the inner packet */
|
||||
if( filename || opt.set_filename ) {
|
||||
char *s = make_basename( opt.set_filename ? opt.set_filename
|
||||
: filename,
|
||||
iobuf_get_real_fname( inp ) );
|
||||
pt = xmalloc( sizeof *pt + strlen(s) - 1 );
|
||||
pt->namelen = strlen(s);
|
||||
memcpy(pt->name, s, pt->namelen );
|
||||
xfree(s);
|
||||
}
|
||||
else { /* no filename */
|
||||
pt = xmalloc( sizeof *pt - 1 );
|
||||
pt->namelen = 0;
|
||||
}
|
||||
}
|
||||
if (!opt.no_literal)
|
||||
pt=setup_plaintext_name(filename,inp);
|
||||
|
||||
if (!iobuf_is_pipe_filename (filename) && *filename && !opt.textmode )
|
||||
{
|
||||
|
Loading…
x
Reference in New Issue
Block a user