mirror of
				https://github.com/superseriousbusiness/gotosocial.git
				synced 2025-10-31 17:32:25 -05:00 
			
		
		
		
	[chore] update direct Go dependencies (#4162)
- update gruf/go-stroage v0.2.0 -> v0.2.1 - update KimMachineGun/automemlimit v0.7.1 -> v0.7.2 - update miekg/dns v1.1.65 -> v1.1.66 - update ncruces/go-sqlite3 v0.25.1 -> v0.25.2 - update spf13/cast v1.7.1 -> v1.8.0 - update tdewolff/minify/v2 v2.23.1 -> v2.23.5 - update x/crypto v0.37.0 -> v0.38.0 - update x/image v0.26.0 -> v0.27.0 - update x/net v0.39.0 -> v0.40.0 - update x/oauth2 v0.29.0 -> v0.30.0 - update x/sys v0.32.0 -> v0.33.0 - update x/text v0.24.0 -> v0.25.0 Reviewed-on: https://codeberg.org/superseriousbusiness/gotosocial/pulls/4162 Co-authored-by: kim <grufwub@gmail.com> Co-committed-by: kim <grufwub@gmail.com>
This commit is contained in:
		
					parent
					
						
							
								8c1511a494
							
						
					
				
			
			
				commit
				
					
						d2f13e7564
					
				
			
		
					 65 changed files with 1586 additions and 797 deletions
				
			
		
							
								
								
									
										187
									
								
								vendor/golang.org/x/crypto/ssh/mlkem.go
									
										
									
										generated
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										187
									
								
								vendor/golang.org/x/crypto/ssh/mlkem.go
									
										
									
										generated
									
									
										vendored
									
									
										Normal file
									
								
							|  | @ -0,0 +1,187 @@ | |||
| // Copyright 2024 The Go Authors. All rights reserved. | ||||
| // 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 ( | ||||
| 	"crypto" | ||||
| 	"crypto/mlkem" | ||||
| 	"crypto/sha256" | ||||
| 	"errors" | ||||
| 	"fmt" | ||||
| 	"io" | ||||
| 	"runtime" | ||||
| 	"slices" | ||||
| 
 | ||||
| 	"golang.org/x/crypto/curve25519" | ||||
| ) | ||||
| 
 | ||||
| const ( | ||||
| 	kexAlgoMLKEM768xCurve25519SHA256 = "mlkem768x25519-sha256" | ||||
| ) | ||||
| 
 | ||||
| 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, kexAlgoMLKEM768xCurve25519SHA256) | ||||
| 	preferredKexAlgos = slices.Insert(preferredKexAlgos, 0, kexAlgoMLKEM768xCurve25519SHA256) | ||||
| 	kexAlgoMap[kexAlgoMLKEM768xCurve25519SHA256] = &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. | ||||
| type mlkem768WithCurve25519sha256 struct{} | ||||
| 
 | ||||
| func (kex *mlkem768WithCurve25519sha256) Client(c packetConn, rand io.Reader, magics *handshakeMagics) (*kexResult, error) { | ||||
| 	var c25519kp curve25519KeyPair | ||||
| 	if err := c25519kp.generate(rand); err != nil { | ||||
| 		return nil, err | ||||
| 	} | ||||
| 
 | ||||
| 	seed := make([]byte, mlkem.SeedSize) | ||||
| 	if _, err := io.ReadFull(rand, seed); err != nil { | ||||
| 		return nil, err | ||||
| 	} | ||||
| 
 | ||||
| 	mlkemDk, err := mlkem.NewDecapsulationKey768(seed) | ||||
| 	if err != nil { | ||||
| 		return nil, err | ||||
| 	} | ||||
| 
 | ||||
| 	hybridKey := append(mlkemDk.EncapsulationKey().Bytes(), c25519kp.pub[:]...) | ||||
| 	if err := c.writePacket(Marshal(&kexECDHInitMsg{hybridKey})); err != nil { | ||||
| 		return nil, err | ||||
| 	} | ||||
| 
 | ||||
| 	packet, err := c.readPacket() | ||||
| 	if err != nil { | ||||
| 		return nil, err | ||||
| 	} | ||||
| 
 | ||||
| 	var reply kexECDHReplyMsg | ||||
| 	if err = Unmarshal(packet, &reply); err != nil { | ||||
| 		return nil, err | ||||
| 	} | ||||
| 
 | ||||
| 	if len(reply.EphemeralPubKey) != mlkem.CiphertextSize768+32 { | ||||
| 		return nil, errors.New("ssh: peer's mlkem768x25519 public value has wrong length") | ||||
| 	} | ||||
| 
 | ||||
| 	// Perform KEM decapsulate operation to obtain shared key from ML-KEM. | ||||
| 	mlkem768Secret, err := mlkemDk.Decapsulate(reply.EphemeralPubKey[:mlkem.CiphertextSize768]) | ||||
| 	if err != nil { | ||||
| 		return nil, err | ||||
| 	} | ||||
| 
 | ||||
| 	// Complete Curve25519 ECDH to obtain its shared key. | ||||
| 	c25519Secret, err := curve25519.X25519(c25519kp.priv[:], reply.EphemeralPubKey[mlkem.CiphertextSize768:]) | ||||
| 	if err != nil { | ||||
| 		return nil, fmt.Errorf("ssh: peer's mlkem768x25519 public value is not valid: %w", err) | ||||
| 	} | ||||
| 	// Compute actual shared key. | ||||
| 	h := sha256.New() | ||||
| 	h.Write(mlkem768Secret) | ||||
| 	h.Write(c25519Secret) | ||||
| 	secret := h.Sum(nil) | ||||
| 
 | ||||
| 	h.Reset() | ||||
| 	magics.write(h) | ||||
| 	writeString(h, reply.HostKey) | ||||
| 	writeString(h, hybridKey) | ||||
| 	writeString(h, reply.EphemeralPubKey) | ||||
| 
 | ||||
| 	K := make([]byte, stringLength(len(secret))) | ||||
| 	marshalString(K, secret) | ||||
| 	h.Write(K) | ||||
| 
 | ||||
| 	return &kexResult{ | ||||
| 		H:         h.Sum(nil), | ||||
| 		K:         K, | ||||
| 		HostKey:   reply.HostKey, | ||||
| 		Signature: reply.Signature, | ||||
| 		Hash:      crypto.SHA256, | ||||
| 	}, nil | ||||
| } | ||||
| 
 | ||||
