vendor: update all dependencies

This commit is contained in:
Nick Craig-Wood
2017-07-23 08:51:42 +01:00
parent 0b6fba34a3
commit eb87cf6f12
2008 changed files with 352617 additions and 1004734 deletions
+19 -20
View File
@@ -23,6 +23,7 @@ package xts // import "golang.org/x/crypto/xts"
import (
"crypto/cipher"
"encoding/binary"
"errors"
)
@@ -65,21 +66,20 @@ func (c *Cipher) Encrypt(ciphertext, plaintext []byte, sectorNum uint64) {
}
var tweak [blockSize]byte
for i := 0; i < 8; i++ {
tweak[i] = byte(sectorNum)
sectorNum >>= 8
}
binary.LittleEndian.PutUint64(tweak[:8], sectorNum)
c.k2.Encrypt(tweak[:], tweak[:])
for i := 0; i < len(plaintext); i += blockSize {
for j := 0; j < blockSize; j++ {
ciphertext[i+j] = plaintext[i+j] ^ tweak[j]
for len(plaintext) > 0 {
for j := range tweak {
ciphertext[j] = plaintext[j] ^ tweak[j]
}
c.k1.Encrypt(ciphertext[i:], ciphertext[i:])
for j := 0; j < blockSize; j++ {
ciphertext[i+j] ^= tweak[j]
c.k1.Encrypt(ciphertext, ciphertext)
for j := range tweak {
ciphertext[j] ^= tweak[j]
}
plaintext = plaintext[blockSize:]
ciphertext = ciphertext[blockSize:]
mul2(&tweak)
}
@@ -97,21 +97,20 @@ func (c *Cipher) Decrypt(plaintext, ciphertext []byte, sectorNum uint64) {
}
var tweak [blockSize]byte
for i := 0; i < 8; i++ {
tweak[i] = byte(sectorNum)
sectorNum >>= 8
}
binary.LittleEndian.PutUint64(tweak[:8], sectorNum)
c.k2.Encrypt(tweak[:], tweak[:])
for i := 0; i < len(plaintext); i += blockSize {
for j := 0; j < blockSize; j++ {
plaintext[i+j] = ciphertext[i+j] ^ tweak[j]
for len(ciphertext) > 0 {
for j := range tweak {
plaintext[j] = ciphertext[j] ^ tweak[j]
}
c.k1.Decrypt(plaintext[i:], plaintext[i:])
for j := 0; j < blockSize; j++ {
plaintext[i+j] ^= tweak[j]
c.k1.Decrypt(plaintext, plaintext)
for j := range tweak {
plaintext[j] ^= tweak[j]
}
plaintext = plaintext[blockSize:]
ciphertext = ciphertext[blockSize:]
mul2(&tweak)
}