From d7093eb0a2b67372cdae9233839f7753481d7f86 Mon Sep 17 00:00:00 2001
From: qinyuhang <qinyuhangxiaoxiang@gmail.com>
Date: Sat, 22 Oct 2016 11:40:04 +0800
Subject: [PATCH] sync ss-libev

support auth_aes128_md5 & auth_aes128_sha1 (TCP only)
---
 .../PreferencesWindowController.swift         |   4 ++++
 ShadowsocksX-NG/ss-local                      | Bin 390460 -> 390460 bytes
 2 files changed, 4 insertions(+)

diff --git a/ShadowsocksX-NG/PreferencesWindowController.swift b/ShadowsocksX-NG/PreferencesWindowController.swift
index 64958f0..b8a98d8 100644
--- a/ShadowsocksX-NG/PreferencesWindowController.swift
+++ b/ShadowsocksX-NG/PreferencesWindowController.swift
@@ -72,15 +72,19 @@ class PreferencesWindowController: NSWindowController
         ProtocolTextField.addItems(withObjectValues: [
             "origin",
             "verify_simple",
+            "verify_deflate",
             "verify_sha1",
             "auth_sha1",
             "auth_sha1_v2",
             "auth_sha1_v4",
+            "auth_aes128_sha1",
+            "auth_aes128_md5",
             ])
         ObfsTextField.addItems(withObjectValues: [
             "plain",
             "http_simple",
             "tls_simple",
+            "http_post",
             "random_head",
             "tls1.2_ticket_auth",
             ])
diff --git a/ShadowsocksX-NG/ss-local b/ShadowsocksX-NG/ss-local
index 154f71f78fc2a51f5df55e10436d890db64b1598..f30f8282f74120bfda7c80689d94314d40b5c271 100755
GIT binary patch
delta 482
zcmW-dze_?<6vuhT@9W3n;37Es2SoTMGzv*H1{oNw4$fI3MomHvJ!lYWinhwQ72<F+
z%H<7DEwQka5R#BGtR<pz?)3fez2|)IIj1}bmIuL1&dO2FSHf(RUbKotF(iTTJYtqW
zDh9uCvI`ha8)pe|A9c0zmQk?;3M<GPC%h`fJ<eG}EXd$w*HIJ=r;RF|mYxTG*u(~_
zq73|?mR5nB{K$~lf@>hMEwy#6Mmun)sG*hKh2IwN_Tc&i4)@_sP?P68KzvfbJCYoR
z@G)HDj85=J;*3fd`siM(-UVhXdgM>9PzlkQcDx49SK^qa9DpIwl2sHtZNv?DPx5rh
zQ#_++k>;8%IwUanijGCsyk;MHs%mxGm!_(A0&kovhN!^eJCZitaLT8wdCS-PLeio;
z?a-LxYTD_IIfOO!ZB)^ZwA6T%U%7K#pOek$b?qd`&YJ^~%@eUv02^)I-L^v?|DnCu
A8vp<R

delta 482
zcmW-dy-Px26vny7=k~EUxCllCPGuj4n|)GHfsjOFkb%+a;G895)FkB4g$ALfXe*32
zLVUqL;0{s{5k?Y15>ke>M0C!bo*&P9-sgOjn%+{=o6Z_p%DRe}h|r=|p$J+e;9o)1
z5J*PhcAU&ATD^|5j+l#<w5o2PYzX8xk#ijXmJ}~@&NiZ61}n3Jf~Y^`sH&vo&on>m
zVV7pKqBPu~S*<)->Btb@hwVV<Kx)HUwGUzU2vm;XHffSuAH#MDoSne#qA8y96tQlB
z>bc}F_%C2PPWuvnBu=}CmW!LK`VGbnn&+msDEr8#t?C`m*T*sUasY<-gRIie&Ld((
z104J$PlG(gGYSR`am@>AB(U&`nnA<7W&=42Xm!<)PXTRt-Z*!J4N-x$cO*<2<&;lZ
zbBwR|g@i#tZBd8gSnC}QVNHHJs^~|)1bLKSxpP=wlga5}ZN<sVIR_$>Ct@QHHs*MD
I)AW7(1KIkwlK=n!