Commit graph

764 commits

Author SHA1 Message Date
clowwindy
1459282ae6 only test some ciphers 2014-12-11 18:02:57 +08:00
clowwindy
4d5d6c7c85 add unit tests in encrypt 2014-12-11 17:47:12 +08:00
clowwindy
a377cc3fb2 remove coveralls 2014-12-11 15:57:30 +08:00
clowwindy
92e49099b6 remove pypy as it is too slow 2014-12-11 15:09:30 +08:00
clowwindy
95ed8a7576 add coveralls 2014-12-11 14:51:10 +08:00
clowwindy
60c16fae69 fix coverage 2014-12-11 14:41:53 +08:00
clowwindy
134bf332a4 remove domain not existed test(causing time out) 2014-12-11 14:13:58 +08:00
clowwindy
e1f2046229 lint code 2014-12-11 14:09:18 +08:00
clowwindy
030cdbcec0 add asyncdns test 2014-12-11 14:08:34 +08:00
clowwindy
d42a32fbc0 master should wait for child to quit 2014-12-11 13:00:08 +08:00
clowwindy
2a149a5b3f fix tests 2014-12-11 12:50:25 +08:00
clowwindy
c214dbf7b5 parallel libsodium and socksify builds 2014-12-11 12:46:52 +08:00
clowwindy
55630f5a7e add coverage 2014-12-11 12:43:16 +08:00
clowwindy
b4ce4b7f48 update CHANGES 2014-12-11 00:36:39 +08:00
clowwindy
5fe886efad bump 2014-12-11 00:06:56 +08:00
clowwindy
d7d9e5c103 add ldconfig 2014-12-10 23:46:16 +08:00
clowwindy
e6416562fc add salsa20 and chacha20 2014-12-10 23:19:11 +08:00
clowwindy
9d33a59b60 add libsodium tests 2014-12-10 23:15:24 +08:00
clowwindy
84dcff83c1 add libsodium support 2014-12-10 23:11:22 +08:00
clowwindy
ffcbf05975 bump 2014-11-10 15:48:26 +08:00
clowwindy
0a3730942f update CHANGES 2014-11-10 15:47:52 +08:00
clowwindy
fa31a233b6 add ipv6 tests 2014-11-10 15:04:30 +08:00
clowwindy
e476a54658 Merge pull request #214 from wb14123/py3-str
fix str/byte issue in python 3
2014-11-10 11:30:23 +08:00
Bin Wang
f43906006a fix str/byte issue in python 3 2014-11-10 10:37:37 +08:00
clowwindy
ea535c74b2 bump 2014-11-06 14:52:53 +08:00
clowwindy
143750f699 update README.rst 2014-11-06 14:52:15 +08:00
clowwindy
a8996b812b update CHANGES 2014-11-06 14:50:19 +08:00
clowwindy
70dae91e7c add tests for common.py 2014-11-06 14:04:28 +08:00
clowwindy
b5010df575 fix args on Python 3 2014-11-06 13:08:40 +08:00
clowwindy
4e3c055406 lint code 2014-11-06 12:58:14 +08:00
clowwindy
a88d47883b add tests for command line args 2014-11-06 12:56:00 +08:00
clowwindy
6bbf347d0e Merge branch 'master' of https://github.com/jinliu/shadowsocks into jinliu-master 2014-11-05 18:48:49 +08:00
clowwindy
5209860db1 fix cipher name in test 2014-11-05 18:42:01 +08:00
clowwindy
f9ba6f7390 fix table test 2014-11-05 18:40:51 +08:00
clowwindy
710fe14190 rename test_cipher as it will break unit tests 2014-11-05 18:32:01 +08:00
clowwindy
039451bcfb fix encrypt_all 2014-11-05 18:30:18 +08:00
clowwindy
cbf8c6705b refactor table into a single cipher plugin 2014-11-05 18:27:18 +08:00
clowwindy
2519fb9abe Merge pull request #208 from felixonmars/table-py3
encrypt.py: port table to support python 3 (recreated)
2014-11-05 17:15:43 +08:00
Felix Yan
aca86f8685 encrypt.py: port table to support python 3 2014-11-05 16:54:51 +08:00
刘缙
fb27cf52a9 Fix str/byte related TypeError in Python 3.4
Traceback (most recent call last):
File "/usr/bin/sslocal", line 9, in <module>
load_entry_point('shadowsocks==2.4', 'console_scripts', 'sslocal')()
File "/usr/lib/python3.4/site-packages/shadowsocks/local.py", line 68, in main
loop.run()
File "/usr/lib/python3.4/site-packages/shadowsocks/eventloop.py", line 230, in run
handler(events)
File "/usr/lib/python3.4/site-packages/shadowsocks/tcprelay.py", line 630, in _handle_events
handler.handle_event(sock, event)
File "/usr/lib/python3.4/site-packages/shadowsocks/tcprelay.py", line 458, in handle_event
self._on_local_read()
File "/usr/lib/python3.4/site-packages/shadowsocks/tcprelay.py", line 377, in _on_local_read
self._handle_stage_reply(data)
File "/usr/lib/python3.4/site-packages/shadowsocks/tcprelay.py", line 212, in _handle_stage_reply
s = remote_sock.sendto(data, MSG_FASTOPEN, self._chosen_server)
TypeError: 'str' does not support the buffer interface
2014-11-05 11:04:40 +08:00
clowwindy
7ac8434983 Update README.md 2014-11-03 18:14:25 +08:00
clowwindy
f02e9a3132 fix EVP_CIPHER_CTX_new's arg types 2014-11-02 17:13:56 +08:00
clowwindy
9fe3cf17d5 just start curl, don't wait 2014-11-02 01:33:31 +08:00
clowwindy
22b87f6f16 Merge pull request #205 from felixonmars/py3-logging
tcprelay.py: decode remote_addr to fix extra b'' in logging on python 3
2014-11-02 00:47:55 +08:00
Felix Yan
d971cb44a8 tcprelay.py: wrap long line for PEP8 2014-11-02 00:41:29 +08:00
Felix Yan
833c98e114 tcprelay.py: decode remote_addr to fix extra b'' in logging on python 3 2014-11-02 00:23:44 +08:00
clowwindy
4e08344035 bump 2014-11-02 00:10:06 +08:00
clowwindy
5892789005 refine tests: add time limit for curl; output shadowsocks logs 2014-11-01 23:52:28 +08:00
clowwindy
d64450915b Merge pull request #203 from felixonmars/setup-py3-fix
setup.py: use codecs.open() so it works for non-utf8 locales
2014-11-01 23:24:44 +08:00
Felix Yan
e6306f7b32 setup.py: use codecs.open() so it works for non-utf8 locales 2014-11-01 22:48:22 +08:00