...

Author: markus621

pki/internal/xocsp/ocsp.go

@@ -125,6 +125,7 @@ type responseData struct {
 	RawResponderID asn1.RawValue
 	ProducedAt     time.Time `asn1:"generalized"`
 	Responses      []singleResponse
+	Extensions     []pkix.Extension `asn1:"explicit,tag:1,optional"`
 }
 
 type singleResponse struct {
@@ -752,6 +753,7 @@ func CreateResponse(issuer, responderCert *x509.Certificate, template Response,
 		RawResponderID: rawResponderID,
 		ProducedAt:     time.Now().Truncate(time.Minute).UTC(),
 		Responses:      []singleResponse{innerResponse},
+		Extensions:     template.Extensions,
 	}
 
 	tbsResponseDataDER, err := asn1.Marshal(tbsResponseData)

pki/ocsp.go

@@ -82,11 +82,6 @@ func (v *OCSPServer) HTTPHandler(w http.ResponseWriter, r *http.Request) {
 			Critical: false,
 			Value:    nonce,
 		})
-		template.ExtraExtensions = append(template.ExtraExtensions, pkix.Extension{
-			Id:       xocsp.OIDNonce,
-			Critical: false,
-			Value:    nonce,
-		})
 	}
 
 	resp, err := xocsp.CreateResponse(v.CA.Crt, v.CA.Crt, template, v.CA.Key)