diff options
| author | David Shaw <[email protected]> | 2004-02-15 15:49:05 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2004-02-15 15:49:05 +0000 |
| commit | 95b6aacacca9dd5445877ad6e39d2d884d32f5cb (patch) | |
| tree | 7001a9b550121e97cff0b34f7b456747fafa01f3 | |
| parent | * build-packet.c (write_header2): If a suggested header length is provided (diff) | |
| download | gnupg-95b6aacacca9dd5445877ad6e39d2d884d32f5cb.tar.gz gnupg-95b6aacacca9dd5445877ad6e39d2d884d32f5cb.zip | |
* build-packet.c (do_user_id): Do not force a header for attribute packets
as they require a new CTB, and we don't support forced headers for new
CTBs yet.
| -rw-r--r-- | g10/ChangeLog | 6 | ||||
| -rw-r--r-- | g10/build-packet.c | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index e9ec15c89..6f7cc86bb 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,9 @@ +2004-02-15 David Shaw <[email protected]> + + * build-packet.c (do_user_id): Do not force a header for attribute + packets as they require a new CTB, and we don't support forced + headers for new CTBs yet. + 2004-02-14 David Shaw <[email protected]> * build-packet.c (write_header2): If a suggested header length is diff --git a/g10/build-packet.c b/g10/build-packet.c index 5098d9e83..ad0619052 100644 --- a/g10/build-packet.c +++ b/g10/build-packet.c @@ -208,9 +208,7 @@ do_user_id( IOBUF out, int ctb, PKT_user_id *uid ) { if( uid->attrib_data ) { - /* Shouldn't be necessary to force a header here since attribs - can't be of zero length, but it doesn't hurt either. */ - write_header2(out, ctb, uid->attrib_len, 1, 1); + write_header(out, ctb, uid->attrib_len); if( iobuf_write( out, uid->attrib_data, uid->attrib_len ) ) return G10ERR_WRITE_FILE; } |