Add support for chacha20-ietf-poly1305

[cuzfrog]

Thanks. chacha20-ietf seems not working properly against service that uses chacha20-ietf-poly1305

[GilBert1987]

It works thanks

[bringtree]

@Super-Tree cmake_prefix_path, set(CMAKE_PREFIX_PATH "/home/name/Qt/5.10.0/gcc_64") 这个怎么添加。。。 没用过cmake 求现成的 。 name 是bringtree qt 是 5.10.0

[bringtree]

@Super-Tree ok 搞定了谢谢哈

[bringtree]

@begeekmyfriend

Scanning dependencies of target QtShadowsocks_automoc
[  2%] Automatic moc for target QtShadowsocks
Generating moc_httpproxy.cpp
Generating moc_socketstream.cpp
Generating moc_tcprelay.cpp
Generating moc_tcpserver.cpp
Generating moc_udprelay.cpp
Generating moc_addresstester.cpp
Generating moc_controller.cpp
[  2%] Built target QtShadowsocks_automoc
Scanning dependencies of target QtShadowsocks
[  4%] Building CXX object lib/CMakeFiles/QtShadowsocks.dir/crypto/chacha.cpp.o
[  6%] Building CXX object lib/CMakeFiles/QtShadowsocks.dir/crypto/cipher.cpp.o
[  9%] Building CXX object lib/CMakeFiles/QtShadowsocks.dir/crypto/encryptor.cpp.o
[ 11%] Building CXX object lib/CMakeFiles/QtShadowsocks.dir/crypto/rc4.cpp.o
[ 13%] Building CXX object lib/CMakeFiles/QtShadowsocks.dir/network/httpproxy.cpp.o
[ 16%] Building CXX object lib/CMakeFiles/QtShadowsocks.dir/network/socketstream.cpp.o
[ 18%] Building CXX object lib/CMakeFiles/QtShadowsocks.dir/network/tcprelay.cpp.o
[ 20%] Building CXX object lib/CMakeFiles/QtShadowsocks.dir/network/tcpserver.cpp.o
[ 23%] Building CXX object lib/CMakeFiles/QtShadowsocks.dir/network/udprelay.cpp.o
[ 25%] Building CXX object lib/CMakeFiles/QtShadowsocks.dir/types/address.cpp.o
[ 27%] Building CXX object lib/CMakeFiles/QtShadowsocks.dir/types/profile.cpp.o
[ 30%] Building CXX object lib/CMakeFiles/QtShadowsocks.dir/util/addresstester.cpp.o
[ 32%] Building CXX object lib/CMakeFiles/QtShadowsocks.dir/util/common.cpp.o
[ 34%] Building CXX object lib/CMakeFiles/QtShadowsocks.dir/util/controller.cpp.o
[ 37%] Building CXX object lib/CMakeFiles/QtShadowsocks.dir/QtShadowsocks_automoc.cpp.o
[ 39%] Linking CXX shared library libQtShadowsocks.so
[ 39%] Built target QtShadowsocks
Scanning dependencies of target shadowsocks-libqss_automoc
[ 41%] Automatic moc for target shadowsocks-libqss
[ 41%] Built target shadowsocks-libqss_automoc
Scanning dependencies of target shadowsocks-libqss
[ 44%] Building CXX object shadowsocks-libqss/CMakeFiles/shadowsocks-libqss.dir/client.cpp.o
[ 46%] Building CXX object shadowsocks-libqss/CMakeFiles/shadowsocks-libqss.dir/main.cpp.o
[ 48%] Building CXX object shadowsocks-libqss/CMakeFiles/shadowsocks-libqss.dir/utils.cpp.o
[ 51%] Building CXX object shadowsocks-libqss/CMakeFiles/shadowsocks-libqss.dir/shadowsocks-libqss_automoc.cpp.o
[ 53%] Linking CXX executable shadowsocks-libqss
[ 53%] Built target shadowsocks-libqss
Scanning dependencies of target encryptor_automoc
[ 55%] Automatic moc for target encryptor
Generating encryptor.moc
[ 55%] Built target encryptor_automoc
Scanning dependencies of target encryptor
[ 58%] Building CXX object test/CMakeFiles/encryptor.dir/encryptor.cpp.o
/home/bringtree/桌面/libQtShadowsocks/test/encryptor.cpp: In member function ‘void Encryptor::testAesGcm()’:
/home/bringtree/桌面/libQtShadowsocks/test/encryptor.cpp:39:11: error: ‘Cipher’ does not name a type
     const Cipher::CipherInfo cInfo = Cipher::cipherInfoMap.at(method);
           ^
