Merge pull request fullsailor#16 from Requaos/master

capture full bytes of non-octet string compound asn1 values found in

.travis.yml

@@ -1,8 +1,7 @@
 language: go
 go:
-    - 1.6
-    - 1.7
-    - 1.8
+    - "1.9"
+    - "1.10"
     - tip
 before_install:
     - make gettools

sign.go

@@ -231,7 +231,7 @@ func (sd *SignedData) Finish() ([]byte, error) {
 // RemoveAuthenticatedAttributes removes authenticated attributes from signedData
 // similar to OpenSSL's PKCS7_NOATTR or -noattr flags
 func (sd *SignedData) RemoveAuthenticatedAttributes() error {
-	for i, _ := range sd.sd.SignerInfos {
+	for i := range sd.sd.SignerInfos {
 		blankAttrs := &attributes{}
 		finalBlankAttrs, err := blankAttrs.ForMarshalling()
 		if err != nil {

verify.go

@@ -130,8 +130,12 @@ func parseSignedData(data []byte) (*PKCS7, error) {
 	}
 	// Compound octet string
 	if compound.IsCompound {
-		if _, err = asn1.Unmarshal(compound.Bytes, &content); err != nil {
-			return nil, err
+		if compound.Tag == 4 {
+			if _, err = asn1.Unmarshal(compound.Bytes, &content); err != nil {
+				return nil, err
+			}
+		} else {
+			content = compound.Bytes
 		}
 	} else {
 		// assuming this is tag 04