summaryrefslogtreecommitdiffstats
path: root/g10
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>1999-04-29 12:32:29 +0200
committerWerner Koch <wk@gnupg.org>1999-04-29 12:32:29 +0200
commit88374b2ab3e6ddf77a4d548f667db384c92a5456 (patch)
tree2aa3083e95a66e381a541486eadc0c2447417744 /g10
parentSee ChangeLog: Wed Apr 28 13:03:03 CEST 1999 Werner Koch (diff)
downloadgnupg2-88374b2ab3e6ddf77a4d548f667db384c92a5456.tar.xz
gnupg2-88374b2ab3e6ddf77a4d548f667db384c92a5456.zip
See ChangeLog: Thu Apr 29 12:29:22 CEST 1999 Werner Koch
Diffstat (limited to 'g10')
-rw-r--r--g10/ChangeLog6
-rw-r--r--g10/sign.c15
2 files changed, 18 insertions, 3 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog
index ea8895aa2..dc4d1e15f 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,9 @@
+Thu Apr 29 12:29:22 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>
+
+ * sign.c (sign_file): Fixed hashing in case of no subpackets.
+ (clearsign_file): Ditto.
+ (make_keysig_packet): Ditto.
+
Wed Apr 28 13:03:03 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>
* keyedit.c (keyedit_menu): Add new command revkey.
diff --git a/g10/sign.c b/g10/sign.c
index 8acf1b239..afc1dafc1 100644
--- a/g10/sign.c
+++ b/g10/sign.c
@@ -411,8 +411,11 @@ sign_file( STRLIST filenames, int detached, STRLIST locusr,
md_write( md, sig->hashed_data, n+2 );
n += 6;
}
- else
+ else {
+ md_putc( md, 0 ); /* always hash the length of the subpacket*/
+ md_putc( md, 0 );
n = 6;
+ }
/* add some magic */
buf[0] = sig->version;
buf[1] = 0xff;
@@ -594,8 +597,11 @@ clearsign_file( const char *fname, STRLIST locusr, const char *outfile )
md_write( md, sig->hashed_data, n+2 );
n += 6;
}
- else
+ else {
+ md_putc( md, 0 ); /* always hash the length of the subpacket*/
+ md_putc( md, 0 );
n = 6;
+ }
/* add some magic */
buf[0] = sig->version;
buf[1] = 0xff;
@@ -721,8 +727,11 @@ make_keysig_packet( PKT_signature **ret_sig, PKT_public_key *pk,
md_write( md, sig->hashed_data, n+2 );
n += 6;
}
- else
+ else {
+ md_putc( md, 0 ); /* always hash the length of the subpacket*/
+ md_putc( md, 0 );
n = 6;
+ }
/* add some magic */
buf[0] = sig->version;
buf[1] = 0xff;