build(deps): bump github.com/russellhaering/goxmldsig
Bumps [github.com/russellhaering/goxmldsig](https://github.com/russellhaering/goxmldsig) from 1.5.0 to 1.6.0. - [Release notes](https://github.com/russellhaering/goxmldsig/releases) - [Commits](https://github.com/russellhaering/goxmldsig/compare/v1.5.0...v1.6.0) --- updated-dependencies: - dependency-name: github.com/russellhaering/goxmldsig dependency-version: 1.6.0 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>
This commit is contained in:
committed by
Ralf Haferkamp
parent
7234115ae4
commit
fb0c4aaa76
+2
-3
@@ -1,6 +1,7 @@
|
||||
package dsig
|
||||
|
||||
import (
|
||||
"maps"
|
||||
"sort"
|
||||
|
||||
"github.com/beevik/etree"
|
||||
@@ -164,9 +165,7 @@ func canonicalPrep(el *etree.Element, strip bool, comments bool) *etree.Element
|
||||
|
||||
func canonicalPrepInner(el *etree.Element, seenSoFar map[string]string, strip bool, comments bool) *etree.Element {
|
||||
_seenSoFar := make(map[string]string)
|
||||
for k, v := range seenSoFar {
|
||||
_seenSoFar[k] = v
|
||||
}
|
||||
maps.Copy(_seenSoFar, seenSoFar)
|
||||
|
||||
ne := el.Copy()
|
||||
sort.Sort(etreeutils.SortedAttrs(ne.Attr))
|
||||
|
||||
+3
-6
@@ -3,6 +3,7 @@ package etreeutils
|
||||
import (
|
||||
"errors"
|
||||
"fmt"
|
||||
"maps"
|
||||
"sort"
|
||||
|
||||
"github.com/beevik/etree"
|
||||
@@ -63,9 +64,7 @@ func (ctx NSContext) CheckLimit() error {
|
||||
|
||||
func (ctx NSContext) Copy() NSContext {
|
||||
prefixes := make(map[string]string, len(ctx.prefixes)+4)
|
||||
for k, v := range ctx.prefixes {
|
||||
prefixes[k] = v
|
||||
}
|
||||
maps.Copy(prefixes, ctx.prefixes)
|
||||
|
||||
return NSContext{prefixes: prefixes, limit: ctx.limit}
|
||||
}
|
||||
@@ -127,9 +126,7 @@ func (ctx NSContext) SubContext(el *etree.Element) (NSContext, error) {
|
||||
// Prefixes returns a copy of this context's prefix map.
|
||||
func (ctx NSContext) Prefixes() map[string]string {
|
||||
prefixes := make(map[string]string, len(ctx.prefixes))
|
||||
for k, v := range ctx.prefixes {
|
||||
prefixes[k] = v
|
||||
}
|
||||
maps.Copy(prefixes, ctx.prefixes)
|
||||
|
||||
return prefixes
|
||||
}
|
||||
|
||||
+1
-1
@@ -9,7 +9,7 @@ import (
|
||||
// NSUnmarshalElement unmarshals the passed etree Element into the value pointed to by
|
||||
// v using encoding/xml in the context of the passed NSContext. If v implements
|
||||
// ElementKeeper, SetUnderlyingElement will be called on v with a reference to el.
|
||||
func NSUnmarshalElement(ctx NSContext, el *etree.Element, v interface{}) error {
|
||||
func NSUnmarshalElement(ctx NSContext, el *etree.Element, v any) error {
|
||||
detatched, err := NSDetatch(ctx, el)
|
||||
if err != nil {
|
||||
return err
|
||||
|
||||
+4
-3
@@ -306,9 +306,10 @@ func (ctx *ValidationContext) validateSignature(el *etree.Element, sig *types.Si
|
||||
var ref *types.Reference
|
||||
|
||||
// Find the first reference which references the top-level element
|
||||
for _, _ref := range signedInfo.References {
|
||||
if _ref.URI == "" || _ref.URI[1:] == idAttr {
|
||||
ref = &_ref
|
||||
for i := range signedInfo.References {
|
||||
if signedInfo.References[i].URI == "" || signedInfo.References[i].URI[1:] == idAttr {
|
||||
ref = &signedInfo.References[i]
|
||||
break
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user