mirrors/utls
1
0
Fork 0
mirror of https://github.com/refraction-networking/utls.git synced 2025-04-05 04:57:35 +03:00
Code Issues Projects Releases Packages Wiki Activity

crypto: replace encoding/binary in favour of internal/byteorder

Browse source 
Updates #54097

Change-Id: I827a5efd1736ce057b76f079466f2d9ead225898
GitHub-Last-Rev: 40af10469d85ce9f4bef4b40025589d9e44f43d6
GitHub-Pull-Request: golang/go#67321
Reviewed-on: https://go-review.googlesource.com/c/go/+/585017
Reviewed-by: Keith Randall <khr@golang.org>
Reviewed-by: Keith Randall <khr@google.com>
Auto-Submit: Keith Randall <khr@golang.org>
Commit-Queue: Ian Lance Taylor <iant@google.com>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Auto-Submit: Ian Lance Taylor <iant@google.com>
Reviewed-by: Ian Lance Taylor <iant@google.com>
This commit is contained in:
Mateusz Poliwczak 2024-05-11 09:37:50 +00:00 • committed by Gopher Robot
parent eae001cbd4
commit 5197ef4589
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
bogo_shim_test.go
View file

@ -2,11 +2,11 @@ package tls
import ( import (
"crypto/x509" "crypto/x509"
"encoding/binary"
"encoding/json" "encoding/json"
"encoding/pem" "encoding/pem"
"flag" "flag"
"fmt" "fmt"
"internal/byteorder"
"internal/testenv" "internal/testenv"
"io" "io"
"log" "log"
@ -186,7 +186,7 @@ func bogoShim() {
// Write the shim ID we were passed as a little endian uint64 // Write the shim ID we were passed as a little endian uint64
shimIDBytes := make([]byte, 8) shimIDBytes := make([]byte, 8)
binary.LittleEndian.PutUint64(shimIDBytes, *shimID) byteorder.LePutUint64(shimIDBytes, *shimID)
if _, err := conn.Write(shimIDBytes); err != nil { if _, err := conn.Write(shimIDBytes); err != nil {
log.Fatalf("failed to write shim id: %s", err) log.Fatalf("failed to write shim id: %s", err)
} }

4
handshake_client_test.go
View file

@ -10,10 +10,10 @@ import (
"crypto/rsa" "crypto/rsa"
"crypto/x509" "crypto/x509"
"encoding/base64" "encoding/base64"
"encoding/binary"
"encoding/pem" "encoding/pem"
"errors" "errors"
"fmt" "fmt"
"internal/byteorder"
"io" "io"
"math/big" "math/big"
"net" "net"
@ -202,7 +202,7 @@ func (test *clientTest) connFromCommand() (conn *recordingConn, child *exec.Cmd,
var serverInfo bytes.Buffer var serverInfo bytes.Buffer
for _, ext := range test.extensions { for _, ext := range test.extensions {
pem.Encode(&serverInfo, &pem.Block{ pem.Encode(&serverInfo, &pem.Block{
Type: fmt.Sprintf("SERVERINFO FOR EXTENSION %d", binary.BigEndian.Uint16(ext)), Type: fmt.Sprintf("SERVERINFO FOR EXTENSION %d", byteorder.BeUint16(ext)),
Bytes: ext, Bytes: ext,
}) })
} }

4
handshake_server_tls13.go
View file

@ -10,9 +10,9 @@ import (
"crypto" "crypto"
"crypto/hmac" "crypto/hmac"
"crypto/rsa" "crypto/rsa"
"encoding/binary"
"errors" "errors"
"hash" "hash"
"internal/byteorder"
"io" "io"
"time" "time"
) )
@ -866,7 +866,7 @@ func (c *Conn) sendSessionTicket(earlyData bool) error {
if _, err := c.config.rand().Read(ageAdd); err != nil { if _, err := c.config.rand().Read(ageAdd); err != nil {
return err return err
} }
m.ageAdd = binary.LittleEndian.Uint32(ageAdd) m.ageAdd = byteorder.LeUint32(ageAdd)
if earlyData { if earlyData {
// RFC 9001, Section 4.6.1 // RFC 9001, Section 4.6.1