mirror of
				https://github.com/superseriousbusiness/gotosocial.git
				synced 2025-10-31 14:32:24 -05:00 
			
		
		
		
	[chore] update dependencies (#4423)
- codeberg.org/gruf/go-ffmpreg: v0.6.10 -> v0.6.11 - github.com/spf13/cast: v1.9.2 -> v1.10.0 - github.com/spf13/viper: v1.20.1 -> v1.21.0 - golang.org/x/crypto: v0.41.0 -> v0.42.0 - golang.org/x/image: v0.30.0 -> v0.31.0 Reviewed-on: https://codeberg.org/superseriousbusiness/gotosocial/pulls/4423 Co-authored-by: kim <grufwub@gmail.com> Co-committed-by: kim <grufwub@gmail.com>
This commit is contained in:
		
					parent
					
						
							
								a6429b5410
							
						
					
				
			
			
				commit
				
					
						c949b9f2d1
					
				
			
		
					 97 changed files with 14611 additions and 3494 deletions
				
			
		
							
								
								
									
										4
									
								
								vendor/golang.org/x/crypto/acme/rfc8555.go
									
										
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								vendor/golang.org/x/crypto/acme/rfc8555.go
									
										
									
										generated
									
									
										vendored
									
									
								
							|  | @ -272,7 +272,7 @@ func (c *Client) WaitOrder(ctx context.Context, url string) (*Order, error) { | |||
| 		case err != nil: | ||||
| 			// Skip and retry. | ||||
| 		case o.Status == StatusInvalid: | ||||
| 			return nil, &OrderError{OrderURL: o.URI, Status: o.Status} | ||||
| 			return nil, &OrderError{OrderURL: o.URI, Status: o.Status, Problem: o.Error} | ||||
| 		case o.Status == StatusReady || o.Status == StatusValid: | ||||
| 			return o, nil | ||||
| 		} | ||||
|  | @ -369,7 +369,7 @@ func (c *Client) CreateOrderCert(ctx context.Context, url string, csr []byte, bu | |||
| 	} | ||||
| 	// The only acceptable status post finalize and WaitOrder is "valid". | ||||
| 	if o.Status != StatusValid { | ||||
| 		return nil, "", &OrderError{OrderURL: o.URI, Status: o.Status} | ||||
| 		return nil, "", &OrderError{OrderURL: o.URI, Status: o.Status, Problem: o.Error} | ||||
| 	} | ||||
| 	crt, err := c.fetchCertRFC(ctx, o.CertURL, bundle) | ||||
| 	return crt, o.CertURL, err | ||||
|  |  | |||
							
								
								
									
										5
									
								
								vendor/golang.org/x/crypto/acme/types.go
									
										
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										5
									
								
								vendor/golang.org/x/crypto/acme/types.go
									
										
									
										generated
									
									
										vendored
									
									
								
							|  | @ -154,13 +154,16 @@ func (a *AuthorizationError) Error() string { | |||
| 
 | ||||
| // OrderError is returned from Client's order related methods. | ||||
| // It indicates the order is unusable and the clients should start over with | ||||
| // AuthorizeOrder. | ||||
| // AuthorizeOrder. A Problem description may be provided with details on | ||||
| // what caused the order to become unusable. | ||||
| // | ||||
| // The clients can still fetch the order object from CA using GetOrder | ||||
| // to inspect its state. | ||||
| type OrderError struct { | ||||
| 	OrderURL string | ||||
| 	Status   string | ||||
| 	// Problem is the error that occurred while processing the order. | ||||
| 	Problem *Error | ||||
| } | ||||
| 
 | ||||
| func (oe *OrderError) Error() string { | ||||
|  |  | |||
							
								
								
									
										2
									
								
								vendor/golang.org/x/crypto/curve25519/curve25519.go
									
										
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								vendor/golang.org/x/crypto/curve25519/curve25519.go
									
										
									
										generated
									
									
										vendored
									
									
								
							|  | @ -36,7 +36,7 @@ func ScalarBaseMult(dst, scalar *[32]byte) { | |||
| 	curve := ecdh.X25519() | ||||
| 	priv, err := curve.NewPrivateKey(scalar[:]) | ||||
| 	if err != nil { | ||||
| 		panic("curve25519: internal error: scalarBaseMult was not 32 bytes") | ||||
| 		panic("curve25519: " + err.Error()) | ||||
| 	} | ||||
| 	copy(dst[:], priv.PublicKey().Bytes()) | ||||
| } | ||||
|  |  | |||
							
								
								
									
										2
									
								
								vendor/golang.org/x/crypto/ssh/common.go
									
										
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								vendor/golang.org/x/crypto/ssh/common.go
									
										
									
										generated
									
									
										vendored
									
									
								
							|  | @ -83,6 +83,7 @@ var ( | |||
| 	// supportedKexAlgos specifies key-exchange algorithms implemented by this | ||||
| 	// package in preference order, excluding those with security issues. | ||||
| 	supportedKexAlgos = []string{ | ||||
| 		KeyExchangeMLKEM768X25519, | ||||
| 		KeyExchangeCurve25519, | ||||
| 		KeyExchangeECDHP256, | ||||
| 		KeyExchangeECDHP384, | ||||
|  | @ -94,6 +95,7 @@ var ( | |||
| 	// defaultKexAlgos specifies the default preference for key-exchange | ||||
| 	// algorithms in preference order. | ||||
| 	defaultKexAlgos = []string{ | ||||
| 		KeyExchangeMLKEM768X25519, | ||||
| 		KeyExchangeCurve25519, | ||||
| 		KeyExchangeECDHP256, | ||||
| 		KeyExchangeECDHP384, | ||||
|  |  | |||
							
								
								
									
										32
									
								
								vendor/golang.org/x/crypto/ssh/kex.go
									
										
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										32
									
								
								vendor/golang.org/x/crypto/ssh/kex.go
									
										
									
										generated
									
									
										vendored
									
									
								
							|  | @ -9,7 +9,6 @@ import ( | |||
| 	"crypto/ecdsa" | ||||
| 	"crypto/elliptic" | ||||
| 	"crypto/rand" | ||||
| 	"crypto/subtle" | ||||
| 	"encoding/binary" | ||||
| 	"errors" | ||||
| 	"fmt" | ||||
|  | @ -439,6 +438,7 @@ func init() { | |||
| 	kexAlgoMap[keyExchangeCurve25519LibSSH] = &curve25519sha256{} | ||||
| 	kexAlgoMap[InsecureKeyExchangeDHGEXSHA1] = &dhGEXSHA{hashFunc: crypto.SHA1} | ||||
| 	kexAlgoMap[KeyExchangeDHGEXSHA256] = &dhGEXSHA{hashFunc: crypto.SHA256} | ||||
| 	kexAlgoMap[KeyExchangeMLKEM768X25519] = &mlkem768WithCurve25519sha256{} | ||||
| } | ||||
| 
 | ||||
| // curve25519sha256 implements the curve25519-sha256 (formerly known as | ||||
|  | @ -454,15 +454,17 @@ func (kp *curve25519KeyPair) generate(rand io.Reader) error { | |||
| 	if _, err := io.ReadFull(rand, kp.priv[:]); err != nil { | ||||
| 		return err | ||||
| 	} | ||||
| 	curve25519.ScalarBaseMult(&kp.pub, &kp.priv) | ||||
| 	p, err := curve25519.X25519(kp.priv[:], curve25519.Basepoint) | ||||
| 	if err != nil { | ||||
| 		return fmt.Errorf("curve25519: %w", err) | ||||
| 	} | ||||
| 	if len(p) != 32 { | ||||
| 		return fmt.Errorf("curve25519: internal error: X25519 returned %d bytes, expected 32", len(p)) | ||||
| 	} | ||||
| 	copy(kp.pub[:], p) | ||||
| 	return nil | ||||
| } | ||||
| 
 | ||||
| // curve25519Zeros is just an array of 32 zero bytes so that we have something | ||||
| // convenient to compare against in order to reject curve25519 points with the | ||||
| // wrong order. | ||||
| var curve25519Zeros [32]byte | ||||
| 
 | ||||
| func (kex *curve25519sha256) Client(c packetConn, rand io.Reader, magics *handshakeMagics) (*kexResult, error) { | ||||
| 	var kp curve25519KeyPair | ||||
| 	if err := kp.generate(rand); err != nil { | ||||
|  | @ -485,11 +487,9 @@ func (kex *curve25519sha256) Client(c packetConn, rand io.Reader, magics *handsh | |||
| 		return nil, errors.New("ssh: peer's curve25519 public value has wrong length") | ||||
| 	} | ||||
| 
 | ||||
| 	var servPub, secret [32]byte | ||||
| 	copy(servPub[:], reply.EphemeralPubKey) | ||||
| 	curve25519.ScalarMult(&secret, &kp.priv, &servPub) | ||||
| 	if subtle.ConstantTimeCompare(secret[:], curve25519Zeros[:]) == 1 { | ||||
| 		return nil, errors.New("ssh: peer's curve25519 public value has wrong order") | ||||
| 	secret, err := curve25519.X25519(kp.priv[:], reply.EphemeralPubKey) | ||||
| 	if err != nil { | ||||
| 		return nil, fmt.Errorf("ssh: peer's curve25519 public value is not valid: %w", err) | ||||
| 	} | ||||
| 
 | ||||
| 	h := crypto.SHA256.New() | ||||
|  | @ -531,11 +531,9 @@ func (kex *curve25519sha256) Server(c packetConn, rand io.Reader, magics *handsh | |||
| 		return nil, err | ||||
| 	} | ||||
| 
 | ||||
| 	var clientPub, secret [32]byte | ||||
| 	copy(clientPub[:], kexInit.ClientPubKey) | ||||
| 	curve25519.ScalarMult(&secret, &kp.priv, &clientPub) | ||||
| 	if subtle.ConstantTimeCompare(secret[:], curve25519Zeros[:]) == 1 { | ||||
| 		return nil, errors.New("ssh: peer's curve25519 public value has wrong order") | ||||
| 	secret, err := curve25519.X25519(kp.priv[:], kexInit.ClientPubKey) | ||||
| 	if err != nil { | ||||
| 		return nil, fmt.Errorf("ssh: peer's curve25519 public value is not valid: %w", err) | ||||
| 	} | ||||
| 
 | ||||
| 	hostKeyBytes := priv.PublicKey().Marshal() | ||||
|  |  | |||
							
								
								
									
										15
									
								
								vendor/golang.org/x/crypto/ssh/mlkem.go
									
										
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										15
									
								
								vendor/golang.org/x/crypto/ssh/mlkem.go
									
										
									
										generated
									
									
										vendored
									
									
								
							|  | @ -2,8 +2,6 @@ | |||
| // Use of this source code is governed by a BSD-style | ||||
| // license that can be found in the LICENSE file. | ||||
| 
 | ||||
| //go:build go1.24 | ||||
| 
 | ||||
| package ssh | ||||
| 
 | ||||
| import ( | ||||
|  | @ -13,23 +11,10 @@ import ( | |||
| 	"errors" | ||||
| 	"fmt" | ||||
| 	"io" | ||||
| 	"runtime" | ||||
| 	"slices" | ||||
| 
 | ||||
| 	"golang.org/x/crypto/curve25519" | ||||
| ) | ||||
| 
 | ||||
| func init() { | ||||
| 	// After Go 1.24rc1 mlkem swapped the order of return values of Encapsulate. | ||||
| 	// See #70950. | ||||
| 	if runtime.Version() == "go1.24rc1" { | ||||
| 		return | ||||
| 	} | ||||
| 	supportedKexAlgos = slices.Insert(supportedKexAlgos, 0, KeyExchangeMLKEM768X25519) | ||||
| 	defaultKexAlgos = slices.Insert(defaultKexAlgos, 0, KeyExchangeMLKEM768X25519) | ||||
| 	kexAlgoMap[KeyExchangeMLKEM768X25519] = &mlkem768WithCurve25519sha256{} | ||||
| } | ||||
| 
 | ||||
| // mlkem768WithCurve25519sha256 implements the hybrid ML-KEM768 with | ||||
| // curve25519-sha256 key exchange method, as described by | ||||
| // draft-kampanakis-curdle-ssh-pq-ke-05 section 2.3.3. | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue