Skip to content

Compatibility with RustCrypto #2

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

Open
daxpedda wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Compatibility with RustCrypto #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e500860
Compatibility with RustCrypto
daxpedda Nov 5, 2021
37a3c6d
Add test-vectors for both variants
daxpedda Nov 8, 2021
e2e1e30
Remove reversing bits
daxpedda Jun 22, 2022
f8ff472
Format code
daxpedda Jun 22, 2022
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
37 changes: 27 additions & 10 deletions balloon.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (
"encoding/binary"
"hash"
"math/big"
"math/bits"
)

const (
Expand Down Expand Up @@ -43,7 +44,7 @@ func BalloonM(hr func() hash.Hash, passphrase, salt []byte, sCost, tCost uint64,
for m := uint64(0); m < M; m++ {
go func(core uint64) {
binaryM := make([]byte, 8)
binary.BigEndian.PutUint64(binaryM, core)
binary.LittleEndian.PutUint64(binaryM, core)
bouts <- Balloon(hr(), passphrase, append(salt, binaryM...), sCost, tCost)
}(m + 1)
}
Expand Down Expand Up @@ -75,7 +76,7 @@ func (b *Instance) Expand(h hash.Hash, passphrase, salt []byte, sCost uint64) {
panic("balloon: internal buffer has wrong length")
}
h.Reset()
binary.Write(h, binary.BigEndian, b.Cnt)
binary.Write(h, binary.LittleEndian, b.Cnt)
b.Cnt++
h.Write(passphrase)
h.Write(salt)
Expand All @@ -84,7 +85,7 @@ func (b *Instance) Expand(h hash.Hash, passphrase, salt []byte, sCost uint64) {

for m := uint64(1); m < sCost; m++ {
h.Reset()
binary.Write(h, binary.BigEndian, b.Cnt)
binary.Write(h, binary.LittleEndian, b.Cnt)
h.Write(b.LastBlock)
b.LastBlock = h.Sum(nil)
copy(b.Buffer[b.Cnt*blockSize:], b.LastBlock)
Expand All @@ -106,7 +107,7 @@ func (b *Instance) Mix(h hash.Hash, salt []byte, sCost, tCost uint64) {
for t := uint64(0); t < tCost; t++ {
for m := uint64(0); m < sCost; m++ {
h.Reset()
binary.Write(h, binary.BigEndian, b.Cnt)
binary.Write(h, binary.LittleEndian, b.Cnt)
b.Cnt++
h.Write(b.LastBlock)
h.Write(b.Buffer[m*blockSize : (m+1)*blockSize])
Expand All @@ -115,17 +116,33 @@ func (b *Instance) Mix(h hash.Hash, salt []byte, sCost, tCost uint64) {

for i := uint64(0); i < delta; i++ {
h.Reset()
binary.Write(h, binary.BigEndian, b.Cnt)
binary.Write(h, binary.LittleEndian, t)
binary.Write(h, binary.LittleEndian, m)
binary.Write(h, binary.LittleEndian, i)
idxBlock := h.Sum(nil)
h.Reset()
binary.Write(h, binary.LittleEndian, b.Cnt)
b.Cnt++
h.Write(salt)
binary.Write(h, binary.BigEndian, t)
binary.Write(h, binary.BigEndian, m)
binary.Write(h, binary.BigEndian, i)
otherInt.SetBytes(h.Sum(nil))
h.Write(idxBlock)
otherBytes := h.Sum(nil)
otherWords := make([]big.Word, h.Size()/(bits.UintSize/8))

for byte, word := 0, 0; byte < len(otherBytes); byte, word = byte+bits.UintSize/8, word+1 {
if bits.UintSize == 64 {
otherWords[word] = big.Word(binary.LittleEndian.Uint64(otherBytes[byte : byte+bits.UintSize/8]))
} else if bits.UintSize == 32 {
otherWords[word] = big.Word(binary.LittleEndian.Uint32(otherBytes[byte : byte+bits.UintSize/8]))
} else {
panic("balloon: unsupported architecture")
}
}

otherInt.SetBits(otherWords)
otherInt.Mod(otherInt, sCostInt)
other := otherInt.Uint64()
h.Reset()
binary.Write(h, binary.BigEndian, b.Cnt)
binary.Write(h, binary.LittleEndian, b.Cnt)
b.Cnt++
h.Write(b.LastBlock)
h.Write(b.Buffer[other*blockSize : (other+1)*blockSize])
Expand Down
157 changes: 157 additions & 0 deletions balloon_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,10 @@ package balloon

import (
"crypto/rand"
"crypto/sha256"
"crypto/sha512"
"encoding/hex"
"reflect"
"testing"
)

Expand All @@ -30,3 +33,157 @@ func BenchmarkBalloonM(b *testing.B) {
BalloonM(sha512.New, ps[:8], ps[8:], 16, 16, 4)
}
}

func TestBalloonVectors(t *testing.T) {
type testVector struct {
password []byte
salt []byte
sCost uint64
tCost uint64
output string
}

testVectors := []testVector{
{
password: []byte("hunter42"),
salt: []byte("examplesalt"),
sCost: 1024,
tCost: 3,
output: "716043dff777b44aa7b88dcbab12c078abecfac9d289c5b5195967aa63440dfb",
},
{
password: []byte(""),
salt: []byte("salt"),
sCost: 3,
tCost: 3,
output: "5f02f8206f9cd212485c6bdf85527b698956701ad0852106f94b94ee94577378",
},
{
password: []byte("password"),
salt: []byte(""),
sCost: 3,
tCost: 3,
output: "20aa99d7fe3f4df4bd98c655c5480ec98b143107a331fd491deda885c4d6a6cc",
},
{
password: []byte("\000"),
salt: []byte("\000"),
sCost: 3,
tCost: 3,
output: "4fc7e302ffa29ae0eac31166cee7a552d1d71135f4e0da66486fb68a749b73a4",
},
{
password: []byte("password"),
salt: []byte("salt"),
sCost: 1,
tCost: 1,
output: "eefda4a8a75b461fa389c1dcfaf3e9dfacbc26f81f22e6f280d15cc18c417545",
},
}

for _, vector := range testVectors {
output := Balloon(sha256.New(), vector.password, vector.salt, vector.sCost, vector.tCost)
data, err := hex.DecodeString(vector.output)

if err != nil {
panic(err)
}

if !reflect.DeepEqual(output, data) {
t.Log("Expected: ", vector.output, " Output: ", hex.EncodeToString(output))
t.Fail()
}
}
}

func TestBalloonMVectors(t *testing.T) {
type testVector struct {
password []byte
salt []byte
sCost uint64
tCost uint64
pCost uint64
output string
}

testVectors := []testVector{
{
password: []byte("hunter42"),
salt: []byte("examplesalt"),
sCost: 1024,
tCost: 3,
pCost: 4,
output: "1832bd8e5cbeba1cb174a13838095e7e66508e9bf04c40178990adbc8ba9eb6f",
},
{
password: []byte(""),
salt: []byte("salt"),
sCost: 3,
tCost: 3,
pCost: 2,
output: "f8767fe04059cef67b4427cda99bf8bcdd983959dbd399a5e63ea04523716c23",
},
{
password: []byte("password"),
salt: []byte(""),
sCost: 3,
tCost: 3,
pCost: 3,
output: "bcad257eff3d1090b50276514857e60db5d0ec484129013ef3c88f7d36e438d6",
},
{
password: []byte("password"),
salt: []byte(""),
sCost: 3,
tCost: 3,
pCost: 1,
output: "498344ee9d31baf82cc93ebb3874fe0b76e164302c1cefa1b63a90a69afb9b4d",
},
{
password: []byte("\000"),
salt: []byte("\000"),
sCost: 3,
tCost: 3,
pCost: 4,
output: "8a665611e40710ba1fd78c181549c750f17c12e423c11930ce997f04c7153e0c",
},
{
password: []byte("\000"),
salt: []byte("\000"),
sCost: 3,
tCost: 3,
pCost: 1,
output: "d9e33c683451b21fb3720afbd78bf12518c1d4401fa39f054b052a145c968bb1",
},
{
password: []byte("password"),
salt: []byte("salt"),
sCost: 1,
tCost: 1,
pCost: 16,
output: "a67b383bb88a282aef595d98697f90820adf64582a4b3627c76b7da3d8bae915",
},
{
password: []byte("password"),
salt: []byte("salt"),
sCost: 1,
tCost: 1,
pCost: 1,
output: "97a11df9382a788c781929831d409d3599e0b67ab452ef834718114efdcd1c6d",
},
}

for _, vector := range testVectors {
output := BalloonM(sha256.New, vector.password, vector.salt, vector.sCost, vector.tCost, vector.pCost)
data, err := hex.DecodeString(vector.output)

if err != nil {
panic(err)
}

if !reflect.DeepEqual(output, data) {
t.Log("Expected: ", vector.output, " Output: ", hex.EncodeToString(output))
t.Fail()
}
}
}