Quellcode durchsuchen

Chore: Migrate to Go 1.25 (#5024)

* Try to update to go1.25

* Remove unsafe usage
风扇滑翔翼 vor 10 Monaten
Ursprung
Commit
5a8e9c25a4
2 geänderte Dateien mit 5 neuen und 6 gelöschten Zeilen
  1. 1 1
      go.mod
  2. 4 5
      main/commands/all/tls/ping.go

+ 1 - 1
go.mod

@@ -1,6 +1,6 @@
 module github.com/xtls/xray-core
 module github.com/xtls/xray-core
 
 
-go 1.24
+go 1.25
 
 
 require (
 require (
 	github.com/cloudflare/circl v1.6.1
 	github.com/cloudflare/circl v1.6.1

+ 4 - 5
main/commands/all/tls/ping.go

@@ -6,9 +6,7 @@ import (
 	"encoding/base64"
 	"encoding/base64"
 	"fmt"
 	"fmt"
 	"net"
 	"net"
-	"reflect"
 	"strconv"
 	"strconv"
-	"unsafe"
 
 
 	"github.com/xtls/xray-core/main/commands/base"
 	"github.com/xtls/xray-core/main/commands/base"
 	. "github.com/xtls/xray-core/transport/internet/tls"
 	. "github.com/xtls/xray-core/transport/internet/tls"
@@ -139,14 +137,15 @@ func printCertificates(certs []*x509.Certificate) {
 }
 }
 
 
 func printTLSConnDetail(tlsConn *gotls.Conn) {
 func printTLSConnDetail(tlsConn *gotls.Conn) {
+	connectionState := tlsConn.ConnectionState()
 	var tlsVersion string
 	var tlsVersion string
-	if tlsConn.ConnectionState().Version == gotls.VersionTLS13 {
+	if connectionState.Version == gotls.VersionTLS13 {
 		tlsVersion = "TLS 1.3"
 		tlsVersion = "TLS 1.3"
-	} else if tlsConn.ConnectionState().Version == gotls.VersionTLS12 {
+	} else if connectionState.Version == gotls.VersionTLS12 {
 		tlsVersion = "TLS 1.2"
 		tlsVersion = "TLS 1.2"
 	}
 	}
 	fmt.Println("TLS Version: ", tlsVersion)
 	fmt.Println("TLS Version: ", tlsVersion)
-	curveID := *(*gotls.CurveID)(unsafe.Pointer(reflect.ValueOf(tlsConn).Elem().FieldByName("curveID").UnsafeAddr()))
+	curveID := connectionState.CurveID
 	if curveID != 0 {
 	if curveID != 0 {
 		PostQuantum := (curveID == gotls.X25519MLKEM768)
 		PostQuantum := (curveID == gotls.X25519MLKEM768)
 		fmt.Println("TLS Post-Quantum key exchange: ", PostQuantum, "("+curveID.String()+")")
 		fmt.Println("TLS Post-Quantum key exchange: ", PostQuantum, "("+curveID.String()+")")