diff options
| author | Werner Koch <[email protected]> | 2006-04-28 14:31:29 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2006-04-28 14:31:29 +0000 |
| commit | 00ffc478de4940b9fbbb9f488f545a65ca7d1278 (patch) | |
| tree | 9ec271f1c03397acbd3c6274931ca7a927ae907f /g10/encode.c | |
| parent | Still merging 1.4.3 code back (diff) | |
| download | gnupg-00ffc478de4940b9fbbb9f488f545a65ca7d1278.tar.gz gnupg-00ffc478de4940b9fbbb9f488f545a65ca7d1278.zip | |
Merged recent changes from 1.4
Diffstat (limited to 'g10/encode.c')
| -rw-r--r-- | g10/encode.c | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/g10/encode.c b/g10/encode.c index bb3e7bbc2..292e2bc5a 100644 --- a/g10/encode.c +++ b/g10/encode.c @@ -1,6 +1,6 @@ /* encode.c - encode data - * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, - * 2005 Free Software Foundation, Inc. + * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, + * 2006 Free Software Foundation, Inc. * * This file is part of GnuPG. * @@ -278,22 +278,8 @@ encode_simple( const char *filename, int mode, int use_seskey ) xfree(enc); } - 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); /* Note that PGP 5 has problems decrypting symmetrically encrypted data if the file length is in the inner packet. It works when |