From b004b4dae983b31dda50500fc12a1455afd337f6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Mar 2023 08:16:14 +0000 Subject: [chore]: Bump golang.org/x/crypto from 0.6.0 to 0.7.0 (#1593) Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.6.0 to 0.7.0. - [Release notes](https://github.com/golang/crypto/releases) - [Commits](https://github.com/golang/crypto/compare/v0.6.0...v0.7.0) --- updated-dependencies: - dependency-name: golang.org/x/crypto dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- vendor/golang.org/x/crypto/ssh/cipher.go | 3 +- vendor/golang.org/x/crypto/ssh/common.go | 9 +- vendor/golang.org/x/crypto/ssh/transport.go | 3 +- vendor/golang.org/x/net/html/doc.go | 15 +++ vendor/golang.org/x/net/html/escape.go | 81 ++++++++++++ vendor/golang.org/x/net/html/render.go | 2 +- vendor/golang.org/x/net/html/token.go | 10 +- vendor/golang.org/x/sys/cpu/hwcap_linux.go | 15 +++ vendor/golang.org/x/sys/cpu/runtime_auxv.go | 16 +++ vendor/golang.org/x/sys/cpu/runtime_auxv_go121.go | 19 +++ vendor/golang.org/x/sys/execabs/execabs.go | 2 +- vendor/golang.org/x/sys/execabs/execabs_go118.go | 6 + vendor/golang.org/x/sys/execabs/execabs_go119.go | 4 + vendor/golang.org/x/sys/unix/ioctl.go | 17 +-- vendor/golang.org/x/sys/unix/ioctl_zos.go | 8 +- vendor/golang.org/x/sys/unix/ptrace_darwin.go | 6 + vendor/golang.org/x/sys/unix/ptrace_ios.go | 6 + vendor/golang.org/x/sys/unix/syscall_aix.go | 5 +- vendor/golang.org/x/sys/unix/syscall_bsd.go | 3 +- vendor/golang.org/x/sys/unix/syscall_darwin.go | 12 +- .../golang.org/x/sys/unix/syscall_darwin_amd64.go | 1 + .../golang.org/x/sys/unix/syscall_darwin_arm64.go | 1 + vendor/golang.org/x/sys/unix/syscall_dragonfly.go | 1 + vendor/golang.org/x/sys/unix/syscall_freebsd.go | 43 ++++++- .../golang.org/x/sys/unix/syscall_freebsd_386.go | 17 +-- .../golang.org/x/sys/unix/syscall_freebsd_amd64.go | 17 +-- .../golang.org/x/sys/unix/syscall_freebsd_arm.go | 15 +-- .../golang.org/x/sys/unix/syscall_freebsd_arm64.go | 15 +-- .../x/sys/unix/syscall_freebsd_riscv64.go | 15 +-- vendor/golang.org/x/sys/unix/syscall_hurd.go | 8 ++ vendor/golang.org/x/sys/unix/syscall_linux.go | 36 ++++-- vendor/golang.org/x/sys/unix/syscall_netbsd.go | 5 +- vendor/golang.org/x/sys/unix/syscall_openbsd.go | 1 + vendor/golang.org/x/sys/unix/syscall_solaris.go | 21 ++-- vendor/golang.org/x/sys/unix/syscall_zos_s390x.go | 4 +- vendor/golang.org/x/sys/unix/zerrors_linux.go | 10 +- .../golang.org/x/sys/unix/zptrace_armnn_linux.go | 8 +- .../golang.org/x/sys/unix/zptrace_linux_arm64.go | 4 +- .../golang.org/x/sys/unix/zptrace_mipsnn_linux.go | 8 +- .../x/sys/unix/zptrace_mipsnnle_linux.go | 8 +- vendor/golang.org/x/sys/unix/zptrace_x86_linux.go | 8 +- vendor/golang.org/x/sys/unix/zsyscall_aix_ppc.go | 10 ++ vendor/golang.org/x/sys/unix/zsyscall_aix_ppc64.go | 10 ++ .../golang.org/x/sys/unix/zsyscall_aix_ppc64_gc.go | 7 ++ .../x/sys/unix/zsyscall_aix_ppc64_gccgo.go | 8 ++ .../golang.org/x/sys/unix/zsyscall_darwin_amd64.go | 16 +++ .../golang.org/x/sys/unix/zsyscall_darwin_arm64.go | 16 +++ .../x/sys/unix/zsyscall_dragonfly_amd64.go | 10 ++ .../golang.org/x/sys/unix/zsyscall_freebsd_386.go | 20 +++ .../x/sys/unix/zsyscall_freebsd_amd64.go | 20 +++ .../golang.org/x/sys/unix/zsyscall_freebsd_arm.go | 20 +++ .../x/sys/unix/zsyscall_freebsd_arm64.go | 20 +++ .../x/sys/unix/zsyscall_freebsd_riscv64.go | 20 +++ vendor/golang.org/x/sys/unix/zsyscall_linux.go | 10 ++ .../golang.org/x/sys/unix/zsyscall_netbsd_386.go | 10 ++ .../golang.org/x/sys/unix/zsyscall_netbsd_amd64.go | 10 ++ .../golang.org/x/sys/unix/zsyscall_netbsd_arm.go | 10 ++ .../golang.org/x/sys/unix/zsyscall_netbsd_arm64.go | 10 ++ .../golang.org/x/sys/unix/zsyscall_openbsd_386.go | 8 ++ .../x/sys/unix/zsyscall_openbsd_amd64.go | 8 ++ .../golang.org/x/sys/unix/zsyscall_openbsd_arm.go | 8 ++ .../x/sys/unix/zsyscall_openbsd_arm64.go | 8 ++ .../x/sys/unix/zsyscall_openbsd_mips64.go | 8 ++ .../x/sys/unix/zsyscall_openbsd_ppc64.go | 8 ++ .../x/sys/unix/zsyscall_openbsd_riscv64.go | 8 ++ .../x/sys/unix/zsyscall_solaris_amd64.go | 11 ++ vendor/golang.org/x/sys/unix/zsyscall_zos_s390x.go | 10 ++ vendor/golang.org/x/sys/unix/ztypes_freebsd_386.go | 2 +- .../golang.org/x/sys/unix/ztypes_freebsd_amd64.go | 2 +- vendor/golang.org/x/sys/unix/ztypes_freebsd_arm.go | 2 +- .../golang.org/x/sys/unix/ztypes_freebsd_arm64.go | 2 +- .../x/sys/unix/ztypes_freebsd_riscv64.go | 2 +- vendor/golang.org/x/sys/unix/ztypes_linux.go | 140 +++++++++++++++------ vendor/golang.org/x/sys/unix/ztypes_linux_386.go | 2 +- vendor/golang.org/x/sys/unix/ztypes_linux_amd64.go | 2 +- vendor/golang.org/x/sys/unix/ztypes_linux_arm.go | 2 +- vendor/golang.org/x/sys/unix/ztypes_linux_arm64.go | 2 +- .../golang.org/x/sys/unix/ztypes_linux_loong64.go | 2 +- vendor/golang.org/x/sys/unix/ztypes_linux_mips.go | 2 +- .../golang.org/x/sys/unix/ztypes_linux_mips64.go | 2 +- .../golang.org/x/sys/unix/ztypes_linux_mips64le.go | 2 +- .../golang.org/x/sys/unix/ztypes_linux_mipsle.go | 2 +- vendor/golang.org/x/sys/unix/ztypes_linux_ppc.go | 2 +- vendor/golang.org/x/sys/unix/ztypes_linux_ppc64.go | 2 +- .../golang.org/x/sys/unix/ztypes_linux_ppc64le.go | 2 +- .../golang.org/x/sys/unix/ztypes_linux_riscv64.go | 2 +- vendor/golang.org/x/sys/unix/ztypes_linux_s390x.go | 2 +- .../golang.org/x/sys/unix/ztypes_linux_sparc64.go | 2 +- vendor/golang.org/x/sys/windows/syscall_windows.go | 6 +- vendor/golang.org/x/sys/windows/types_windows.go | 85 +++++++++++++ .../golang.org/x/sys/windows/zsyscall_windows.go | 27 ++++ vendor/modules.txt | 6 +- 92 files changed, 882 insertions(+), 214 deletions(-) create mode 100644 vendor/golang.org/x/sys/cpu/runtime_auxv.go create mode 100644 vendor/golang.org/x/sys/cpu/runtime_auxv_go121.go (limited to 'vendor') diff --git a/vendor/golang.org/x/crypto/ssh/cipher.go b/vendor/golang.org/x/crypto/ssh/cipher.go index 87f48552c..741e984f3 100644 --- a/vendor/golang.org/x/crypto/ssh/cipher.go +++ b/vendor/golang.org/x/crypto/ssh/cipher.go @@ -114,7 +114,8 @@ var cipherModes = map[string]*cipherMode{ "arcfour": {16, 0, streamCipherMode(0, newRC4)}, // AEAD ciphers - gcmCipherID: {16, 12, newGCMCipher}, + gcm128CipherID: {16, 12, newGCMCipher}, + gcm256CipherID: {32, 12, newGCMCipher}, chacha20Poly1305ID: {64, 0, newChaCha20Cipher}, // CBC mode is insecure and so is not included in the default config. diff --git a/vendor/golang.org/x/crypto/ssh/common.go b/vendor/golang.org/x/crypto/ssh/common.go index c7964275d..e6a77f26a 100644 --- a/vendor/golang.org/x/crypto/ssh/common.go +++ b/vendor/golang.org/x/crypto/ssh/common.go @@ -28,7 +28,7 @@ const ( // supportedCiphers lists ciphers we support but might not recommend. var supportedCiphers = []string{ "aes128-ctr", "aes192-ctr", "aes256-ctr", - "aes128-gcm@openssh.com", + "aes128-gcm@openssh.com", gcm256CipherID, chacha20Poly1305ID, "arcfour256", "arcfour128", "arcfour", aes128cbcID, @@ -37,7 +37,7 @@ var supportedCiphers = []string{ // preferredCiphers specifies the default preference for ciphers. var preferredCiphers = []string{ - "aes128-gcm@openssh.com", + "aes128-gcm@openssh.com", gcm256CipherID, chacha20Poly1305ID, "aes128-ctr", "aes192-ctr", "aes256-ctr", } @@ -168,7 +168,7 @@ func (a *directionAlgorithms) rekeyBytes() int64 { // 2^(BLOCKSIZE/4) blocks. For all AES flavors BLOCKSIZE is // 128. switch a.Cipher { - case "aes128-ctr", "aes192-ctr", "aes256-ctr", gcmCipherID, aes128cbcID: + case "aes128-ctr", "aes192-ctr", "aes256-ctr", gcm128CipherID, gcm256CipherID, aes128cbcID: return 16 * (1 << 32) } @@ -178,7 +178,8 @@ func (a *directionAlgorithms) rekeyBytes() int64 { } var aeadCiphers = map[string]bool{ - gcmCipherID: true, + gcm128CipherID: true, + gcm256CipherID: true, chacha20Poly1305ID: true, } diff --git a/vendor/golang.org/x/crypto/ssh/transport.go b/vendor/golang.org/x/crypto/ssh/transport.go index acf5a21bb..da015801e 100644 --- a/vendor/golang.org/x/crypto/ssh/transport.go +++ b/vendor/golang.org/x/crypto/ssh/transport.go @@ -17,7 +17,8 @@ import ( const debugTransport = false const ( - gcmCipherID = "aes128-gcm@openssh.com" + gcm128CipherID = "aes128-gcm@openssh.com" + gcm256CipherID = "aes256-gcm@openssh.com" aes128cbcID = "aes128-cbc" tripledescbcID = "3des-cbc" ) diff --git a/vendor/golang.org/x/net/html/doc.go b/vendor/golang.org/x/net/html/doc.go index 822ed42a0..7a96eae33 100644 --- a/vendor/golang.org/x/net/html/doc.go +++ b/vendor/golang.org/x/net/html/doc.go @@ -92,6 +92,21 @@ example, to process each anchor node in depth-first order: The relevant specifications include: https://html.spec.whatwg.org/multipage/syntax.html and https://html.spec.whatwg.org/multipage/syntax.html#tokenization + +# Security Considerations + +Care should be taken when parsing and interpreting HTML, whether full documents +or fragments, within the framework of the HTML specification, especially with +regard to untrusted inputs. + +This package provides both a tokenizer and a parser. Only the parser constructs +a DOM according to the HTML specification, resolving malformed and misplaced +tags where appropriate. The tokenizer simply tokenizes the HTML presented to it, +and as such does not resolve issues that may exist in the processed HTML, +producing a literal interpretation of the input. + +If your use case requires semantically well-formed HTML, as defined by the +WHATWG specifiction, the parser should be used rather than the tokenizer. */ package html // import "golang.org/x/net/html" diff --git a/vendor/golang.org/x/net/html/escape.go b/vendor/golang.org/x/net/html/escape.go index d85613962..04c6bec21 100644 --- a/vendor/golang.org/x/net/html/escape.go +++ b/vendor/golang.org/x/net/html/escape.go @@ -193,6 +193,87 @@ func lower(b []byte) []byte { return b } +// escapeComment is like func escape but escapes its input bytes less often. +// Per https://github.com/golang/go/issues/58246 some HTML comments are (1) +// meaningful and (2) contain angle brackets that we'd like to avoid escaping +// unless we have to. +// +// "We have to" includes the '&' byte, since that introduces other escapes. +// +// It also includes those bytes (not including EOF) that would otherwise end +// the comment. Per the summary table at the bottom of comment_test.go, this is +// the '>' byte that, per above, we'd like to avoid escaping unless we have to. +// +// Studying the summary table (and T actions in its '>' column) closely, we +// only need to escape in states 43, 44, 49, 51 and 52. State 43 is at the +// start of the comment data. State 52 is after a '!'. The other three states +// are after a '-'. +// +// Our algorithm is thus to escape every '&' and to escape '>' if and only if: +// - The '>' is after a '!' or '-' (in the unescaped data) or +// - The '>' is at the start of the comment data (after the opening ""); err != nil { diff --git a/vendor/golang.org/x/net/html/token.go b/vendor/golang.org/x/net/html/token.go index 50f7c6aac..5c2a1f4ef 100644 --- a/vendor/golang.org/x/net/html/token.go +++ b/vendor/golang.org/x/net/html/token.go @@ -110,7 +110,7 @@ func (t Token) String() string { case SelfClosingTagToken: return "<" + t.tagString() + "/>" case CommentToken: - return "" + return "" case DoctypeToken: return "" } @@ -598,10 +598,10 @@ scriptDataDoubleEscapeEnd: // readComment reads the next comment token starting with "