In file included from /home/bringtree/Qt5.10.0/5.10.0/gcc_64/include/QtTest/qtest.h:45:0,
                 from /home/bringtree/Qt5.10.0/5.10.0/gcc_64/include/QtTest/QtTest:7,
                 from /home/bringtree/桌面/libQtShadowsocks/test/encryptor.cpp:2:
/home/bringtree/桌面/libQtShadowsocks/test/encryptor.cpp:45:34: error: ‘cInfo’ was not declared in this scope
     QCOMPARE(encrypted.length(), cInfo.saltLen + 2 + cInfo.tagLen + testData.length() + cInfo.tagLen);
                                  ^
/home/bringtree/桌面/libQtShadowsocks/test/encryptor.cpp:51:38: error: ‘cInfo’ was not declared in this scope
     QCOMPARE(encrypted.length(), 2 + cInfo.tagLen + testData.length() + cInfo.tagLen);
                                      ^
/home/bringtree/桌面/libQtShadowsocks/test/encryptor.cpp: In member function ‘void Encryptor::testAesGcmUdp()’:
/home/bringtree/桌面/libQtShadowsocks/test/encryptor.cpp:60:11: error: ‘Cipher’ does not name a type
     const Cipher::CipherInfo cInfo = Cipher::cipherInfoMap.at(method);
           ^
In file included from /home/bringtree/Qt5.10.0/5.10.0/gcc_64/include/QtTest/qtest.h:45:0,
                 from /home/bringtree/Qt5.10.0/5.10.0/gcc_64/include/QtTest/QtTest:7,
                 from /home/bringtree/桌面/libQtShadowsocks/test/encryptor.cpp:2:
/home/bringtree/桌面/libQtShadowsocks/test/encryptor.cpp:66:34: error: ‘cInfo’ was not declared in this scope
     QCOMPARE(encrypted.length(), cInfo.saltLen + testData.length() + cInfo.tagLen);
                                  ^
/home/bringtree/桌面/libQtShadowsocks/test/encryptor.cpp:72:34: error: ‘cInfo’ was not declared in this scope
     QCOMPARE(encrypted.length(), cInfo.saltLen + testData.length() + cInfo.tagLen);
                                  ^
test/CMakeFiles/encryptor.dir/build.make:62: recipe for target 'test/CMakeFiles/encryptor.dir/encryptor.cpp.o' failed
make[2]: *** [test/CMakeFiles/encryptor.dir/encryptor.cpp.o] Error 1
CMakeFiles/Makefile2:276: recipe for target 'test/CMakeFiles/encryptor.dir/all' failed
make[1]: *** [test/CMakeFiles/encryptor.dir/all] Error 2
Makefile:138: recipe for target 'all' failed
make: *** [all] Error 2

[bringtree]

呃呃 我改成- qToBigEndian(inLen, reinterpret_cast<uint16_t*>(&rawLength[0])); 就好了

[begeekmyfriend]

@bringtree 见我第一个post最后一句话

[bringtree]

@begeekmyfriend 装完了 然后闪退 退回去用 shadowsocks-libev 。。。。。。

[MacchaX]

