]> Sergey Matveev's repositories - btrtrc.git/commitdiff
Simplify crypto select func
authorMatt Joiner <anacrolix@gmail.com>
Thu, 8 Feb 2018 12:52:31 +0000 (23:52 +1100)
committerMatt Joiner <anacrolix@gmail.com>
Thu, 8 Feb 2018 12:52:31 +0000 (23:52 +1100)
handshake.go

index 6627b60839c6067fe1ca735033dbc08074e12d94..260c5420aa61fe57665ee590b4d4e7fc677fa67e 100644 (file)
@@ -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
 }