TrueCloudLab/rfc6979
15
0
Fork 3
Code Issues 1 Pull requests Projects Releases 2 Activity

Clean up HashAlgorithm a bit.

Browse source
This commit is contained in:
Coda Hale 2013-08-28 06:30:52 -07:00
parent 305d16d1de
commit da59853aa3
3 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
dsa_test.go
View file

@ -230,7 +230,10 @@ func TestDSASignatures(t *testing.T) {
func testDsaFixture(f *dsaFixture, t *testing.T) { func testDsaFixture(f *dsaFixture, t *testing.T) {
t.Logf("Testing %s", f.name) t.Logf("Testing %s", f.name)
digest := f.alg.digest([]byte(f.message)) h := f.alg()
h.Write([]byte(f.message))
digest := h.Sum(nil)
g := f.key.subgroup / 8 g := f.key.subgroup / 8
if len(digest) > g { if len(digest) > g {
digest = digest[0:g] digest = digest[0:g]

5
ecdsa_test.go
View file

@ -416,7 +416,10 @@ func ecdsaLoadInt(s string) (n *big.Int) {
func testEcsaFixture(f *ecdsaFixture, t *testing.T) { func testEcsaFixture(f *ecdsaFixture, t *testing.T) {
t.Logf("Testing %s", f.name) t.Logf("Testing %s", f.name)
digest := f.alg.digest([]byte(f.message)) h := f.alg()
h.Write([]byte(f.message))
digest := h.Sum(nil)
g := f.key.subgroup / 8 g := f.key.subgroup / 8
if len(digest) > g { if len(digest) > g {
digest = digest[0:g] digest = digest[0:g]

7
rfc6979.go
View file

@ -27,13 +27,6 @@ import (
// A function which provides a fresh Hash (e.g., sha256.New). // A function which provides a fresh Hash (e.g., sha256.New).
type HashAlgorithm func() hash.Hash type HashAlgorithm func() hash.Hash
// digest returns a digest of the given message.
func (alg HashAlgorithm) digest(m []byte) []byte {
h := alg()
h.Write(m)
return h.Sum(nil)
}
// mac returns an HMAC of the given key and message. // mac returns an HMAC of the given key and message.
func (alg HashAlgorithm) mac(k []byte, m []byte) []byte { func (alg HashAlgorithm) mac(k []byte, m []byte) []byte {
h := hmac.New(alg, k) h := hmac.New(alg, k)