From f3523ebf36a4aa3237b6a5afc7ac0a5637aa0b65 Mon Sep 17 00:00:00 2001
From: Zack Scholl <zack.scholl@gmail.com>
Date: Tue, 26 Jun 2018 20:40:16 -0700
Subject: [PATCH] use hash words

---
 connect.go | 36 +++++++++++++++++++++++++++++++-----
 utils.go   |  8 ++++++++
 2 files changed, 39 insertions(+), 5 deletions(-)

diff --git a/connect.go b/connect.go
index 00b6f74..ba57d0d 100644
--- a/connect.go
+++ b/connect.go
@@ -12,6 +12,7 @@ import (
 	"os/signal"
 	"path"
 	"path/filepath"
+	"runtime"
 	"strconv"
 	"strings"
 	"sync"
@@ -233,7 +234,11 @@ func (c *Connection) Run() error {
 			fmt.Fprintf(os.Stderr, "Sending %s file named '%s'\n", humanize.Bytes(uint64(c.File.Size)), c.File.Name)
 		}
 		fmt.Fprintf(os.Stderr, "Code is: ")
-		color.New(color.FgHiGreen, color.Bold).Fprint(os.Stderr, c.Code)
+		if runtime.GOOS == "windows" {
+			color.New(color.FgHiGreen, color.Bold).Fprint(color.Output, c.Code)
+		} else {
+			color.New(color.FgHiGreen, color.Bold).Fprint(os.Stderr, c.Code)
+		}
 		fmt.Fprintf(os.Stderr, "\n\n")
 
 		c.spinner = spinner.New(spinner.CharSets[24], 100*time.Millisecond) // Build our new spinner
@@ -413,9 +418,19 @@ func (c *Connection) runClient(serverName string) error {
 					if id == 0 {
 						c.spinner.Stop()
 						fmt.Fprintf(os.Stderr, "Your public key: ")
-						color.New(color.FgHiRed).Fprintln(os.Stderr, c.keypair.Public)
+						if runtime.GOOS == "windows" {
+							color.New(color.FgHiRed).Fprintln(color.Output, HashWords(c.keypair.Public))
+						} else {
+							color.New(color.FgHiRed).Fprintln(os.Stderr, HashWords(c.keypair.Public))
+						}
+
 						fmt.Fprintf(os.Stderr, "Recipient public key: ")
-						color.New(color.FgHiYellow).Fprintln(os.Stderr, publicKeyRecipient)
+						if runtime.GOOS == "windows" {
+							color.New(color.FgHiYellow).Fprintln(color.Output, HashWords(publicKeyRecipient))
+						} else {
+							color.New(color.FgHiYellow).Fprintln(os.Stderr, HashWords(publicKeyRecipient))
+						}
+
 						getOK := "y"
 						if !c.Yes {
 							getOK = getInput("ok? (y/n): ")
@@ -584,8 +599,19 @@ func (c *Connection) runClient(serverName string) error {
 							fmt.Fprintf(os.Stderr, "Will not overwrite file!")
 							os.Exit(1)
 						}
-						fmt.Fprintf(os.Stderr, "Your public key: %s\n", c.keypair.Public)
-						fmt.Fprintf(os.Stderr, "Sender public key: %s\n", publicKeySender)
+						fmt.Fprintf(os.Stderr, "Your public key: ")
+						if runtime.GOOS == "windows" {
+							color.New(color.FgHiRed).Fprintln(color.Output, HashWords(c.keypair.Public))
+						} else {
+							color.New(color.FgHiRed).Fprintln(os.Stderr, HashWords(c.keypair.Public))
+						}
+
+						fmt.Fprintf(os.Stderr, "Sender public key: ")
+						if runtime.GOOS == "windows" {
+							color.New(color.FgHiYellow).Fprintln(color.Output, HashWords(publicKeySender))
+						} else {
+							color.New(color.FgHiYellow).Fprintln(os.Stderr, HashWords(publicKeySender))
+						}
 						getOK := "y"
 						if !c.Yes {
 							getOK = getInput("ok? (y/n): ")
diff --git a/utils.go b/utils.go
index 5b4a99f..51532fb 100644
--- a/utils.go
+++ b/utils.go
@@ -12,8 +12,16 @@ import (
 	"time"
 
 	"github.com/pkg/errors"
+	"github.com/schollz/bytetoword"
 )
 
+// HashWords returns word after hashing
+func HashWords(s string) string {
+	hasher := md5.New()
+	hasher.Write([]byte(s))
+	return bytetoword.EncodeToString(hasher.Sum(nil))
+}
+
 // CatFiles copies data from n files to a single one and removes source files
 // if Debug mode is set to false
 func CatFiles(files []string, outfile string, remove bool) error {