| func (kex *mlkem768WithCurve25519sha256) Server(c packetConn, rand io.Reader, magics *handshakeMagics, priv AlgorithmSigner, algo string) (*kexResult, error) { | ||||
| 	packet, err := c.readPacket() | ||||
| 	if err != nil { | ||||
| 		return nil, err | ||||
| 	} | ||||
| 
 | ||||
| 	var kexInit kexECDHInitMsg | ||||
| 	if err = Unmarshal(packet, &kexInit); err != nil { | ||||
| 		return nil, err | ||||
| 	} | ||||
| 
 | ||||
| 	if len(kexInit.ClientPubKey) != mlkem.EncapsulationKeySize768+32 { | ||||
| 		return nil, errors.New("ssh: peer's ML-KEM768/curve25519 public value has wrong length") | ||||
| 	} | ||||
| 
 | ||||
| 	encapsulationKey, err := mlkem.NewEncapsulationKey768(kexInit.ClientPubKey[:mlkem.EncapsulationKeySize768]) | ||||
| 	if err != nil { | ||||
| 		return nil, fmt.Errorf("ssh: peer's ML-KEM768 encapsulation key is not valid: %w", err) | ||||
| 	} | ||||
| 	// Perform KEM encapsulate operation to obtain ciphertext and shared key. | ||||
| 	mlkem768Secret, mlkem768Ciphertext := encapsulationKey.Encapsulate() | ||||
| 
 | ||||
| 	// Perform server side of Curve25519 ECDH to obtain server public value and | ||||
| 	// shared key. | ||||
| 	var c25519kp curve25519KeyPair | ||||
| 	if err := c25519kp.generate(rand); err != nil { | ||||
| 		return nil, err | ||||
| 	} | ||||
| 	c25519Secret, err := curve25519.X25519(c25519kp.priv[:], kexInit.ClientPubKey[mlkem.EncapsulationKeySize768:]) | ||||
| 	if err != nil { | ||||
| 		return nil, fmt.Errorf("ssh: peer's ML-KEM768/curve25519 public value is not valid: %w", err) | ||||
| 	} | ||||
| 	hybridKey := append(mlkem768Ciphertext, c25519kp.pub[:]...) | ||||
| 
 | ||||
| 	// Compute actual shared key. | ||||
| 	h := sha256.New() | ||||
| 	h.Write(mlkem768Secret) | ||||
| 	h.Write(c25519Secret) | ||||
| 	secret := h.Sum(nil) | ||||
| 
 | ||||
| 	hostKeyBytes := priv.PublicKey().Marshal() | ||||
| 
 | ||||
| 	h.Reset() | ||||
| 	magics.write(h) | ||||
| 	writeString(h, hostKeyBytes) | ||||
| 	writeString(h, kexInit.ClientPubKey) | ||||
| 	writeString(h, hybridKey) | ||||
| 
 | ||||
| 	K := make([]byte, stringLength(len(secret))) | ||||
| 	marshalString(K, secret) | ||||
| 	h.Write(K) | ||||
| 
 | ||||
| 	H := h.Sum(nil) | ||||
| 
 | ||||
| 	sig, err := signAndMarshal(priv, rand, H, algo) | ||||
| 	if err != nil { | ||||
| 		return nil, err | ||||
| 	} | ||||
| 
 | ||||
| 	reply := kexECDHReplyMsg{ | ||||
| 		EphemeralPubKey: hybridKey, | ||||
| 		HostKey:         hostKeyBytes, | ||||
| 		Signature:       sig, | ||||
| 	} | ||||
| 	if err := c.writePacket(Marshal(&reply)); err != nil { | ||||
| 		return nil, err | ||||
| 	} | ||||
| 	return &kexResult{ | ||||
| 		H:         H, | ||||
| 		K:         K, | ||||
| 		HostKey:   hostKeyBytes, | ||||
| 		Signature: sig, | ||||
| 		Hash:      crypto.SHA256, | ||||
| 	}, nil | ||||
| } | ||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue