openpgp: improve parser resilience & flexibility, add P...

openpgp/armor/armor.go

 // Copyright 2010 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
 // Package armor implements OpenPGP ASCII Armor, see RFC 4880. OpenPGP Armor is
 // very similar to PEM except that it has an additional CRC checksum.
 package armor
 
 import (
         "bufio"
@@ skipping 93 matching lines @@
                         return
                 }
                 if !bytes.HasPrefix(line, armorEnd) {
                         return 0, ArmorCorrupt
                 }
 
                 l.eof = true
                 return 0, io.EOF
         }
 
-        if len(line) > 64 {
+        if len(line) > 96 {
                 return 0, ArmorCorrupt
         }
 
         n = copy(p, line)
         bytesToSave := len(line) - n
         if bytesToSave > 0 {
                 if cap(l.buf) < bytesToSave {
                         l.buf = make([]byte, 0, bytesToSave)
                 }
                 l.buf = l.buf[0:bytesToSave]
@@ skipping 85 matching lines @@
         }
 
         p.lReader.in = r
         p.oReader.currentCRC = crc24Init
         p.oReader.lReader = &p.lReader
         p.oReader.b64Reader = base64.NewDecoder(base64.StdEncoding, &p.lReader)
         p.Body = &p.oReader
 
         return
 }