From 12d5b700333f5d7611e4348d0c7d18240f353362 Mon Sep 17 00:00:00 2001
From: Niall Sheridan <nsheridan@gmail.com>
Date: Sun, 22 May 2016 20:18:11 +0100
Subject: Move binaries into cmd/ directory

---
 client/keys.go | 82 ----------------------------------------------------------
 1 file changed, 82 deletions(-)
 delete mode 100644 client/keys.go

(limited to 'client/keys.go')

diff --git a/client/keys.go b/client/keys.go
deleted file mode 100644
index a2f95e9..0000000
--- a/client/keys.go
+++ /dev/null
@@ -1,82 +0,0 @@
-package main
-
-import (
-	"crypto/ecdsa"
-	"crypto/elliptic"
-	"crypto/rand"
-	"crypto/rsa"
-	"fmt"
-
-	"golang.org/x/crypto/ed25519"
-	"golang.org/x/crypto/ssh"
-)
-
-type key interface{}
-type keyfunc func(int) (key, ssh.PublicKey, error)
-
-var (
-	keytypes = map[string]keyfunc{
-		"rsa":     generateRSAKey,
-		"ecdsa":   generateECDSAKey,
-		"ed25519": generateED25519Key,
-	}
-)
-
-func generateED25519Key(bits int) (key, ssh.PublicKey, error) {
-	p, k, err := ed25519.GenerateKey(rand.Reader)
-	if err != nil {
-		return nil, nil, err
-	}
-	pub, err := ssh.NewPublicKey(p)
-	if err != nil {
-		return nil, nil, err
-	}
-	return k, pub, nil
-}
-
-func generateRSAKey(bits int) (key, ssh.PublicKey, error) {
-	k, err := rsa.GenerateKey(rand.Reader, bits)
-	if err != nil {
-		return nil, nil, err
-	}
-	pub, err := ssh.NewPublicKey(&k.PublicKey)
-	if err != nil {
-		return nil, nil, err
-	}
-	return k, pub, nil
-}
-
-func generateECDSAKey(bits int) (key, ssh.PublicKey, error) {
-	var curve elliptic.Curve
-	switch bits {
-	case 256:
-		curve = elliptic.P256()
-	case 384:
-		curve = elliptic.P384()
-	case 521:
-		curve = elliptic.P521()
-	default:
-		return nil, nil, fmt.Errorf("Unsupported key size. Valid sizes are '256', '384', '521'")
-	}
-	k, err := ecdsa.GenerateKey(curve, rand.Reader)
-	if err != nil {
-		return nil, nil, err
-	}
-	pub, err := ssh.NewPublicKey(&k.PublicKey)
-	if err != nil {
-		return nil, nil, err
-	}
-	return k, pub, nil
-}
-
-func generateKey(keytype string, bits int) (key, ssh.PublicKey, error) {
-	f, ok := keytypes[keytype]
-	if !ok {
-		var valid []string
-		for k := range keytypes {
-			valid = append(valid, k)
-		}
-		return nil, nil, fmt.Errorf("Unsupported key type %s. Valid choices are %s", keytype, valid)
-	}
-	return f(bits)
-}
-- 
cgit v1.2.3