Skip to content

Commit c9cf6f1

Browse files
DMyachinrfjakob
authored andcommitted
Update hkdf.go
Use hkdf from stable api instead of eXperimental
1 parent 5b2ee48 commit c9cf6f1

File tree

1 file changed

+6
-9
lines changed

1 file changed

+6
-9
lines changed

internal/cryptocore/hkdf.go

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
package cryptocore
22

33
import (
4+
"crypto/hkdf"
45
"crypto/sha256"
56
"log"
6-
7-
"golang.org/x/crypto/hkdf"
87
)
98

109
const (
@@ -19,12 +18,10 @@ const (
1918
// hkdfDerive derives "outLen" bytes from "masterkey" and "info" using
2019
// HKDF-SHA256 (RFC 5869).
2120
// It returns the derived bytes or panics.
22-
func hkdfDerive(masterkey []byte, info string, outLen int) (out []byte) {
23-
h := hkdf.New(sha256.New, masterkey, nil, []byte(info))
24-
out = make([]byte, outLen)
25-
n, err := h.Read(out)
26-
if n != outLen || err != nil {
27-
log.Panicf("hkdfDerive: hkdf read failed, got %d bytes, error: %v", n, err)
21+
func hkdfDerive(masterkey []byte, info string, outLen int) []byte {
22+
key, err := hkdf.Key(sha256.New, masterkey, nil, info, outLen)
23+
if err != nil {
24+
log.Panicf("hkdfDerive: hkdf failed with error: %v", err)
2825
}
29-
return out
26+
return key
3027
}

0 commit comments

Comments
 (0)