mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
* pkclist.c (algo_available): PGP 8 can use the SHA-256 hash.
* sign.c (sign_file, clearsign_file, sign_symencrypt_file): Remove unused code.
This commit is contained in:
parent
d2548b3f60
commit
5eba95854c
3 changed files with 29 additions and 21 deletions
13
g10/sign.c
13
g10/sign.c
|
@ -639,7 +639,7 @@ sign_file( STRLIST filenames, int detached, STRLIST locusr,
|
|||
SK_LIST sk_list = NULL;
|
||||
SK_LIST sk_rover = NULL;
|
||||
int multifile = 0;
|
||||
u32 timestamp=0,duration=0;
|
||||
u32 duration=0;
|
||||
|
||||
memset( &afx, 0, sizeof afx);
|
||||
memset( &zfx, 0, sizeof zfx);
|
||||
|
@ -852,7 +852,7 @@ sign_file( STRLIST filenames, int detached, STRLIST locusr,
|
|||
/* write the signatures */
|
||||
rc = write_signature_packets (sk_list, out, mfx.md,
|
||||
opt.textmode && !outfile? 0x01 : 0x00,
|
||||
timestamp, duration, detached ? 'D':'S');
|
||||
0, duration, detached ? 'D':'S');
|
||||
if( rc )
|
||||
goto leave;
|
||||
|
||||
|
@ -890,7 +890,7 @@ clearsign_file( const char *fname, STRLIST locusr, const char *outfile )
|
|||
SK_LIST sk_rover = NULL;
|
||||
int old_style = opt.rfc1991;
|
||||
int only_md5 = 0;
|
||||
u32 timestamp=0,duration=0;
|
||||
u32 duration=0;
|
||||
|
||||
memset( &afx, 0, sizeof afx);
|
||||
init_packet( &pkt );
|
||||
|
@ -991,8 +991,7 @@ clearsign_file( const char *fname, STRLIST locusr, const char *outfile )
|
|||
iobuf_push_filter( out, armor_filter, &afx );
|
||||
|
||||
/* write the signatures */
|
||||
rc = write_signature_packets (sk_list, out, textmd, 0x01,
|
||||
timestamp, duration, 'C');
|
||||
rc=write_signature_packets (sk_list, out, textmd, 0x01, 0, duration, 'C');
|
||||
if( rc )
|
||||
goto leave;
|
||||
|
||||
|
@ -1026,7 +1025,7 @@ sign_symencrypt_file (const char *fname, STRLIST locusr)
|
|||
SK_LIST sk_list = NULL;
|
||||
SK_LIST sk_rover = NULL;
|
||||
int algo;
|
||||
u32 timestamp=0,duration=0;
|
||||
u32 duration=0;
|
||||
|
||||
memset( &afx, 0, sizeof afx);
|
||||
memset( &zfx, 0, sizeof zfx);
|
||||
|
@ -1132,7 +1131,7 @@ sign_symencrypt_file (const char *fname, STRLIST locusr)
|
|||
/*(current filters: zip - encrypt - armor)*/
|
||||
rc = write_signature_packets (sk_list, out, mfx.md,
|
||||
opt.textmode? 0x01 : 0x00,
|
||||
timestamp, duration, 'S');
|
||||
0, duration, 'S');
|
||||
if( rc )
|
||||
goto leave;
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue