From dff0230034dd140d6b541014c3dade235592896f Mon Sep 17 00:00:00 2001 From: Darien Raymond Date: Wed, 5 Apr 2017 22:55:26 +0200 Subject: [PATCH] add aead cipher --- proxy/shadowsocks/config.pb.go | 89 +++++++++++++++++++--------------- proxy/shadowsocks/config.proto | 3 ++ 2 files changed, 53 insertions(+), 39 deletions(-) diff --git a/proxy/shadowsocks/config.pb.go b/proxy/shadowsocks/config.pb.go index 7f106fbb..7549ffed 100644 --- a/proxy/shadowsocks/config.pb.go +++ b/proxy/shadowsocks/config.pb.go @@ -20,11 +20,14 @@ const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package type CipherType int32 const ( - CipherType_UNKNOWN CipherType = 0 - CipherType_AES_128_CFB CipherType = 1 - CipherType_AES_256_CFB CipherType = 2 - CipherType_CHACHA20 CipherType = 3 - CipherType_CHACHA20_IETF CipherType = 4 + CipherType_UNKNOWN CipherType = 0 + CipherType_AES_128_CFB CipherType = 1 + CipherType_AES_256_CFB CipherType = 2 + CipherType_CHACHA20 CipherType = 3 + CipherType_CHACHA20_IETF CipherType = 4 + CipherType_AES_128_GCM CipherType = 5 + CipherType_AES_256_GCM CipherType = 6 + CipherType_CHACHA20_POLY1305 CipherType = 7 ) var CipherType_name = map[int32]string{ @@ -33,13 +36,19 @@ var CipherType_name = map[int32]string{ 2: "AES_256_CFB", 3: "CHACHA20", 4: "CHACHA20_IETF", + 5: "AES_128_GCM", + 6: "AES_256_GCM", + 7: "CHACHA20_POLY1305", } var CipherType_value = map[string]int32{ - "UNKNOWN": 0, - "AES_128_CFB": 1, - "AES_256_CFB": 2, - "CHACHA20": 3, - "CHACHA20_IETF": 4, + "UNKNOWN": 0, + "AES_128_CFB": 1, + "AES_256_CFB": 2, + "CHACHA20": 3, + "CHACHA20_IETF": 4, + "AES_128_GCM": 5, + "AES_256_GCM": 6, + "CHACHA20_POLY1305": 7, } func (x CipherType) String() string { @@ -154,33 +163,35 @@ func init() { func init() { proto.RegisterFile("v2ray.com/core/proxy/shadowsocks/config.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 442 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x91, 0x4f, 0x6f, 0xd3, 0x40, - 0x10, 0xc5, 0xeb, 0x24, 0x6a, 0xc3, 0x38, 0x80, 0xd9, 0x53, 0x14, 0x55, 0xc2, 0xca, 0x29, 0x54, - 0x62, 0xdd, 0x2e, 0x7f, 0xc4, 0xd5, 0x31, 0xa9, 0x5a, 0x21, 0xa5, 0x91, 0x93, 0x82, 0x84, 0x90, - 0x2c, 0x77, 0xbd, 0x10, 0x8b, 0xd8, 0xb3, 0xda, 0xb5, 0x5b, 0xfc, 0x95, 0xf8, 0x66, 0x7c, 0x0b, - 0xe4, 0x75, 0xd2, 0x44, 0x1c, 0xcc, 0xcd, 0x33, 0x7e, 0xef, 0x79, 0xde, 0xcf, 0xf0, 0xfa, 0x9e, - 0xa9, 0xb8, 0xa2, 0x1c, 0x33, 0x8f, 0xa3, 0x12, 0x9e, 0x54, 0xf8, 0xab, 0xf2, 0xf4, 0x3a, 0x4e, - 0xf0, 0x41, 0x23, 0xff, 0xa9, 0x3d, 0x8e, 0xf9, 0xf7, 0xf4, 0x07, 0x95, 0x0a, 0x0b, 0x24, 0xa7, - 0x3b, 0xb9, 0x12, 0xd4, 0x48, 0xe9, 0x81, 0x74, 0xf4, 0xea, 0x9f, 0x30, 0x8e, 0x59, 0x86, 0xb9, - 0x67, 0xac, 0x1c, 0x37, 0x5e, 0xa9, 0x85, 0x6a, 0x82, 0x46, 0xe7, 0xff, 0x91, 0x6a, 0xa1, 0xee, - 0x85, 0x8a, 0xb4, 0x14, 0xbc, 0x71, 0x8c, 0xff, 0x58, 0x70, 0xe2, 0x73, 0x8e, 0x65, 0x5e, 0x90, - 0x11, 0xf4, 0x65, 0xac, 0xf5, 0x03, 0xaa, 0x64, 0x68, 0xb9, 0xd6, 0xe4, 0x49, 0xf8, 0x38, 0x93, - 0x6b, 0xb0, 0x79, 0x2a, 0xd7, 0x42, 0x45, 0x45, 0x25, 0xc5, 0xb0, 0xe3, 0x5a, 0x93, 0x67, 0x6c, - 0x42, 0xdb, 0x0e, 0xa7, 0x81, 0x31, 0xac, 0x2a, 0x29, 0x42, 0xe0, 0x8f, 0xcf, 0x24, 0x80, 0x2e, - 0x16, 0xf1, 0xb0, 0x6b, 0x22, 0x2e, 0xda, 0x23, 0xb6, 0xa7, 0xd1, 0x9b, 0x5c, 0xac, 0xd2, 0x4c, - 0xf8, 0x65, 0xb1, 0x0e, 0x6b, 0xf7, 0x98, 0x81, 0x7d, 0xb0, 0x23, 0x7d, 0xe8, 0xf9, 0x65, 0x81, - 0xce, 0x11, 0x19, 0x40, 0xff, 0x63, 0xaa, 0xe3, 0xbb, 0x8d, 0x48, 0x1c, 0x8b, 0xd8, 0x70, 0x32, - 0xcb, 0x9b, 0xa1, 0x33, 0x16, 0x30, 0x58, 0x1a, 0x00, 0x81, 0x81, 0x4f, 0x5e, 0x82, 0x5d, 0x26, - 0x32, 0x12, 0x8d, 0xc0, 0x54, 0xee, 0x87, 0x50, 0x26, 0x72, 0x6b, 0x21, 0x6f, 0xa1, 0x57, 0xc3, - 0x35, 0x6d, 0x6d, 0xe6, 0x1e, 0x9e, 0xda, 0x90, 0xa5, 0x3b, 0xb2, 0xf4, 0x56, 0x0b, 0x15, 0x1a, - 0xf5, 0x38, 0x84, 0x41, 0xb0, 0x49, 0x45, 0x5e, 0x6c, 0x3f, 0x33, 0x85, 0xe3, 0x86, 0xfb, 0xd0, - 0x72, 0xbb, 0x13, 0x9b, 0x9d, 0xb5, 0xe5, 0x34, 0x07, 0xce, 0xf2, 0x44, 0x62, 0x9a, 0x17, 0xe1, - 0xd6, 0x79, 0xf6, 0x0d, 0x60, 0x4f, 0xb3, 0x6e, 0x75, 0x3b, 0xff, 0x34, 0xbf, 0xf9, 0x32, 0x77, - 0x8e, 0xc8, 0x73, 0xb0, 0xfd, 0xd9, 0x32, 0xba, 0x60, 0x1f, 0xa2, 0xe0, 0x72, 0xea, 0x58, 0xbb, - 0x05, 0x7b, 0xf7, 0xde, 0x2c, 0x3a, 0x35, 0x92, 0xe0, 0xca, 0x0f, 0xae, 0x7c, 0x76, 0xee, 0x74, - 0xc9, 0x0b, 0x78, 0xba, 0x9b, 0xa2, 0xeb, 0xd9, 0xea, 0xd2, 0xe9, 0x4d, 0x17, 0xe0, 0x72, 0xcc, - 0x5a, 0xff, 0xc4, 0xc2, 0xfa, 0x6a, 0x1f, 0x8c, 0xbf, 0x3b, 0xa7, 0x9f, 0x59, 0x18, 0x57, 0x34, - 0xa8, 0xd5, 0x0b, 0xa3, 0x5e, 0xee, 0x5f, 0xdf, 0x1d, 0x9b, 0x42, 0x6f, 0xfe, 0x06, 0x00, 0x00, - 0xff, 0xff, 0x2b, 0x46, 0x7c, 0x1c, 0x09, 0x03, 0x00, 0x00, + // 470 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x91, 0xd1, 0x8e, 0xd2, 0x40, + 0x14, 0x86, 0xb7, 0x80, 0x80, 0xa7, 0xa8, 0xdd, 0x49, 0x4c, 0x08, 0xd9, 0x44, 0xc2, 0x15, 0x6e, + 0xe2, 0x14, 0xba, 0xae, 0xf1, 0xb6, 0x8c, 0xac, 0xbb, 0x51, 0x81, 0x14, 0x56, 0xa3, 0x37, 0x4d, + 0x77, 0x3a, 0x4a, 0x23, 0xed, 0x4c, 0x66, 0xda, 0x5d, 0xfb, 0x20, 0xbe, 0x84, 0x6f, 0xe6, 0x5b, + 0x98, 0x4e, 0x81, 0x6d, 0xbc, 0x60, 0xef, 0x7a, 0x4e, 0xff, 0xff, 0xef, 0x7f, 0xbe, 0xc2, 0xab, + 0x5b, 0x47, 0x06, 0x39, 0xa6, 0x3c, 0xb6, 0x29, 0x97, 0xcc, 0x16, 0x92, 0xff, 0xca, 0x6d, 0xb5, + 0x0e, 0x42, 0x7e, 0xa7, 0x38, 0xfd, 0xa9, 0x6c, 0xca, 0x93, 0xef, 0xd1, 0x0f, 0x2c, 0x24, 0x4f, + 0x39, 0x3a, 0xd9, 0xc9, 0x25, 0xc3, 0x5a, 0x8a, 0x2b, 0xd2, 0xde, 0xcb, 0xff, 0xc2, 0x28, 0x8f, + 0x63, 0x9e, 0xd8, 0xda, 0x4a, 0xf9, 0xc6, 0xce, 0x14, 0x93, 0x65, 0x50, 0x6f, 0xf4, 0x80, 0x54, + 0x31, 0x79, 0xcb, 0xa4, 0xaf, 0x04, 0xa3, 0xa5, 0x63, 0xf0, 0xd7, 0x80, 0x96, 0x4b, 0x29, 0xcf, + 0x92, 0x14, 0xf5, 0xa0, 0x2d, 0x02, 0xa5, 0xee, 0xb8, 0x0c, 0xbb, 0x46, 0xdf, 0x18, 0x3e, 0xf6, + 0xf6, 0x33, 0xba, 0x02, 0x93, 0x46, 0x62, 0xcd, 0xa4, 0x9f, 0xe6, 0x82, 0x75, 0x6b, 0x7d, 0x63, + 0xf8, 0xd4, 0x19, 0xe2, 0x43, 0xc5, 0x31, 0xd1, 0x86, 0x55, 0x2e, 0x98, 0x07, 0x74, 0xff, 0x8c, + 0x08, 0xd4, 0x79, 0x1a, 0x74, 0xeb, 0x3a, 0x62, 0x7c, 0x38, 0x62, 0x5b, 0x0d, 0xcf, 0x13, 0xb6, + 0x8a, 0x62, 0xe6, 0x66, 0xe9, 0xda, 0x2b, 0xdc, 0x03, 0x07, 0xcc, 0xca, 0x0e, 0xb5, 0xa1, 0xe1, + 0x66, 0x29, 0xb7, 0x8e, 0x50, 0x07, 0xda, 0xef, 0x22, 0x15, 0xdc, 0x6c, 0x58, 0x68, 0x19, 0xc8, + 0x84, 0xd6, 0x34, 0x29, 0x87, 0xda, 0x80, 0x41, 0x67, 0xa9, 0x01, 0x10, 0x0d, 0x1f, 0xbd, 0x00, + 0x33, 0x0b, 0x85, 0xcf, 0x4a, 0x81, 0x3e, 0xb9, 0xed, 0x41, 0x16, 0x8a, 0xad, 0x05, 0xbd, 0x86, + 0x46, 0x01, 0x57, 0x5f, 0x6b, 0x3a, 0xfd, 0x6a, 0xd5, 0x92, 0x2c, 0xde, 0x91, 0xc5, 0xd7, 0x8a, + 0x49, 0x4f, 0xab, 0x07, 0x1e, 0x74, 0xc8, 0x26, 0x62, 0x49, 0xba, 0xfd, 0xcc, 0x04, 0x9a, 0x25, + 0xf7, 0xae, 0xd1, 0xaf, 0x0f, 0x4d, 0xe7, 0xf4, 0x50, 0x4e, 0x59, 0x70, 0x9a, 0x84, 0x82, 0x47, + 0x49, 0xea, 0x6d, 0x9d, 0xa7, 0xbf, 0x0d, 0x80, 0x7b, 0x9c, 0xc5, 0x59, 0xd7, 0xb3, 0x0f, 0xb3, + 0xf9, 0x97, 0x99, 0x75, 0x84, 0x9e, 0x81, 0xe9, 0x4e, 0x97, 0xfe, 0xd8, 0x79, 0xeb, 0x93, 0x8b, + 0x89, 0x65, 0xec, 0x16, 0xce, 0xf9, 0x1b, 0xbd, 0xa8, 0x15, 0x4c, 0xc8, 0xa5, 0x4b, 0x2e, 0x5d, + 0x67, 0x64, 0xd5, 0xd1, 0x31, 0x3c, 0xd9, 0x4d, 0xfe, 0xd5, 0x74, 0x75, 0x61, 0x35, 0xaa, 0x11, + 0xef, 0xc9, 0x27, 0xeb, 0x51, 0x35, 0xa2, 0x58, 0x34, 0xd1, 0x73, 0x38, 0xde, 0x9b, 0x16, 0xf3, + 0x8f, 0x5f, 0xc7, 0x67, 0xa3, 0x73, 0xab, 0x35, 0x59, 0x40, 0x9f, 0xf2, 0xf8, 0xe0, 0x3f, 0x5c, + 0x18, 0xdf, 0xcc, 0xca, 0xf8, 0xa7, 0x76, 0xf2, 0xd9, 0xf1, 0x82, 0x1c, 0x93, 0x42, 0xbd, 0xd0, + 0xea, 0xe5, 0xfd, 0xeb, 0x9b, 0xa6, 0x46, 0x71, 0xf6, 0x2f, 0x00, 0x00, 0xff, 0xff, 0x37, 0x7d, + 0x8e, 0xab, 0x43, 0x03, 0x00, 0x00, } diff --git a/proxy/shadowsocks/config.proto b/proxy/shadowsocks/config.proto index 164f404b..fbc2c912 100644 --- a/proxy/shadowsocks/config.proto +++ b/proxy/shadowsocks/config.proto @@ -26,6 +26,9 @@ enum CipherType { AES_256_CFB = 2; CHACHA20 = 3; CHACHA20_IETF = 4; + AES_128_GCM = 5; + AES_256_GCM = 6; + CHACHA20_POLY1305 = 7; } message ServerConfig {