diff options
| author | v-solomatin <[email protected]> | 2026-07-20 13:07:25 +0300 |
|---|---|---|
| committer | v-solomatin <[email protected]> | 2026-07-20 13:38:24 +0300 |
| commit | dd427c07c26ecbcc6494c860fa819902843e2fbb (patch) | |
| tree | 88df0db63fb7b11ed05001eee955c0d41bf01424 | |
| parent | 7d359ee1ca06fc0162483a21342845082d270924 (diff) | |
Update vendor/golang.org/x/* package versions
`golang.org/x/[email protected]` update addresses security issues:
*-5005 / CVE-2026-39833](https://pkg.go.dev/vuln/-5005) ([^1])
*-5006 / CVE-2026-39832](https://pkg.go.dev/vuln/-5006) ([^1])
*-5013 / CVE-2026-46597](https://pkg.go.dev/vuln/-5013) ([^1])
*-5014 / CVE-2026-39828](https://pkg.go.dev/vuln/-5014) ([^1])
*-5015 / CVE-2026-39835](https://pkg.go.dev/vuln/-5015) ([^1])
*-5016 / CVE-2026-39827](https://pkg.go.dev/vuln/-5016) ([^1])
*-5017 / CVE-2026-39830](https://pkg.go.dev/vuln/-5017) ([^1])
*-5018 / CVE-2026-39829](https://pkg.go.dev/vuln/-5018) ([^1])
*-5019 / CVE-2026-39831](https://pkg.go.dev/vuln/-5019) ([^1])
*-5020 / CVE-2026-39834](https://pkg.go.dev/vuln/-5020) ([^1])
*-5021 / CVE-2026-42508](https://pkg.go.dev/vuln/-5021) ([^1])
*-5023 / CVE-2026-46595](https://pkg.go.dev/vuln/-5023) ([^1])
*-5033 / CVE-2026-46598](https://pkg.go.dev/vuln/-5033) ([^1])
`golang.org/x/[email protected]` update addresses security issues:
*-4918 / CVE-2026-33814](https://pkg.go.dev/vuln/-4918)
*-5025 / CVE-2026-42506](https://pkg.go.dev/vuln/-5025) ([^2])
*-5026 / CVE-2026-39821](https://pkg.go.dev/vuln/-5026) ([^2])
*-5027 / CVE-2026-42502](https://pkg.go.dev/vuln/-5027) ([^2])
*-5028 / CVE-2026-25680](https://pkg.go.dev/vuln/-5028) ([^2])
*-5029 / CVE-2026-25681](https://pkg.go.dev/vuln/-5029) ([^2])
*-5030 / CVE-2026-27136](https://pkg.go.dev/vuln/-5030) ([^2])
`golang.org/x/[email protected]` update addresses security issue:
*-5024 / CVE-2026-39824](https://pkg.go.dev/vuln/-5024) ([^3])
Other updates are either dependency-related or are there to fix tests.
[^1]: https://groups.google.com/g/golang-announce/c/a082jnz-LvI
[^2]: https://groups.google.com/g/golang-announce/c/iI-mYSI0lu8
[^3]: https://groups.google.com/g/golang-announce/c/6MMI8Lj-Atg
commit_hash:72ce6a5d9fe2519c24072c9e08e99a1220c4cb4e
| -rw-r--r-- | vendor/golang.org/x/crypto/pbkdf2/pbkdf2.go | 73 | ||||
| -rw-r--r-- | vendor/golang.org/x/crypto/pbkdf2/ya.make | 2 | ||||
| -rw-r--r-- | vendor/golang.org/x/crypto/scrypt/ya.make | 2 |
3 files changed, 15 insertions, 62 deletions
diff --git a/vendor/golang.org/x/crypto/pbkdf2/pbkdf2.go b/vendor/golang.org/x/crypto/pbkdf2/pbkdf2.go index 28cd99c7f3f..b332122033b 100644 --- a/vendor/golang.org/x/crypto/pbkdf2/pbkdf2.go +++ b/vendor/golang.org/x/crypto/pbkdf2/pbkdf2.go @@ -2,24 +2,17 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -/* -Package pbkdf2 implements the key derivation function PBKDF2 as defined in RFC -2898 / PKCS #5 v2.0. - -A key derivation function is useful when encrypting data based on a password -or any other not-fully-random data. It uses a pseudorandom function to derive -a secure encryption key based on the password. - -While v2.0 of the standard defines only one pseudorandom function to use, -HMAC-SHA1, the drafted v2.1 specification allows use of all five FIPS Approved -Hash Functions SHA-1, SHA-224, SHA-256, SHA-384 and SHA-512 for HMAC. To -choose, you can pass the `New` functions from the different SHA packages to -pbkdf2.Key. -*/ +// Package pbkdf2 implements the key derivation function PBKDF2 as defined in +// RFC 8018 (PKCS #5 v2.1). +// +// This package is a wrapper for the PBKDF2 implementation in the +// [crypto/pbkdf2] package. It is [frozen] and is not accepting new features. +// +// [frozen]: https://go.dev/wiki/Frozen package pbkdf2 import ( - "crypto/hmac" + "crypto/pbkdf2" "hash" ) @@ -27,51 +20,11 @@ import ( // []byte of length keylen that can be used as cryptographic key. The key is // derived based on the method described as PBKDF2 with the HMAC variant using // the supplied hash function. -// -// For example, to use a HMAC-SHA-1 based PBKDF2 key derivation function, you -// can get a derived key for e.g. AES-256 (which needs a 32-byte key) by -// doing: -// -// dk := pbkdf2.Key([]byte("some password"), salt, 4096, 32, sha1.New) -// -// Remember to get a good random salt. At least 8 bytes is recommended by the -// RFC. -// -// Using a higher iteration count will increase the cost of an exhaustive -// search but will also make derivation proportionally slower. func Key(password, salt []byte, iter, keyLen int, h func() hash.Hash) []byte { - prf := hmac.New(h, password) - hashLen := prf.Size() - numBlocks := (keyLen + hashLen - 1) / hashLen - - var buf [4]byte - dk := make([]byte, 0, numBlocks*hashLen) - U := make([]byte, hashLen) - for block := 1; block <= numBlocks; block++ { - // N.B.: || means concatenation, ^ means XOR - // for each block T_i = U_1 ^ U_2 ^ ... ^ U_iter - // U_1 = PRF(password, salt || uint(i)) - prf.Reset() - prf.Write(salt) - buf[0] = byte(block >> 24) - buf[1] = byte(block >> 16) - buf[2] = byte(block >> 8) - buf[3] = byte(block) - prf.Write(buf[:4]) - dk = prf.Sum(dk) - T := dk[len(dk)-hashLen:] - copy(U, T) - - // U_n = PRF(password, U_(n-1)) - for n := 2; n <= iter; n++ { - prf.Reset() - prf.Write(U) - U = U[:0] - U = prf.Sum(U) - for x := range U { - T[x] ^= U[x] - } - } + out, err := pbkdf2.Key(h, string(password), salt, iter, keyLen) + if err != nil { + // FIPS 140 enforcement, or an invalid key length. + panic(err) } - return dk[:keyLen] + return out } diff --git a/vendor/golang.org/x/crypto/pbkdf2/ya.make b/vendor/golang.org/x/crypto/pbkdf2/ya.make index 93efe6e8d08..bf485573593 100644 --- a/vendor/golang.org/x/crypto/pbkdf2/ya.make +++ b/vendor/golang.org/x/crypto/pbkdf2/ya.make @@ -2,7 +2,7 @@ GO_LIBRARY() LICENSE(BSD-3-Clause) -VERSION(v0.49.0) +VERSION(v0.53.0) SRCS( pbkdf2.go diff --git a/vendor/golang.org/x/crypto/scrypt/ya.make b/vendor/golang.org/x/crypto/scrypt/ya.make index e5ef97d77b2..aab6270377c 100644 --- a/vendor/golang.org/x/crypto/scrypt/ya.make +++ b/vendor/golang.org/x/crypto/scrypt/ya.make @@ -2,7 +2,7 @@ GO_LIBRARY() LICENSE(BSD-3-Clause) -VERSION(v0.49.0) +VERSION(v0.53.0) SRCS( scrypt.go |
