From 670abdb08e34d0d5a5f08af0b85e434d4a1ff18f Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Sun, 16 Apr 2017 00:47:20 +0200 Subject: numeric KeyNum --- gen.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gen.go') diff --git a/gen.go b/gen.go index 4b55b74..fcd6c95 100644 --- a/gen.go +++ b/gen.go @@ -3,6 +3,7 @@ package main import ( "crypto/rand" "crypto/sha512" + "encoding/binary" "golang.org/x/crypto/ed25519" ) @@ -20,7 +21,7 @@ func Generate(pubkeyfile, seckeyfile, comment string, rounds int) error { copy(enckey.SecKey[:], sec[:]) enckey.KDFRounds = uint32(rounds) // KDF - rand.Read(enckey.KeyNum[:]) + binary.Read(rand.Reader, binary.BigEndian, &enckey.KeyNum) rand.Read(enckey.Salt[:]) copy(enckey.Checksum[:], digest[:len(enckey.Checksum)]) @@ -39,7 +40,7 @@ func Generate(pubkeyfile, seckeyfile, comment string, rounds int) error { pubkey := new(PubKey) copy(pubkey.PKAlg[:], PKAlg[:]) - copy(pubkey.KeyNum[:], enckey.KeyNum[:]) + pubkey.KeyNum = enckey.KeyNum copy(pubkey.PubKey[:], pub[:]) pb64, err := Marshal(enckey) -- cgit v1.2.3