Index: /branches/rel_avx_2_7_4/src/backend/sys_cmd.c
===================================================================
--- /branches/rel_avx_2_7_4/src/backend/sys_cmd.c	(revision 9042)
+++ /branches/rel_avx_2_7_4/src/backend/sys_cmd.c	(working copy)
@@ -151,9 +151,9 @@
 #define SSHD_SRC_CONF_TMPFILE   "/etc/sshd_src.conf.tmp"
 
 #define MAX_SSH_CIPHER_TYPE 15
-#define SSH_SUPPORT_CIPHERS "3des-cbc,aes128-cbc,aes192-cbc,aes256-cbc,aes128-ctr,aes192-ctr,aes256-ctr,aes128-gcm@openssh.com,aes256-gcm@openssh.com,arcfour128,arcfour256,arcfour,blowfish-cbc,cast128-cbc,chacha20-poly1305@openssh.com"
+#define SSH_SUPPORT_CIPHERS "3des-cbc,aes128-cbc,aes192-cbc,aes256-cbc,aes128-ctr,aes192-ctr,aes256-ctr,aes128-gcm@openssh.com,aes256-gcm@openssh.com,arcfour128,arcfour256,arcfour,blowfish-cbc,cast128-cbc"
 #define MAX_SSH_MACS_ALGORITHM_TYPE 8 
-#define SSH_SUPPORT_MACS_ALGORITHMS "hmac-sha2-256,hmac-sha2-512,umac-64@openssh.com,umac-128@openssh.com,hmac-sha2-256-etm@openssh.com,hmac-sha2-512-etm@openssh.com,umac-64-etm@openssh.com,umac-128-etm@openssh.com"
+#define SSH_SUPPORT_MACS_ALGORITHMS "hmac-sha2-256,hmac-sha2-512,umac-64@openssh.com,umac-128@openssh.com"
 #define MAX_SSH_KEX_ALGORITHM_TYPE 5
 #define SSH_SUPPORT_KEX_ALGORITHMS "curve25519-sha256@libssh.org,diffie-hellman-group-exchange-sha256,ecdh-sha2-nistp256,ecdh-sha2-nistp384,ecdh-sha2-nistp521"
 
@@ -161,8 +161,8 @@
 #define SSH_BUFFSIZ 256
 #define SSHD_CONFIG_NOT_EXIST_PROMPT "file not exist"
 
-#define DEFAULT_SSH_CIPHERS "aes128-ctr,aes192-ctr,aes256-ctr,aes128-gcm@openssh.com,aes256-gcm@openssh.com,chacha20-poly1305@openssh.com"
-#define DEFAULT_SSH_MACS "hmac-sha2-256,hmac-sha2-512,umac-64@openssh.com,umac-128@openssh.com,hmac-sha2-256-etm@openssh.com,hmac-sha2-512-etm@openssh.com,umac-64-etm@openssh.com,umac-128-etm@openssh.com"
+#define DEFAULT_SSH_CIPHERS "aes128-ctr,aes192-ctr,aes256-ctr,aes128-gcm@openssh.com,aes256-gcm@openssh.com"
+#define DEFAULT_SSH_MACS "hmac-sha2-256,hmac-sha2-512,umac-64@openssh.com,umac-128@openssh.com"
 #define DEFAULT_SSH_KEX "curve25519-sha256@libssh.org,diffie-hellman-group-exchange-sha256,ecdh-sha2-nistp256,ecdh-sha2-nistp384,ecdh-sha2-nistp521"
 
 #define MAX_ALIVE_INTERVAL 86400
@@ -223,7 +223,6 @@
 	{"arcfour256", 0},
 	{"blowfish-cbc", 0},
 	{"cast128-cbc", 0},
-	{"chacha20-poly1305@openssh.com", 0},
 };
 /* ssh kex insecure algorithms */
 struct cipher_suite ssh_ciphers_insecure_protocol[] = {
@@ -238,10 +237,6 @@
 	{"hmac-sha2-512", 0},
 	{"umac-64@openssh.com", 0},
 	{"umac-128@openssh.com", 0},
-	{"hmac-sha2-256-etm@openssh.com", 0},
-	{"hmac-sha2-512-etm@openssh.com", 0},
-	{"umac-64-etm@openssh.com", 0},
-	{"umac-128-etm@openssh.com", 0},
 };
 struct kex_algorithm ssh_kex_algorithms [MAX_SSH_KEX_ALGORITHM_TYPE] = {
 	{"curve25519-sha256@libssh.org", 0},