Breaking change in beevik/etree & RFC3161 support for ClickOnce

lib/appmanifest/signmanifest.go

@@ -155,7 +155,7 @@ func makeLicense(asi *etree.Element, subjectName, manifestHash string) (*etree.E
 // ManifestInformation contains a hash value which is, for some inane reason,
 // the same hash that the outer signature references but in reverse byte order.
 func makeManifestHash(sig *etree.Element) string {
-	dv := sig.FindElement("//DigestValue")
+	dv := sig.FindElement(".//DigestValue")
 	blob, _ := base64.StdEncoding.DecodeString(dv.Text())
 	for i := 0; i < len(blob)/2; i++ {
 		j := len(blob) - i - 1
@@ -209,7 +209,7 @@ func (m *SignedManifest) AddTimestamp(token *pkcs7.ContentInfoSignedData) error
 	if err != nil {
 		return err
 	}
-	cs, err := pkcs9.VerifyMicrosoftToken(token, m.EncryptedDigest)
+	cs, err := VerifyTimestamp(token, m.EncryptedDigest, m.Signature.Intermediates)
 	if err != nil {
 		return fmt.Errorf("failed to validate timestamp: %s", err)
 	}

lib/appmanifest/verify.go

@@ -18,6 +18,7 @@ package appmanifest
 
 import (
 	"crypto"
+	"crypto/x509"
 	"encoding/base64"
 	"errors"
 	"fmt"
@@ -91,7 +92,8 @@ func Verify(manifest []byte) (*ManifestSignature, error) {
 		if err != nil {
 			return nil, fmt.Errorf("invalid timestamp: %s", err)
 		}
-		cs, err := pkcs9.VerifyMicrosoftToken(timestamp, secondary.EncryptedDigest)
+
+		cs, err := VerifyTimestamp(timestamp, secondary.EncryptedDigest, secondary.Certificates)
 		if err != nil {
 			return nil, fmt.Errorf("invalid timestamp: %s", err)
 		}
@@ -105,3 +107,18 @@ func Verify(manifest []byte) (*ManifestSignature, error) {
 		PublicKeyToken:  token,
 	}, nil
 }
+
+func VerifyTimestamp(timestamp *pkcs7.ContentInfoSignedData, encryptedDigest []byte, extraCerts []*x509.Certificate) (*pkcs9.CounterSignature, error) {
+	var cs *pkcs9.CounterSignature
+	var err error
+
+	if timestamp.Content.ContentInfo.ContentType.Equal(pkcs9.OidTSTInfo) {
+		// pkcs9 timestamp
+		cs, err = pkcs9.Verify(timestamp, encryptedDigest, extraCerts)
+	} else {
+		// legacy timestamp
+		cs, err = pkcs9.VerifyMicrosoftToken(timestamp, encryptedDigest)
+	}
+
+	return cs, err
+}

lib/pkcs9/structs.go

@@ -54,6 +54,7 @@ const (
 
 var (
 	OidKeyPurposeTimeStamping  = asn1.ObjectIdentifier{1, 3, 6, 1, 5, 5, 7, 3, 8}
+	OidTSTInfo                 = asn1.ObjectIdentifier{1, 2, 840, 113549, 1, 9, 16, 1, 4}
 	OidAttributeTimeStampToken = asn1.ObjectIdentifier{1, 2, 840, 113549, 1, 9, 16, 2, 14}
 	OidAttributeCounterSign    = asn1.ObjectIdentifier{1, 2, 840, 113549, 1, 9, 6}
 

signers/appmanifest/signer.go

@@ -43,6 +43,7 @@ var AppSigner = &signers.Signer{
 }
 
 func init() {
+	AppSigner.Flags().Bool("rfc3161-timestamp", true, "(APPMANIFEST) Timestamp with RFC3161 server")
 	signers.Register(AppSigner)
 }
 
@@ -66,8 +67,10 @@ func sign(r io.Reader, cert *certloader.Certificate, opts signers.SignOpts) ([]b
 	if cert.Timestamper != nil {
 		tsreq := &pkcs9.Request{
 			EncryptedDigest: signed.EncryptedDigest,
-			Legacy:          true,
+			Legacy:          !opts.Flags.GetBool("rfc3161-timestamp"),
+			Hash:            opts.Hash,
 		}
+
 		token, err := cert.Timestamper.Timestamp(opts.Context(), tsreq)
 		if err != nil {
 			return nil, err