core: move crypto to core/crypto (#140)

- Move key-holder to authenticator

   Make core.keyHolder public as core.Authenticator, it
   is not required to make this part an interface.

- Make private when there is no need to go public.
- Fix data race

2 files changed, 0 insertions, 213 deletions

diff --git a/crypto/eth/eth.go b/crypto/eth/eth.go
deleted file mode 100644
index c3c5a7c..0000000
--- a/crypto/eth/eth.go
+++ /dev/null
@@ -1,120 +0,0 @@
-// Copyright 2018 The dexon-consensus-core Authors
-// This file is part of the dexon-consensus-core library.
-//
-// The dexon-consensus-core library is free software: you can redistribute it
-// and/or modify it under the terms of the GNU Lesser General Public License as
-// published by the Free Software Foundation, either version 3 of the License,
-// or (at your option) any later version.
-//
-// The dexon-consensus-core library is distributed in the hope that it will be
-// useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser
-// General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with the dexon-consensus-core library. If not, see
-// <http://www.gnu.org/licenses/>.
-
-package eth
-
-import (
-	"crypto/ecdsa"
-
-	ethcrypto "github.com/ethereum/go-ethereum/crypto"
-
-	"github.com/dexon-foundation/dexon-consensus-core/common"
-	"github.com/dexon-foundation/dexon-consensus-core/crypto"
-)
-
-// PrivateKey represents a private key structure used in geth and implments
-// Crypto.PrivateKey interface.
-type PrivateKey struct {
-	privateKey ecdsa.PrivateKey
-	publicKey  PublicKey
-}
-
-// PublicKey represents a public key structure used in geth and implements
-// Crypto.PublicKey interface.
-type PublicKey struct {
-	publicKey []byte
-}
-
-// NewPrivateKey creates a new PrivateKey structure.
-func NewPrivateKey() (*PrivateKey, error) {
-	key, err := ethcrypto.GenerateKey()
-	if err != nil {
-		return nil, err
-	}
-	return &PrivateKey{
-		privateKey: *key,
-		publicKey:  *newPublicKey(key),
-	}, nil
-}
-
-// newPublicKey creates a new PublicKey structure.
-func newPublicKey(prvKey *ecdsa.PrivateKey) *PublicKey {
-	return &PublicKey{
-		publicKey: ethcrypto.CompressPubkey(&prvKey.PublicKey),
-	}
-}
-
-// DecompressPubkey parses a public key in the 33-byte compressed format.
-func DecompressPubkey(pubkey []byte) (PublicKey, error) {
-	_, err := ethcrypto.DecompressPubkey(pubkey)
-	return PublicKey{
-		publicKey: pubkey,
-	}, err
-}
-
-// PublicKey returns the public key associate this private key.
-func (prv *PrivateKey) PublicKey() crypto.PublicKey {
-	return prv.publicKey
-}
-
-// Sign calculates an ECDSA signature.
-//
-// This function is susceptible to chosen plaintext attacks that can leak
-// information about the private key that is used for signing. Callers must
-// be aware that the given hash cannot be chosen by an adversery. Common
-// solution is to hash any input before calculating the signature.
-//
-// The produced signature is in the [R || S || V] format where V is 0 or 1.
-func (prv *PrivateKey) Sign(hash common.Hash) (
-	sig crypto.Signature, err error) {
-	s, err := ethcrypto.Sign(hash[:], &prv.privateKey)
-	sig = crypto.Signature(s)
-	return
-}
-
-// VerifySignature checks that the given public key created signature over hash.
-// The public key should be in compressed (33 bytes) or uncompressed (65 bytes)
-// format.
-// The signature should have the 64 byte [R || S] format.
-func (pub PublicKey) VerifySignature(
-	hash common.Hash, signature crypto.Signature) bool {
-	if len(signature) == 65 {
-		// The last byte is for ecrecover.
-		signature = signature[:64]
-	}
-	return ethcrypto.VerifySignature(pub.publicKey, hash[:], signature)
-}
-
-// Compress encodes a public key to the 33-byte compressed format.
-func (pub PublicKey) Compress() []byte {
-	return pub.publicKey
-}
-
-// Bytes returns the []byte representation of public key.
-func (pub PublicKey) Bytes() []byte {
-	return pub.Compress()
-}
-
-// SigToPub returns the PublicKey that created the given signature.
-func SigToPub(
-	hash common.Hash, signature crypto.Signature) (crypto.PublicKey, error) {
-	key, err := ethcrypto.SigToPub(hash[:], signature[:])
-	if err != nil {
-		return PublicKey{}, err
-	}
-	return PublicKey{publicKey: ethcrypto.CompressPubkey(key)}, nil
-}
diff --git a/crypto/eth/eth_test.go b/crypto/eth/eth_test.go
deleted file mode 100644
index f6f48cb..0000000
--- a/crypto/eth/eth_test.go
+++ /dev/null
@@ -1,93 +0,0 @@
-// Copyright 2018 The dexon-consensus-core Authors
-// This file is part of the dexon-consensus-core library.
-//
-// The dexon-consensus-core library is free software: you can redistribute it
-// and/or modify it under the terms of the GNU Lesser General Public License as
-// published by the Free Software Foundation, either version 3 of the License,
-// or (at your option) any later version.
-//
-// The dexon-consensus-core library is distributed in the hope that it will be
-// useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser
-// General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with the dexon-consensus-core library. If not, see
-// <http://www.gnu.org/licenses/>.
-
-package eth
-
-import (
-	"testing"
-
-	"github.com/dexon-foundation/dexon-consensus-core/common"
-	"github.com/dexon-foundation/dexon-consensus-core/crypto"
-	"github.com/stretchr/testify/suite"
-)
-
-type ETHCryptoTestSuite struct {
-	suite.Suite
-}
-
-func (s *ETHCryptoTestSuite) TestSignature() {
-	prv1, err := NewPrivateKey()
-	s.Require().Nil(err)
-	hash1 := common.NewRandomHash()
-	hash2 := common.NewRandomHash()
-
-	// Test that same private key should produce same signature.
-	sig11, err := prv1.Sign(hash1)
-	s.Require().Nil(err)
-	sig112, err := prv1.Sign(hash1)
-	s.Require().Nil(err)
-	s.Equal(sig11, sig112)
-
-	// Test that different private key should produce different signature.
-	prv2, err := NewPrivateKey()
-	s.Require().Nil(err)
-	sig21, err := prv2.Sign(hash1)
-	s.Require().Nil(err)
-	s.NotEqual(sig11, sig21)
-
-	// Test that different hash should produce different signature.
-	sig12, err := prv1.Sign(hash2)
-	s.Require().Nil(err)
-	s.NotEqual(sig11, sig12)
-
-	// Test VerifySignature with correct public key.
-	pub1, ok := prv1.PublicKey().(PublicKey)
-	s.Require().True(ok)
-	s.True(pub1.VerifySignature(hash1, sig11))
-
-	// Test VerifySignature with wrong hash.
-	s.False(pub1.VerifySignature(hash2, sig11))
-	// Test VerifySignature with wrong signature.
-	s.False(pub1.VerifySignature(hash1, sig21))
-	// Test VerifySignature with wrong public key.
-	pub2 := prv2.PublicKey()
-	s.False(pub2.VerifySignature(hash1, sig11))
-
-	// Test compress and decompress of public key.
-	compressPub1 := pub1.Compress()
-	decompressPub1, err := DecompressPubkey(compressPub1)
-	s.Require().Nil(err)
-	s.Equal(pub1, decompressPub1)
-	s.True(decompressPub1.VerifySignature(hash1, sig11))
-}
-
-func (s *ETHCryptoTestSuite) TestSigToPub() {
-	prv, err := NewPrivateKey()
-	s.Require().Nil(err)
-	data := "DEXON is infinitely scalable and low-latency."
-	hash := crypto.Keccak256Hash([]byte(data))
-	sigmsg, err := prv.Sign(hash)
-	s.Require().Nil(err)
-
-	pubkey, err := SigToPub(hash, sigmsg)
-	s.Require().Nil(err)
-	s.Equal(pubkey, prv.PublicKey())
-}
-
-func TestCrypto(t *testing.T) {
-	suite.Run(t, new(ETHCryptoTestSuite))
-}