From 7f34cbdaff1b952bace2ba00412af5934dc9bc04 Mon Sep 17 00:00:00 2001 From: Shelikhoo Date: Thu, 28 Dec 2017 11:14:45 +0800 Subject: [PATCH] Add Generated Files --- app/dns/errors.generated.go | 4 +- app/proxyman/errors.generated.go | 4 +- app/proxyman/inbound/errors.generated.go | 4 +- app/proxyman/mux/errors.generated.go | 4 +- app/proxyman/outbound/errors.generated.go | 4 +- .../crypto/internal/chacha_core.generated.go | 236 +++++++++--------- proxy/blackhole/errors.generated.go | 4 +- proxy/dokodemo/errors.generated.go | 4 +- proxy/freedom/errors.generated.go | 4 +- proxy/shadowsocks/errors.generated.go | 4 +- proxy/socks/errors.generated.go | 4 +- proxy/vmess/encoding/errors.generated.go | 4 +- proxy/vmess/errors.generated.go | 4 +- proxy/vmess/inbound/errors.generated.go | 4 +- proxy/vmess/outbound/errors.generated.go | 4 +- transport/internet/errors.generated.go | 4 +- .../internet/headers/http/errors.generated.go | 4 +- transport/internet/kcp/errors.generated.go | 4 +- transport/internet/tcp/errors.generated.go | 4 +- transport/internet/tls/errors.generated.go | 4 +- transport/internet/udp/errors.generated.go | 4 +- .../internet/websocket/errors.generated.go | 4 +- 22 files changed, 141 insertions(+), 179 deletions(-) diff --git a/app/dns/errors.generated.go b/app/dns/errors.generated.go index 19e34380..566fdfc1 100644 --- a/app/dns/errors.generated.go +++ b/app/dns/errors.generated.go @@ -1,5 +1,5 @@ -package dns +package server import "v2ray.com/core/common/errors" -func newError(values ...interface{}) *errors.Error { return errors.New(values...).Path("App", "DNS") } +func newError(values ...interface{}) *errors.Error { return errors.New(values...).Path("App", "DNS", "Server") } diff --git a/app/proxyman/errors.generated.go b/app/proxyman/errors.generated.go index b69ca4bc..61b32926 100644 --- a/app/proxyman/errors.generated.go +++ b/app/proxyman/errors.generated.go @@ -2,6 +2,4 @@ package proxyman import "v2ray.com/core/common/errors" -func newError(values ...interface{}) *errors.Error { - return errors.New(values...).Path("App", "Proxyman") -} +func newError(values ...interface{}) *errors.Error { return errors.New(values...).Path("App", "Proxyman") } diff --git a/app/proxyman/inbound/errors.generated.go b/app/proxyman/inbound/errors.generated.go index fa3906ff..1f72b406 100644 --- a/app/proxyman/inbound/errors.generated.go +++ b/app/proxyman/inbound/errors.generated.go @@ -2,6 +2,4 @@ package inbound import "v2ray.com/core/common/errors" -func newError(values ...interface{}) *errors.Error { - return errors.New(values...).Path("App", "Proxyman", "Inbound") -} +func newError(values ...interface{}) *errors.Error { return errors.New(values...).Path("App", "Proxyman", "Inbound") } diff --git a/app/proxyman/mux/errors.generated.go b/app/proxyman/mux/errors.generated.go index 6cbf45f6..5e262f1f 100644 --- a/app/proxyman/mux/errors.generated.go +++ b/app/proxyman/mux/errors.generated.go @@ -2,6 +2,4 @@ package mux import "v2ray.com/core/common/errors" -func newError(values ...interface{}) *errors.Error { - return errors.New(values...).Path("App", "Proxyman", "Mux") -} +func newError(values ...interface{}) *errors.Error { return errors.New(values...).Path("App", "Proxyman", "Mux") } diff --git a/app/proxyman/outbound/errors.generated.go b/app/proxyman/outbound/errors.generated.go index 8302131b..2d9c42ca 100644 --- a/app/proxyman/outbound/errors.generated.go +++ b/app/proxyman/outbound/errors.generated.go @@ -2,6 +2,4 @@ package outbound import "v2ray.com/core/common/errors" -func newError(values ...interface{}) *errors.Error { - return errors.New(values...).Path("App", "Proxyman", "Outbound") -} +func newError(values ...interface{}) *errors.Error { return errors.New(values...).Path("App", "Proxyman", "Outbound") } diff --git a/common/crypto/internal/chacha_core.generated.go b/common/crypto/internal/chacha_core.generated.go index a0b59788..add48d2e 100644 --- a/common/crypto/internal/chacha_core.generated.go +++ b/common/crypto/internal/chacha_core.generated.go @@ -2,122 +2,124 @@ package internal import "encoding/binary" -func ChaCha20Block(s *[16]uint32, out []byte, rounds int) { - var x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, x13, x14, x15 = s[0], s[1], s[2], s[3], s[4], s[5], s[6], s[7], s[8], s[9], s[10], s[11], s[12], s[13], s[14], s[15] - for i := 0; i < rounds; i += 2 { - var x uint32 - x0 += x4 - x = x12 ^ x0 - x12 = (x << 16) | (x >> (32 - 16)) - x8 += x12 - x = x4 ^ x8 - x4 = (x << 12) | (x >> (32 - 12)) - x0 += x4 - x = x12 ^ x0 - x12 = (x << 8) | (x >> (32 - 8)) - x8 += x12 - x = x4 ^ x8 - x4 = (x << 7) | (x >> (32 - 7)) - x1 += x5 - x = x13 ^ x1 - x13 = (x << 16) | (x >> (32 - 16)) - x9 += x13 - x = x5 ^ x9 - x5 = (x << 12) | (x >> (32 - 12)) - x1 += x5 - x = x13 ^ x1 - x13 = (x << 8) | (x >> (32 - 8)) - x9 += x13 - x = x5 ^ x9 - x5 = (x << 7) | (x >> (32 - 7)) - x2 += x6 - x = x14 ^ x2 - x14 = (x << 16) | (x >> (32 - 16)) - x10 += x14 - x = x6 ^ x10 - x6 = (x << 12) | (x >> (32 - 12)) - x2 += x6 - x = x14 ^ x2 - x14 = (x << 8) | (x >> (32 - 8)) - x10 += x14 - x = x6 ^ x10 - x6 = (x << 7) | (x >> (32 - 7)) - x3 += x7 - x = x15 ^ x3 - x15 = (x << 16) | (x >> (32 - 16)) - x11 += x15 - x = x7 ^ x11 - x7 = (x << 12) | (x >> (32 - 12)) - x3 += x7 - x = x15 ^ x3 - x15 = (x << 8) | (x >> (32 - 8)) - x11 += x15 - x = x7 ^ x11 - x7 = (x << 7) | (x >> (32 - 7)) - x0 += x5 - x = x15 ^ x0 - x15 = (x << 16) | (x >> (32 - 16)) - x10 += x15 - x = x5 ^ x10 - x5 = (x << 12) | (x >> (32 - 12)) - x0 += x5 - x = x15 ^ x0 - x15 = (x << 8) | (x >> (32 - 8)) - x10 += x15 - x = x5 ^ x10 - x5 = (x << 7) | (x >> (32 - 7)) - x1 += x6 - x = x12 ^ x1 - x12 = (x << 16) | (x >> (32 - 16)) - x11 += x12 - x = x6 ^ x11 - x6 = (x << 12) | (x >> (32 - 12)) - x1 += x6 - x = x12 ^ x1 - x12 = (x << 8) | (x >> (32 - 8)) - x11 += x12 - x = x6 ^ x11 - x6 = (x << 7) | (x >> (32 - 7)) - x2 += x7 - x = x13 ^ x2 - x13 = (x << 16) | (x >> (32 - 16)) - x8 += x13 - x = x7 ^ x8 - x7 = (x << 12) | (x >> (32 - 12)) - x2 += x7 - x = x13 ^ x2 - x13 = (x << 8) | (x >> (32 - 8)) - x8 += x13 - x = x7 ^ x8 - x7 = (x << 7) | (x >> (32 - 7)) - x3 += x4 - x = x14 ^ x3 - x14 = (x << 16) | (x >> (32 - 16)) - x9 += x14 - x = x4 ^ x9 - x4 = (x << 12) | (x >> (32 - 12)) - x3 += x4 - x = x14 ^ x3 - x14 = (x << 8) | (x >> (32 - 8)) - x9 += x14 - x = x4 ^ x9 - x4 = (x << 7) | (x >> (32 - 7)) - } - binary.LittleEndian.PutUint32(out[0:4], s[0]+x0) - binary.LittleEndian.PutUint32(out[4:8], s[1]+x1) - binary.LittleEndian.PutUint32(out[8:12], s[2]+x2) - binary.LittleEndian.PutUint32(out[12:16], s[3]+x3) - binary.LittleEndian.PutUint32(out[16:20], s[4]+x4) - binary.LittleEndian.PutUint32(out[20:24], s[5]+x5) - binary.LittleEndian.PutUint32(out[24:28], s[6]+x6) - binary.LittleEndian.PutUint32(out[28:32], s[7]+x7) - binary.LittleEndian.PutUint32(out[32:36], s[8]+x8) - binary.LittleEndian.PutUint32(out[36:40], s[9]+x9) - binary.LittleEndian.PutUint32(out[40:44], s[10]+x10) - binary.LittleEndian.PutUint32(out[44:48], s[11]+x11) - binary.LittleEndian.PutUint32(out[48:52], s[12]+x12) - binary.LittleEndian.PutUint32(out[52:56], s[13]+x13) - binary.LittleEndian.PutUint32(out[56:60], s[14]+x14) - binary.LittleEndian.PutUint32(out[60:64], s[15]+x15) +func ChaCha20Block(s *[16]uint32, out []byte, rounds int) { + var x0,x1,x2,x3,x4,x5,x6,x7,x8,x9,x10,x11,x12,x13,x14,x15 = s[0],s[1],s[2],s[3],s[4],s[5],s[6],s[7],s[8],s[9],s[10],s[11],s[12],s[13],s[14],s[15] + for i := 0; i < rounds; i+=2 { + var x uint32 + +x0+=x4 +x=x12^x0 +x12=(x << 16) | (x >> (32 - 16)) +x8+=x12 +x=x4^x8 +x4=(x << 12) | (x >> (32 - 12)) +x0+=x4 +x=x12^x0 +x12=(x << 8) | (x >> (32 - 8)) +x8+=x12 +x=x4^x8 +x4=(x << 7) | (x >> (32 - 7)) +x1+=x5 +x=x13^x1 +x13=(x << 16) | (x >> (32 - 16)) +x9+=x13 +x=x5^x9 +x5=(x << 12) | (x >> (32 - 12)) +x1+=x5 +x=x13^x1 +x13=(x << 8) | (x >> (32 - 8)) +x9+=x13 +x=x5^x9 +x5=(x << 7) | (x >> (32 - 7)) +x2+=x6 +x=x14^x2 +x14=(x << 16) | (x >> (32 - 16)) +x10+=x14 +x=x6^x10 +x6=(x << 12) | (x >> (32 - 12)) +x2+=x6 +x=x14^x2 +x14=(x << 8) | (x >> (32 - 8)) +x10+=x14 +x=x6^x10 +x6=(x << 7) | (x >> (32 - 7)) +x3+=x7 +x=x15^x3 +x15=(x << 16) | (x >> (32 - 16)) +x11+=x15 +x=x7^x11 +x7=(x << 12) | (x >> (32 - 12)) +x3+=x7 +x=x15^x3 +x15=(x << 8) | (x >> (32 - 8)) +x11+=x15 +x=x7^x11 +x7=(x << 7) | (x >> (32 - 7)) +x0+=x5 +x=x15^x0 +x15=(x << 16) | (x >> (32 - 16)) +x10+=x15 +x=x5^x10 +x5=(x << 12) | (x >> (32 - 12)) +x0+=x5 +x=x15^x0 +x15=(x << 8) | (x >> (32 - 8)) +x10+=x15 +x=x5^x10 +x5=(x << 7) | (x >> (32 - 7)) +x1+=x6 +x=x12^x1 +x12=(x << 16) | (x >> (32 - 16)) +x11+=x12 +x=x6^x11 +x6=(x << 12) | (x >> (32 - 12)) +x1+=x6 +x=x12^x1 +x12=(x << 8) | (x >> (32 - 8)) +x11+=x12 +x=x6^x11 +x6=(x << 7) | (x >> (32 - 7)) +x2+=x7 +x=x13^x2 +x13=(x << 16) | (x >> (32 - 16)) +x8+=x13 +x=x7^x8 +x7=(x << 12) | (x >> (32 - 12)) +x2+=x7 +x=x13^x2 +x13=(x << 8) | (x >> (32 - 8)) +x8+=x13 +x=x7^x8 +x7=(x << 7) | (x >> (32 - 7)) +x3+=x4 +x=x14^x3 +x14=(x << 16) | (x >> (32 - 16)) +x9+=x14 +x=x4^x9 +x4=(x << 12) | (x >> (32 - 12)) +x3+=x4 +x=x14^x3 +x14=(x << 8) | (x >> (32 - 8)) +x9+=x14 +x=x4^x9 +x4=(x << 7) | (x >> (32 - 7)) } +binary.LittleEndian.PutUint32(out[0:4], s[0]+x0) +binary.LittleEndian.PutUint32(out[4:8], s[1]+x1) +binary.LittleEndian.PutUint32(out[8:12], s[2]+x2) +binary.LittleEndian.PutUint32(out[12:16], s[3]+x3) +binary.LittleEndian.PutUint32(out[16:20], s[4]+x4) +binary.LittleEndian.PutUint32(out[20:24], s[5]+x5) +binary.LittleEndian.PutUint32(out[24:28], s[6]+x6) +binary.LittleEndian.PutUint32(out[28:32], s[7]+x7) +binary.LittleEndian.PutUint32(out[32:36], s[8]+x8) +binary.LittleEndian.PutUint32(out[36:40], s[9]+x9) +binary.LittleEndian.PutUint32(out[40:44], s[10]+x10) +binary.LittleEndian.PutUint32(out[44:48], s[11]+x11) +binary.LittleEndian.PutUint32(out[48:52], s[12]+x12) +binary.LittleEndian.PutUint32(out[52:56], s[13]+x13) +binary.LittleEndian.PutUint32(out[56:60], s[14]+x14) +binary.LittleEndian.PutUint32(out[60:64], s[15]+x15) +} + diff --git a/proxy/blackhole/errors.generated.go b/proxy/blackhole/errors.generated.go index 5c2e2d8a..05156031 100644 --- a/proxy/blackhole/errors.generated.go +++ b/proxy/blackhole/errors.generated.go @@ -2,6 +2,4 @@ package blackhole import "v2ray.com/core/common/errors" -func newError(values ...interface{}) *errors.Error { - return errors.New(values...).Path("Proxy", "Blackhole") -} +func newError(values ...interface{}) *errors.Error { return errors.New(values...).Path("Proxy", "Blackhole") } diff --git a/proxy/dokodemo/errors.generated.go b/proxy/dokodemo/errors.generated.go index 9b8537cd..73f1dc4a 100644 --- a/proxy/dokodemo/errors.generated.go +++ b/proxy/dokodemo/errors.generated.go @@ -2,6 +2,4 @@ package dokodemo import "v2ray.com/core/common/errors" -func newError(values ...interface{}) *errors.Error { - return errors.New(values...).Path("Proxy", "Dokodemo") -} +func newError(values ...interface{}) *errors.Error { return errors.New(values...).Path("Proxy", "Dokodemo") } diff --git a/proxy/freedom/errors.generated.go b/proxy/freedom/errors.generated.go index 16193718..1c08f356 100644 --- a/proxy/freedom/errors.generated.go +++ b/proxy/freedom/errors.generated.go @@ -2,6 +2,4 @@ package freedom import "v2ray.com/core/common/errors" -func newError(values ...interface{}) *errors.Error { - return errors.New(values...).Path("Proxy", "Freedom") -} +func newError(values ...interface{}) *errors.Error { return errors.New(values...).Path("Proxy", "Freedom") } diff --git a/proxy/shadowsocks/errors.generated.go b/proxy/shadowsocks/errors.generated.go index c6111ce6..fae67724 100644 --- a/proxy/shadowsocks/errors.generated.go +++ b/proxy/shadowsocks/errors.generated.go @@ -2,6 +2,4 @@ package shadowsocks import "v2ray.com/core/common/errors" -func newError(values ...interface{}) *errors.Error { - return errors.New(values...).Path("Proxy", "Shadowsocks") -} +func newError(values ...interface{}) *errors.Error { return errors.New(values...).Path("Proxy", "Shadowsocks") } diff --git a/proxy/socks/errors.generated.go b/proxy/socks/errors.generated.go index 03b2a2f3..e8d6f56e 100644 --- a/proxy/socks/errors.generated.go +++ b/proxy/socks/errors.generated.go @@ -2,6 +2,4 @@ package socks import "v2ray.com/core/common/errors" -func newError(values ...interface{}) *errors.Error { - return errors.New(values...).Path("Proxy", "Socks") -} +func newError(values ...interface{}) *errors.Error { return errors.New(values...).Path("Proxy", "Socks") } diff --git a/proxy/vmess/encoding/errors.generated.go b/proxy/vmess/encoding/errors.generated.go index 99b3a4f6..28397bbd 100644 --- a/proxy/vmess/encoding/errors.generated.go +++ b/proxy/vmess/encoding/errors.generated.go @@ -2,6 +2,4 @@ package encoding import "v2ray.com/core/common/errors" -func newError(values ...interface{}) *errors.Error { - return errors.New(values...).Path("Proxy", "VMess", "Encoding") -} +func newError(values ...interface{}) *errors.Error { return errors.New(values...).Path("Proxy", "VMess", "Encoding") } diff --git a/proxy/vmess/errors.generated.go b/proxy/vmess/errors.generated.go index 5a78d604..9670ca6b 100644 --- a/proxy/vmess/errors.generated.go +++ b/proxy/vmess/errors.generated.go @@ -2,6 +2,4 @@ package vmess import "v2ray.com/core/common/errors" -func newError(values ...interface{}) *errors.Error { - return errors.New(values...).Path("Proxy", "VMess") -} +func newError(values ...interface{}) *errors.Error { return errors.New(values...).Path("Proxy", "VMess") } diff --git a/proxy/vmess/inbound/errors.generated.go b/proxy/vmess/inbound/errors.generated.go index 620fd842..1a2181c6 100644 --- a/proxy/vmess/inbound/errors.generated.go +++ b/proxy/vmess/inbound/errors.generated.go @@ -2,6 +2,4 @@ package inbound import "v2ray.com/core/common/errors" -func newError(values ...interface{}) *errors.Error { - return errors.New(values...).Path("Proxy", "VMess", "Inbound") -} +func newError(values ...interface{}) *errors.Error { return errors.New(values...).Path("Proxy", "VMess", "Inbound") } diff --git a/proxy/vmess/outbound/errors.generated.go b/proxy/vmess/outbound/errors.generated.go index db918b89..a1dc30b1 100644 --- a/proxy/vmess/outbound/errors.generated.go +++ b/proxy/vmess/outbound/errors.generated.go @@ -2,6 +2,4 @@ package outbound import "v2ray.com/core/common/errors" -func newError(values ...interface{}) *errors.Error { - return errors.New(values...).Path("Proxy", "VMess", "Outbound") -} +func newError(values ...interface{}) *errors.Error { return errors.New(values...).Path("Proxy", "VMess", "Outbound") } diff --git a/transport/internet/errors.generated.go b/transport/internet/errors.generated.go index b174468e..58fcb660 100644 --- a/transport/internet/errors.generated.go +++ b/transport/internet/errors.generated.go @@ -2,6 +2,4 @@ package internet import "v2ray.com/core/common/errors" -func newError(values ...interface{}) *errors.Error { - return errors.New(values...).Path("Transport", "Internet") -} +func newError(values ...interface{}) *errors.Error { return errors.New(values...).Path("Transport", "Internet") } diff --git a/transport/internet/headers/http/errors.generated.go b/transport/internet/headers/http/errors.generated.go index 1c7b1d29..306d6153 100644 --- a/transport/internet/headers/http/errors.generated.go +++ b/transport/internet/headers/http/errors.generated.go @@ -2,6 +2,4 @@ package http import "v2ray.com/core/common/errors" -func newError(values ...interface{}) *errors.Error { - return errors.New(values...).Path("Transport", "Internet", "Headers", "HTTP") -} +func newError(values ...interface{}) *errors.Error { return errors.New(values...).Path("Transport", "Internet", "Headers", "HTTP") } diff --git a/transport/internet/kcp/errors.generated.go b/transport/internet/kcp/errors.generated.go index ebae01c1..88b76a67 100644 --- a/transport/internet/kcp/errors.generated.go +++ b/transport/internet/kcp/errors.generated.go @@ -2,6 +2,4 @@ package kcp import "v2ray.com/core/common/errors" -func newError(values ...interface{}) *errors.Error { - return errors.New(values...).Path("Transport", "Internet", "mKCP") -} +func newError(values ...interface{}) *errors.Error { return errors.New(values...).Path("Transport", "Internet", "mKCP") } diff --git a/transport/internet/tcp/errors.generated.go b/transport/internet/tcp/errors.generated.go index 5dfb2a2b..aadd97bd 100644 --- a/transport/internet/tcp/errors.generated.go +++ b/transport/internet/tcp/errors.generated.go @@ -2,6 +2,4 @@ package tcp import "v2ray.com/core/common/errors" -func newError(values ...interface{}) *errors.Error { - return errors.New(values...).Path("Transport", "Internet", "TCP") -} +func newError(values ...interface{}) *errors.Error { return errors.New(values...).Path("Transport", "Internet", "TCP") } diff --git a/transport/internet/tls/errors.generated.go b/transport/internet/tls/errors.generated.go index d48428e9..8b4d8356 100644 --- a/transport/internet/tls/errors.generated.go +++ b/transport/internet/tls/errors.generated.go @@ -2,6 +2,4 @@ package tls import "v2ray.com/core/common/errors" -func newError(values ...interface{}) *errors.Error { - return errors.New(values...).Path("Transport", "Internet", "TLS") -} +func newError(values ...interface{}) *errors.Error { return errors.New(values...).Path("Transport", "Internet", "TLS") } diff --git a/transport/internet/udp/errors.generated.go b/transport/internet/udp/errors.generated.go index 33667b60..8e9b7773 100644 --- a/transport/internet/udp/errors.generated.go +++ b/transport/internet/udp/errors.generated.go @@ -2,6 +2,4 @@ package udp import "v2ray.com/core/common/errors" -func newError(values ...interface{}) *errors.Error { - return errors.New(values...).Path("Transport", "Internet", "UDP") -} +func newError(values ...interface{}) *errors.Error { return errors.New(values...).Path("Transport", "Internet", "UDP") } diff --git a/transport/internet/websocket/errors.generated.go b/transport/internet/websocket/errors.generated.go index b94bfcdb..6536de61 100644 --- a/transport/internet/websocket/errors.generated.go +++ b/transport/internet/websocket/errors.generated.go @@ -2,6 +2,4 @@ package websocket import "v2ray.com/core/common/errors" -func newError(values ...interface{}) *errors.Error { - return errors.New(values...).Path("Transport", "Internet", "WebSocket") -} +func newError(values ...interface{}) *errors.Error { return errors.New(values...).Path("Transport", "Internet", "WebSocket") }