Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

crypto/internal/boring: Use alias.InexactOverlap #69439

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+7 −19
Open

crypto/internal/boring: Use alias.InexactOverlap #69439

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 7 additions & 19 deletions src/crypto/internal/boring/aes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ import "C"
import (
"bytes"
"crypto/cipher"
"crypto/internal/alias"
"errors"
"runtime"
"strconv"
Expand Down Expand Up @@ -89,7 +90,7 @@ func NewAESCipher(key []byte) (cipher.Block, error) {
func (c *aesCipher) BlockSize() int { return aesBlockSize }

func (c *aesCipher) Encrypt(dst, src []byte) {
if inexactOverlap(dst, src) {
if alias.InexactOverlap(dst, src) {
panic("crypto/cipher: invalid buffer overlap")
}
if len(src) < aesBlockSize {
Expand All @@ -105,7 +106,7 @@ func (c *aesCipher) Encrypt(dst, src []byte) {
}

func (c *aesCipher) Decrypt(dst, src []byte) {
if inexactOverlap(dst, src) {
if alias.InexactOverlap(dst, src) {
panic("crypto/cipher: invalid buffer overlap")
}
if len(src) < aesBlockSize {
Expand All @@ -129,7 +130,7 @@ type aesCBC struct {
func (x *aesCBC) BlockSize() int { return aesBlockSize }

func (x *aesCBC) CryptBlocks(dst, src []byte) {
if inexactOverlap(dst, src) {
if alias.InexactOverlap(dst, src) {
panic("crypto/cipher: invalid buffer overlap")
}
if len(src)%aesBlockSize != 0 {
Expand Down Expand Up @@ -174,7 +175,7 @@ type aesCTR struct {
}

func (x *aesCTR) XORKeyStream(dst, src []byte) {
if inexactOverlap(dst, src) {
if alias.InexactOverlap(dst, src) {
panic("crypto/cipher: invalid buffer overlap")
}
if len(dst) < len(src) {
Expand Down Expand Up @@ -329,7 +330,7 @@ func (g *aesGCM) Seal(dst, nonce, plaintext, additionalData []byte) []byte {
dst = dst[:n+len(plaintext)+gcmTagSize]

// Check delayed until now to make sure len(dst) is accurate.
if inexactOverlap(dst[n:], plaintext) {
if alias.InexactOverlap(dst[n:], plaintext) {
panic("cipher: invalid buffer overlap")
}

Expand Down Expand Up @@ -368,7 +369,7 @@ func (g *aesGCM) Open(dst, nonce, ciphertext, additionalData []byte) ([]byte, er
dst = dst[:n+len(ciphertext)-gcmTagSize]

// Check delayed until now to make sure len(dst) is accurate.
if inexactOverlap(dst[n:], ciphertext) {
if alias.InexactOverlap(dst[n:], ciphertext) {
panic("cipher: invalid buffer overlap")
}

Expand All @@ -385,16 +386,3 @@ func (g *aesGCM) Open(dst, nonce, ciphertext, additionalData []byte) ([]byte, er
}
return dst[:n+int(outLen)], nil
}

func anyOverlap(x, y []byte) bool {
return len(x) > 0 && len(y) > 0 &&
uintptr(unsafe.Pointer(&x[0])) <= uintptr(unsafe.Pointer(&y[len(y)-1])) &&
uintptr(unsafe.Pointer(&y[0])) <= uintptr(unsafe.Pointer(&x[len(x)-1]))
}

func inexactOverlap(x, y []byte) bool {
if len(x) == 0 || len(y) == 0 || &x[0] == &y[0] {
return false
}
return anyOverlap(x, y)
}