openpgp/packet: Add user attribute packet support.

openpgp/packet: Add user attribute packet support. Supports JPEG images as well as free-form arbitrary subpacket data in user attributes (RFC 4880, Section 5.12) (updated per agl feedback)

[agl1, 2013-08-26 14:32:15]

https://codereview.appspot.com/12966045/diff/3001/openpgp/packet/opaque.go File openpgp/packet/opaque.go (right): https://codereview.appspot.com/12966045/diff/3001/openpgp/packet/opaque.go#ne... openpgp/packet/opaque.go:156: _, err = w.Write(buf) if _, err = w.Write(buf); err != nil { return } https://codereview.appspot.com/12966045/diff/3001/openpgp/packet/opaque.go#ne... openpgp/packet/opaque.go:160: buf[0] = osp.SubType why not make buf one byte longer and save a Write call? https://codereview.appspot.com/12966045/diff/3001/openpgp/packet/opaque.go#ne... openpgp/packet/opaque.go:161: _, err = w.Write(buf[:1]) merge if here too. https://codereview.appspot.com/12966045/diff/3001/openpgp/packet/userattribut... File openpgp/packet/userattribute.go (right): https://codereview.appspot.com/12966045/diff/3001/openpgp/packet/userattribut... openpgp/packet/userattribute.go:1: // Copyright 2011 The Go Authors. All rights reserved. year. https://codereview.appspot.com/12966045/diff/3001/openpgp/packet/userattribut... openpgp/packet/userattribute.go:30: buf := bytes.NewBuffer(nil) var buf bytes.Buffer https://codereview.appspot.com/12966045/diff/3001/openpgp/packet/userattribut... openpgp/packet/userattribute.go:33: 0x10, 0x0, 0x01, 0x01, 0x10, 0x00, // little-endian length (16 bytes) 0x01, // version 1 0x01, // JPEG 0, 0, 0, 0, // 12 reserved bytes 0, 0, 0, 0, 0, 0, 0, 0, https://codereview.appspot.com/12966045/diff/3001/openpgp/packet/userattribut... openpgp/packet/userattribute.go:37: _, err = buf.Write(data) merge if. https://codereview.appspot.com/12966045/diff/3001/openpgp/packet/userattribut... openpgp/packet/userattribute.go:41: err = jpeg.Encode(buf, photo, nil) merge if. https://codereview.appspot.com/12966045/diff/3001/openpgp/packet/userattribut... openpgp/packet/userattribute.go:46: Length: uint32(buf.Len()), SubType: UserAttrImageSubpacket, Length appears to be redundant given len(Contents), no? https://codereview.appspot.com/12966045/diff/3001/openpgp/packet/userattribut... openpgp/packet/userattribute.go:70: buf := bytes.NewBuffer(nil) var buf bytes.Buffer https://codereview.appspot.com/12966045/diff/3001/openpgp/packet/userattribut... openpgp/packet/userattribute.go:87: if sp.SubType == UserAttrImageSubpacket { && len(sp.Contents) > 16

[cmars, 2013-08-28 05:43:28]

PTAL https://codereview.appspot.com/12966045/diff/3001/openpgp/packet/opaque.go File openpgp/packet/opaque.go (right): https://codereview.appspot.com/12966045/diff/3001/openpgp/packet/opaque.go#ne... openpgp/packet/opaque.go:156: _, err = w.Write(buf) On 2013/08/26 14:32:15, agl1 wrote: > if _, err = w.Write(buf); err != nil { > return > } Done. https://codereview.appspot.com/12966045/diff/3001/openpgp/packet/opaque.go#ne... openpgp/packet/opaque.go:160: buf[0] = osp.SubType On 2013/08/26 14:32:15, agl1 wrote: > why not make buf one byte longer and save a Write call? Done. https://codereview.appspot.com/12966045/diff/3001/openpgp/packet/opaque.go#ne... openpgp/packet/opaque.go:161: _, err = w.Write(buf[:1]) No longer needed. On 2013/08/26 14:32:15, agl1 wrote: > merge if here too. https://codereview.appspot.com/12966045/diff/3001/openpgp/packet/userattribut... File openpgp/packet/userattribute.go (right): https://codereview.appspot.com/12966045/diff/3001/openpgp/packet/userattribut... openpgp/packet/userattribute.go:1: // Copyright 2011 The Go Authors. All rights reserved. On 2013/08/26 14:32:15, agl1 wrote: > year. Done. https://codereview.appspot.com/12966045/diff/3001/openpgp/packet/userattribut... openpgp/packet/userattribute.go:30: buf := bytes.NewBuffer(nil) On 2013/08/26 14:32:15, agl1 wrote: > var buf bytes.Buffer Done. https://codereview.appspot.com/12966045/diff/3001/openpgp/packet/userattribut... openpgp/packet/userattribute.go:33: 0x10, 0x0, 0x01, 0x01, On 2013/08/26 14:32:15, agl1 wrote: > 0x10, 0x00, // little-endian length (16 bytes) > 0x01, // version 1 > 0x01, // JPEG > 0, 0, 0, 0, // 12 reserved bytes > 0, 0, 0, 0, > 0, 0, 0, 0, Done. https://codereview.appspot.com/12966045/diff/3001/openpgp/packet/userattribut... openpgp/packet/userattribute.go:37: _, err = buf.Write(data) On 2013/08/26 14:32:15, agl1 wrote: > merge if. Done. https://codereview.appspot.com/12966045/diff/3001/openpgp/packet/userattribut... openpgp/packet/userattribute.go:41: err = jpeg.Encode(buf, photo, nil) On 2013/08/26 14:32:15, agl1 wrote: > merge if. Done. https://codereview.appspot.com/12966045/diff/3001/openpgp/packet/userattribut... openpgp/packet/userattribute.go:46: Length: uint32(buf.Len()), SubType: UserAttrImageSubpacket, On 2013/08/26 14:32:15, agl1 wrote: > Length appears to be redundant given len(Contents), no? Agree & done. Removing it required some improvement to OpaqueSubpacket. https://codereview.appspot.com/12966045/diff/3001/openpgp/packet/userattribut... openpgp/packet/userattribute.go:87: if sp.SubType == UserAttrImageSubpacket { On 2013/08/26 14:32:15, agl1 wrote: > && len(sp.Contents) > 16 Done.

[agl1, 2013-08-28 15:02:38]

*** Submitted as https://code.google.com/p/go/source/detail?r=5c2f63878818&repo=crypto *** go.crypto/openpgp/packet: Add user attribute packet support. Supports JPEG images as well as free-form arbitrary subpacket data in user attributes (RFC 4880, Section 5.12) R=agl CC=golang-dev https://codereview.appspot.com/12966045 Committer: Adam Langley <agl@golang.org>