itAdd cleanups to binaries. - tordam - A library for peer discovery inside the Tor network Err parazyd.org 70 hgit clone https://git.parazyd.org/tordam URL:https://git.parazyd.org/tordam parazyd.org 70 1Log /git/tordam/log.gph parazyd.org 70 1Files /git/tordam/files.gph parazyd.org 70 1Refs /git/tordam/refs.gph parazyd.org 70 1README /git/tordam/file/README.md.gph parazyd.org 70 1LICENSE /git/tordam/file/LICENSE.gph parazyd.org 70 i--- Err parazyd.org 70 1commit e39896f6b0f2298df068319b0941ca2c48912af8 /git/tordam/commit/e39896f6b0f2298df068319b0941ca2c48912af8.gph parazyd.org 70 1parent c787512bf95b13fd861fa7d881d2e10dbfb408d0 /git/tordam/commit/c787512bf95b13fd861fa7d881d2e10dbfb408d0.gph parazyd.org 70 hAuthor: parazyd URL:mailto:parazyd@dyne.org parazyd.org 70 iDate: Tue, 13 Mar 2018 13:32:38 +0100 Err parazyd.org 70 i Err parazyd.org 70 iAdd cleanups to binaries. Err parazyd.org 70 i Err parazyd.org 70 iDiffstat: Err parazyd.org 70 i M cmd/dam-client/main.go | 2 +- Err parazyd.org 70 i M cmd/dam-dir/main.go | 4 +--- Err parazyd.org 70 i M cmd/dam-dir/main_test.go | 13 ++++--------- Err parazyd.org 70 i Err parazyd.org 70 i3 files changed, 6 insertions(+), 13 deletions(-) Err parazyd.org 70 i--- Err parazyd.org 70 1diff --git a/cmd/dam-client/main.go b/cmd/dam-client/main.go /git/tordam/file/cmd/dam-client/main.go.gph parazyd.org 70 it@@ -87,7 +87,7 @@ func announce(dir string, vals map[string]string, privkey *rsa.PrivateKey) (bool Err parazyd.org 70 i return false, err Err parazyd.org 70 i } Err parazyd.org 70 i Err parazyd.org 70 i- decrypted, err := lib.DecryptMsgRsa([]byte(decodedSecret), privkey) Err parazyd.org 70 i+ decrypted, err := lib.DecryptMsgRsa(decodedSecret, privkey) Err parazyd.org 70 i if err != nil { Err parazyd.org 70 i return false, err Err parazyd.org 70 i } Err parazyd.org 70 1diff --git a/cmd/dam-dir/main.go b/cmd/dam-dir/main.go /git/tordam/file/cmd/dam-dir/main.go.gph parazyd.org 70 it@@ -209,9 +209,7 @@ func handlePost(rw http.ResponseWriter, request *http.Request) { Err parazyd.org 70 i Err parazyd.org 70 i // handleElse is a noop for anything that isn't /announce. We don't care about Err parazyd.org 70 i // other requests (yet). Err parazyd.org 70 i-func handleElse(rw http.ResponseWriter, request *http.Request) { Err parazyd.org 70 i- return Err parazyd.org 70 i-} Err parazyd.org 70 i+func handleElse(rw http.ResponseWriter, request *http.Request) {} Err parazyd.org 70 i Err parazyd.org 70 i func main() { Err parazyd.org 70 i var wg sync.WaitGroup Err parazyd.org 70 1diff --git a/cmd/dam-dir/main_test.go b/cmd/dam-dir/main_test.go /git/tordam/file/cmd/dam-dir/main_test.go.gph parazyd.org 70 it@@ -63,11 +63,7 @@ func getRespText(resp *http.Response) (msgStruct, error) { Err parazyd.org 70 i Err parazyd.org 70 i decoder := json.NewDecoder(resp.Body) Err parazyd.org 70 i err := decoder.Decode(&m) Err parazyd.org 70 i- if err != nil { Err parazyd.org 70 i- return m, err Err parazyd.org 70 i- } Err parazyd.org 70 i- Err parazyd.org 70 i- return m, nil Err parazyd.org 70 i+ return m, err Err parazyd.org 70 i } Err parazyd.org 70 i Err parazyd.org 70 i func firstAnnValid() (*http.Response, error) { Err parazyd.org 70 it@@ -141,7 +137,7 @@ func TestValidSecondHandshake(t *testing.T) { Err parazyd.org 70 i t.Fatal(err) Err parazyd.org 70 i } Err parazyd.org 70 i decryptedEncode := base64.StdEncoding.EncodeToString(decrypted) Err parazyd.org 70 i- sig, err := lib.SignMsgRsa([]byte(decryptedEncode), privkey) Err parazyd.org 70 i+ sig, _ := lib.SignMsgRsa([]byte(decryptedEncode), privkey) Err parazyd.org 70 i encodedSig := base64.StdEncoding.EncodeToString(sig) Err parazyd.org 70 i Err parazyd.org 70 i vals := ValidFirst Err parazyd.org 70 it@@ -157,11 +153,10 @@ func TestValidSecondHandshake(t *testing.T) { Err parazyd.org 70 i if err != nil { Err parazyd.org 70 i t.Fatal(err) Err parazyd.org 70 i } Err parazyd.org 70 i- if m.Secret == lib.WelcomeMsg { Err parazyd.org 70 i- t.Log("Server replied:", m.Secret) Err parazyd.org 70 i- } else { Err parazyd.org 70 i+ if m.Secret != lib.WelcomeMsg { Err parazyd.org 70 i t.Fatal(m.Secret) Err parazyd.org 70 i } Err parazyd.org 70 i+ t.Log("Server replied:", m.Secret) Err parazyd.org 70 i } Err parazyd.org 70 i Err parazyd.org 70 i func TestInvalidNodetypeFirst(t *testing.T) { Err parazyd.org 70 .