• Luke Champine's avatar
    crypto/ecies: improve concatKDF (#20836) · 462ddce5
    Luke Champine authored
    This removes a bunch of weird code around the counter overflow check in
    concatKDF and makes it actually work for different hash output sizes.
    
    The overflow check worked as follows: concatKDF applies the hash function N
    times, where N is roundup(kdLen, hashsize) / hashsize. N should not
    overflow 32 bits because that would lead to a repetition in the KDF output.
    
    A couple issues with the overflow check:
    
    - It used the hash.BlockSize, which is wrong because the
      block size is about the input of the hash function. Luckily, all standard
      hash functions have a block size that's greater than the output size, so
      concatKDF didn't crash, it just generated too much key material.
    - The check used big.Int to compare against 2^32-1.
    - The calculation could still overflow before reaching the check.
    
    The new code in concatKDF doesn't check for overflow. Instead, there is a
    new check on ECIESParams which ensures that params.KeyLen is < 512. This
    removes any possibility of overflow.
    
    There are a couple of miscellaneous improvements bundled in with this
    change:
    
    - The key buffer is pre-allocated instead of appending the hash output
      to an initially empty slice.
    - The code that uses concatKDF to derive keys is now shared between Encrypt
      and Decrypt.
    - There was a redundant invocation of IsOnCurve in Decrypt. This is now removed
      because elliptic.Unmarshal already checks whether the input is a valid curve
      point since Go 1.5.
    Co-authored-by: 's avatarFelix Lange <fjl@twurst.com>
    462ddce5
Name
Last commit
Last update
.github Loading commit data...
accounts Loading commit data...
build Loading commit data...
cmd Loading commit data...
common Loading commit data...
consensus Loading commit data...
console Loading commit data...
contracts/checkpointoracle Loading commit data...
core Loading commit data...
crypto Loading commit data...
docs/audits Loading commit data...
eth Loading commit data...
ethclient Loading commit data...
ethdb Loading commit data...
ethstats Loading commit data...
event Loading commit data...
graphql Loading commit data...
internal Loading commit data...
les Loading commit data...
light Loading commit data...
log Loading commit data...
metrics Loading commit data...
miner Loading commit data...
mobile Loading commit data...
node Loading commit data...
p2p Loading commit data...
params Loading commit data...
rlp Loading commit data...
rpc Loading commit data...
signer Loading commit data...
swarm Loading commit data...
tests Loading commit data...
trie Loading commit data...
whisper Loading commit data...
.dockerignore Loading commit data...
.gitattributes Loading commit data...
.gitignore Loading commit data...
.gitmodules Loading commit data...
.golangci.yml Loading commit data...
.mailmap Loading commit data...
.travis.yml Loading commit data...
AUTHORS Loading commit data...
COPYING Loading commit data...
COPYING.LESSER Loading commit data...
Dockerfile Loading commit data...
Dockerfile.alltools Loading commit data...
Makefile Loading commit data...
README.md Loading commit data...
SECURITY.md Loading commit data...
appveyor.yml Loading commit data...
circle.yml Loading commit data...
fuzzbuzz.yaml Loading commit data...
go.mod Loading commit data...
go.sum Loading commit data...
interfaces.go Loading commit data...