Skip to content

Don't use encoding/binary #90

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

Merged
karianna merged 3 commits into from
Feb 24, 2025
Merged

Don't use encoding/binary #90

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ef51648
don't use encoding/binary
qmuntal Feb 24, 2025
dcc600e
fix bigUint32
qmuntal Feb 24, 2025
f5d58a7
use function
qmuntal Feb 24, 2025
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
8 changes: 6 additions & 2 deletions cng/hkdf.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
package cng

import (
"encoding/binary"
"errors"
"hash"
"runtime"
Expand Down Expand Up @@ -83,7 +82,7 @@ func ExtractHKDF(h func() hash.Hash, secret, salt []byte) ([]byte, error) {
if len(blob) < 4 {
return nil, errors.New("cng: exported key is corrupted")
}
cbHashName := binary.BigEndian.Uint32(blob)
cbHashName := bigEndianUint32(blob)
blob = blob[4:]
if len(blob) < int(cbHashName) {
return nil, errors.New("cng: exported key is corrupted")
Expand Down Expand Up @@ -122,3 +121,8 @@ func ExpandHKDF(h func() hash.Hash, pseudorandomKey, info []byte, keyLength int)
}
return out, err
}

func bigEndianUint32(b []byte) uint32 {
_ = b[3] // bounds check hint to compiler; see golang.org/issue/14808
return uint32(b[3]) | uint32(b[2])<<8 | uint32(b[1])<<16 | uint32(b[0])<<24
}