From db1ecc8212defdd183abbb6b1407fcc8d2dc9552 Mon Sep 17 00:00:00 2001
From: NIIBE Yutaka <gniibe@fsij.org>
Date: Wed, 1 Jun 2016 20:59:09 +0900
Subject: [PATCH] g10: Allow User ID length >= 256.

* build-packet.c (do_user_id): Call write_header2 with HDRLEN not set.

--

Reported-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
GnuPG-bug-id: 2374
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
---
 g10/build-packet.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/g10/build-packet.c b/g10/build-packet.c
index 4bfc2ac10..1353a863c 100644
--- a/g10/build-packet.c
+++ b/g10/build-packet.c
@@ -329,7 +329,7 @@ do_user_id( IOBUF out, int ctb, PKT_user_id *uid )
     }
   else
     {
-      write_header2( out, ctb, uid->len, 2 );
+      write_header2( out, ctb, uid->len, 0 );
       rc = iobuf_write( out, uid->name, uid->len );
     }
   return rc;