RLPx p2p crypto layer (work in progress, do not merge)

cmd/ethereum/flags.go

@@ -65,6 +65,7 @@ var (
 	SHH             bool
 	Dial            bool
 	PrintVersion    bool
+	Encryption      bool
 )
 
 // flags specific to cli client
@@ -115,6 +116,7 @@ func Init() {
 	flag.BoolVar(&ShowGenesis, "genesis", false, "Dump the genesis block")
 	flag.StringVar(&ImportChain, "chain", "", "Imports given chain")
 
+	flag.BoolVar(&Encryption, "crypto", false, "whether to use encryption (experimental, temporary)")
 	flag.BoolVar(&Dump, "dump", false, "output the ethereum state in JSON format. Sub args [number, hash]")
 	flag.StringVar(&DumpHash, "hash", "", "specify arg in hex")
 	flag.IntVar(&DumpNumber, "number", -1, "specify arg in number")

cmd/ethereum/main.go

@@ -75,6 +75,7 @@ func main() {
 		KeyRing:    KeyRing,
 		Shh:        SHH,
 		Dial:       Dial,
+		Encryption: Encryption,
 	})
 
 	if err != nil {

eth/backend.go

@@ -36,8 +36,9 @@ type Config struct {
 	NATType    string
 	PMPGateway string
 
-	Shh  bool
-	Dial bool
+	Shh        bool
+	Dial       bool
+	Encryption bool
 
 	KeyManager *crypto.KeyManager
 }
@@ -107,7 +108,7 @@ func New(config *Config) (*Ethereum, error) {
 	keyManager.Init(config.KeyRing, 0, false)
 
 	// Create a new client id for this instance. This will help identifying the node on the network
-	clientId := p2p.NewSimpleClientIdentity(config.Name, config.Version, config.Identifier, keyManager.PublicKey())
+	clientId := p2p.NewSimpleClientIdentity(config.Name, config.Version, config.Identifier, keyManager.PrivateKey(), keyManager.PublicKey())
 
 	saveProtocolVersion(db)
 	//ethutil.Config.Db = db
@@ -143,12 +144,13 @@ func New(config *Config) (*Ethereum, error) {
 	fmt.Println(nat)
 
 	eth.net = &p2p.Server{
-		Identity:  clientId,
-		MaxPeers:  config.MaxPeers,
-		Protocols: protocols,
-		Blacklist: eth.blacklist,
-		NAT:       p2p.UPNP(),
-		NoDial:    !config.Dial,
+		Identity:   clientId,
+		MaxPeers:   config.MaxPeers,
+		Protocols:  protocols,
+		Blacklist:  eth.blacklist,
+		NAT:        p2p.UPNP(),
+		NoDial:     !config.Dial,
+		Encryption: config.Encryption,
 	}
 
 	if len(config.Port) > 0 {

eth/protocol.go

@@ -97,7 +97,7 @@ func runEthProtocol(txPool txPool, chainManager chainManager, blockPool blockPoo
 		blockPool:    blockPool,
 		rw:           rw,
 		peer:         peer,
-		id:           fmt.Sprintf("%x", peer.Identity().Pubkey()[:8]),
+		id:           fmt.Sprintf("%x", peer.PublicKey()[:8]),
 	}
 	err = self.handleStatus()
 	if err == nil {

p2p/client_identity.go

@@ -7,8 +7,9 @@ import (
 
 // ClientIdentity represents the identity of a peer.
 type ClientIdentity interface {
-	String() string // human readable identity
-	Pubkey() []byte // 512-bit public key
+	String() string     // human readable identity
+	PublicKey() []byte  // 512-bit public key represented in 65 byte format as per golang/elliptic.Marshal, first byte encodes curve
+	PrivateKey() []byte // 256-bit private key
 }
 
 type SimpleClientIdentity struct {
@@ -17,17 +18,19 @@ type SimpleClientIdentity struct {
 	customIdentifier string
 	os               string
 	implementation   string
+	privkey          []byte
 	pubkey           []byte
 }
 
-func NewSimpleClientIdentity(clientIdentifier string, version string, customIdentifier string, pubkey []byte) *SimpleClientIdentity {
+func NewSimpleClientIdentity(clientIdentifier string, version string, customIdentifier string, privkey []byte, pubkey []byte) *SimpleClientIdentity {
 	clientIdentity := &SimpleClientIdentity{
 		clientIdentifier: clientIdentifier,
 		version:          version,
 		customIdentifier: customIdentifier,
 		os:               runtime.GOOS,
 		implementation:   runtime.Version(),
 		pubkey:           pubkey,
+		privkey:          privkey,
 	}
 
 	return clientIdentity
@@ -50,8 +53,12 @@ func (c *SimpleClientIdentity) String() string {
 		c.implementation)
 }
 
-func (c *SimpleClientIdentity) Pubkey() []byte {
-	return []byte(c.pubkey)
+func (c *SimpleClientIdentity) PrivateKey() []byte {
+	return c.privkey
+}
+
+func (c *SimpleClientIdentity) PublicKey() []byte {
+	return c.pubkey
 }
 
 func (c *SimpleClientIdentity) SetCustomIdentifier(customIdentifier string) {

p2p/client_identity_test.go

@@ -1,13 +1,22 @@
 package p2p
 
 import (
+	"bytes"
 	"fmt"
 	"runtime"
 	"testing"
 )
 
 func TestClientIdentity(t *testing.T) {
-	clientIdentity := NewSimpleClientIdentity("Ethereum(G)", "0.5.16", "test", []byte("pubkey"))
+	clientIdentity := NewSimpleClientIdentity("Ethereum(G)", "0.5.16", "test", []byte("privkey"), []byte("pubkey"))
+	key := clientIdentity.PrivateKey()
+	if !bytes.Equal(key, []byte("privkey")) {
+		t.Errorf("Expected Privkey to be %x, got %x", key, []byte("privkey"))
+	}
+	key = clientIdentity.PublicKey()
+	if !bytes.Equal(key, []byte("pubkey")) {
+		t.Errorf("Expected Pubkey to be %x, got %x", key, []byte("pubkey"))
+	}
 	clientString := clientIdentity.String()
 	expected := fmt.Sprintf("Ethereum(G)/v0.5.16/test/%s/%s", runtime.GOOS, runtime.Version())
 	if clientString != expected {