diff options
Diffstat (limited to 'g10')
| -rw-r--r-- | g10/ChangeLog | 5 | ||||
| -rw-r--r-- | g10/mainproc.c | 15 |
2 files changed, 19 insertions, 1 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index f3a51cd4c..a66b8af38 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,8 @@ +Wed Jun 2 14:17:19 CEST 1999 Werner Koch <[email protected]> + + * mainproc.c (proc_tree): Yet another bad hack to cope with + broken pgp2 created detached messages in textmode. + Tue Jun 1 16:01:46 CEST 1999 Werner Koch <[email protected]> * openfile.c (make_outfile_name): New. diff --git a/g10/mainproc.c b/g10/mainproc.c index 3de95e61c..cb2388f06 100644 --- a/g10/mainproc.c +++ b/g10/mainproc.c @@ -1080,10 +1080,23 @@ proc_tree( CTX c, KBNODE node ) /* enable a workaround for a pgp2 bug */ c->mfx.md2 = md_open( DIGEST_ALGO_MD5, 0 ); } + #if 0 + #warning md_start_debug enabled + md_start_debug( c->mfx.md, "det1" ); + if( c->mfx.md2 ) + md_start_debug( c->mfx.md2, "det2" ); + #endif + /* Here we have another hack to work around a pgp 2 bug + * It works by not using the textmode for detached signatures; + * this will let the first signazure check (on md) fail + * but the second one (on md2) which adds an extra CR should + * then produce the "correct" hash. This is very, very ugly + * hack but it may help in some cases (and break others) + */ if( c->sigs_only ) rc = hash_datafiles( c->mfx.md, c->mfx.md2, c->signed_data, c->sigfilename, - sig->sig_class == 0x01 ); + c->mfx.md2? 0 :(sig->sig_class == 0x01) ); else rc = ask_for_detached_datafile( &c->mfx, iobuf_get_fname(c->iobuf)); |