@begeekmyfriend 请教一下，我这个问题怎么解决呀，不是很懂，也不知道从何下手，十分感谢 [ 2%] Automatic MOC for target QtShadowsocks [ 2%] Built target QtShadowsocks_autogen [ 39%] Built target QtShadowsocks [ 41%] Automatic MOC for target shadowsocks-libqss [ 41%] Built target shadowsocks-libqss_autogen [ 53%] Built target shadowsocks-libqss [ 55%] Automatic MOC for target chacha [ 55%] Built target chacha_autogen [ 62%] Built target chacha [ 65%] Automatic MOC for target address [ 65%] Built target address_autogen [ 72%] Built target address [ 74%] Automatic MOC for target cipher [ 74%] Built target cipher_autogen [ 81%] Built target cipher [ 83%] Automatic MOC for target encryptor [ 83%] Built target encryptor_autogen [ 86%] Building CXX object test/CMakeFiles/encryptor.dir/encryptor.cpp.o /root/libQtShadowsocks/test/encryptor.cpp: In member function ‘void Encryptor::testAesGcm()’: /root/libQtShadowsocks/test/encryptor.cpp:39:11: error: ‘Cipher’ does not name a type; did you mean ‘QSslCipher’? const Cipher::CipherInfo cInfo = Cipher::cipherInfoMap.at(method);//Cipher ^~ QSslCipher In file included from /usr/include/i386-linux-gnu/qt5/QtTest/qtest.h:45:0, from /usr/include/i386-linux-gnu/qt5/QtTest/QtTest:7, from /root/libQtShadowsocks/test/encryptor.cpp:2: /root/libQtShadowsocks/test/encryptor.cpp:45:34: error: ‘cInfo’ was not declared in this scope QCOMPARE(encrypted.length(), cInfo.saltLen + 2 + cInfo.tagLen + testData.length() + cInfo.tagLen); ^ /root/libQtShadowsocks/test/encryptor.cpp:45:34: note: suggested alternative: ‘qInfo’ /root/libQtShadowsocks/test/encryptor.cpp:51:38: error: ‘cInfo’ was not declared in this scope QCOMPARE(encrypted.length(), 2 + cInfo.tagLen + testData.length() + cInfo.tagLen); ^ /root/libQtShadowsocks/test/encryptor.cpp:51:38: note: suggested alternative: ‘qInfo’ /root/libQtShadowsocks/test/encryptor.cpp: In member function ‘void Encryptor::testAesGcmUdp()’: /root/libQtShadowsocks/test/encryptor.cpp:60:11: error: ‘Cipher’ does not name a type; did you mean ‘QSslCipher’? const Cipher::CipherInfo cInfo = Cipher::cipherInfoMap.at(method);//Cipher ^~ QSslCipher In file included from /usr/include/i386-linux-gnu/qt5/QtTest/qtest.h:45:0, from /usr/include/i386-linux-gnu/qt5/QtTest/QtTest:7, from /root/libQtShadowsocks/test/encryptor.cpp:2: /root/libQtShadowsocks/test/encryptor.cpp:66:34: error: ‘cInfo’ was not declared in this scope QCOMPARE(encrypted.length(), cInfo.saltLen + testData.length() + cInfo.tagLen); ^ /root/libQtShadowsocks/test/encryptor.cpp:66:34: note: suggested alternative: ‘qInfo’ /root/libQtShadowsocks/test/encryptor.cpp:72:34: error: ‘cInfo’ was not declared in this scope QCOMPARE(encrypted.length(), cInfo.saltLen + testData.length() + cInfo.tagLen); ^ /root/libQtShadowsocks/test/encryptor.cpp:72:34: note: suggested alternative: ‘qInfo’ test/CMakeFiles/encryptor.dir/build.make:62: recipe for target 'test/CMakeFiles/encryptor.dir/encryptor.cpp.o' failed make[2]: [test/CMakeFiles/encryptor.dir/encryptor.cpp.o] Error 1 CMakeFiles/Makefile2:390: recipe for target 'test/CMakeFiles/encryptor.dir/all' failed make[1]: [test/CMakeFiles/encryptor.dir/all] Error 2 Makefile:140: recipe for target 'all' failed make: *** [all] Error 2

[librehat]

@MacchaX use stable branch please. I've also just fixed this error on master branch

[xianghongai]

# Change Line 8 as "On"

:-1:

---

折腾 libQtShadowsocks Dependencies Qt>= 5.5 都表示吃力了。

下载“Shadowsocks-Qt5-3.0.0-x86_64.AppImage”吧，点开即用，不用太折腾。

散了吧都～

[vision4fun]

@willwhui export CMAKE_PREFIX_PATH=/usr/......./qt5/ cmake ......

[heirish]

@ATKghost, I meet the same issue as yours, after add the botan-2's pkgconfig path to env variable PKG_CONFIG_PATH, it works.

$ ls /usr/local/lib/pkgconfig
botan-2.pc  QtShadowsocks.pc
$ export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH

Hope it helps.

[xmha97]

+1