From: Matt Joiner <anacrolix@gmail.com>
Date: Thu, 8 Feb 2018 12:52:31 +0000 (+1100)
Subject: Simplify crypto select func
X-Git-Tag: v1.0.0~193
X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;h=e3fdd4890eee0ecd47478233479a170a4a03ae8d;p=btrtrc.git

Simplify crypto select func
---

diff --git a/handshake.go b/handshake.go
index 6627b608..260c5420 100644
--- a/handshake.go
+++ b/handshake.go
@@ -188,19 +188,16 @@ func handleEncryption(
 	}
 	headerEncrypted = true
 	ret, err = mse.ReceiveHandshake(rw, skeys, func(provides uint32) uint32 {
-		cryptoMethod = func() uint32 {
-			switch {
-			case policy.ForceEncryption:
-				return mse.CryptoMethodRC4
-			case policy.DisableEncryption:
-				return mse.CryptoMethodPlaintext
-			case policy.PreferNoEncryption && provides&mse.CryptoMethodPlaintext != 0:
-				return mse.CryptoMethodPlaintext
-			default:
-				return mse.DefaultCryptoSelector(provides)
-			}
-		}()
-		return cryptoMethod
+		switch {
+		case policy.ForceEncryption:
+			return mse.CryptoMethodRC4
+		case policy.DisableEncryption:
+			return mse.CryptoMethodPlaintext
+		case policy.PreferNoEncryption && provides&mse.CryptoMethodPlaintext != 0:
+			return mse.CryptoMethodPlaintext
+		default:
+			return mse.DefaultCryptoSelector(provides)
+		}
 	})
 	return
 }