Hello community, here is the log from the commit of package i2pd for openSUSE:Factory checked in at 2018-11-12 09:43:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/i2pd (Old) and /work/SRC/openSUSE:Factory/.i2pd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "i2pd" Mon Nov 12 09:43:22 2018 rev:2 rq:647691 version:2.22.0 Changes: -------- --- /work/SRC/openSUSE:Factory/i2pd/i2pd.changes 2018-10-31 13:13:07.071530624 +0100 +++ /work/SRC/openSUSE:Factory/.i2pd.new/i2pd.changes 2018-11-12 09:44:04.500951077 +0100 @@ -1,0 +2,9 @@ +Fri Nov 9 21:24:08 UTC 2018 - Alexei Podvalsky <[email protected]> + +- Update to 2.22.0: + * Multiple tunnel config files from tunnels.d folder + * Fetch own RouterInfo upon SessionRequest for NTCP2 + * Faster XOR between AES blocks for non AVX capable CPUs + * Fixed NTCP2 termination send + +------------------------------------------------------------------- Old: ---- i2pd-2.21.1.tar.gz New: ---- i2pd-2.22.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ i2pd.spec ++++++ --- /var/tmp/diff_new_pack.ekpMIj/_old 2018-11-12 09:44:05.760949154 +0100 +++ /var/tmp/diff_new_pack.ekpMIj/_new 2018-11-12 09:44:05.760949154 +0100 @@ -19,7 +19,7 @@ %define sysuser i2pd %define sysgroup i2pd Name: i2pd -Version: 2.21.1 +Version: 2.22.0 Release: 0 Summary: C++ implementation of an I2P client License: BSD-3-Clause @@ -139,8 +139,13 @@ %attr(0750,%{sysuser},%{sysgroup}) %dir %{_localstatedir}/lib/i2pd %{_localstatedir}/lib/i2pd/ %attr(0750,%{sysuser},%{sysgroup}) %dir %{_sysconfdir}/i2pd +%attr(0750,%{sysuser},%{sysgroup}) %dir %{_sysconfdir}/i2pd/tunnels.conf.d +%attr(0750,%{sysuser},%{sysgroup}) %dir %{_sysconfdir}/i2pd/tunnels.conf.d/tunnels.d %config(noreplace) %{_sysconfdir}/i2pd/i2pd.conf %config(noreplace) %{_sysconfdir}/i2pd/subscriptions.txt %config(noreplace) %{_sysconfdir}/i2pd/tunnels.conf +%config(noreplace) %{_sysconfdir}/i2pd/tunnels.conf.d/tunnels.d/IRC-Ilita.conf +%config(noreplace) %{_sysconfdir}/i2pd/tunnels.conf.d/tunnels.d/IRC-Irc2P.conf +%config(noreplace) %{_sysconfdir}/i2pd/tunnels.conf.d/tunnels.d/README %changelog ++++++ i2pd-2.21.1.tar.gz -> i2pd-2.22.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/i2pd-2.21.1/ChangeLog new/i2pd-2.22.0/ChangeLog --- old/i2pd-2.21.1/ChangeLog 2018-10-22 16:21:52.000000000 +0200 +++ new/i2pd-2.22.0/ChangeLog 2018-11-09 03:22:55.000000000 +0100 @@ -1,6 +1,15 @@ # for this file format description, # see https://github.com/olivierlacan/keep-a-changelog +## [2.22.0] - 2018-11-09 +### Added +- Multiple tunnel config files from tunnels.d folder +### Changed +- Fetch own RouterInfo upon SessionRequest for NTCP2 +- Faster XOR between AES blocks for non AVX capable CPUs +### Fixed +- Fixed NTCP2 termination send + ## [2.21.1] - 2018-10-22 ### Changed - cost=13 for unpublished NTCP2 address diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/i2pd-2.21.1/Win32/installer.iss new/i2pd-2.22.0/Win32/installer.iss --- old/i2pd-2.21.1/Win32/installer.iss 2018-10-22 16:21:52.000000000 +0200 +++ new/i2pd-2.22.0/Win32/installer.iss 2018-11-09 03:22:55.000000000 +0100 @@ -1,5 +1,5 @@ #define I2Pd_AppName "i2pd" -#define I2Pd_ver "2.21.1" +#define I2Pd_ver "2.22.0" #define I2Pd_Publisher "PurpleI2P" [Setup] @@ -32,6 +32,7 @@ Source: ..\contrib\subscriptions.txt; DestDir: {userappdata}\i2pd; Flags: onlyifdoesntexist Source: ..\contrib\tunnels.conf; DestDir: {userappdata}\i2pd; Flags: onlyifdoesntexist Source: ..\contrib\certificates\*; DestDir: {userappdata}\i2pd\certificates; Flags: onlyifdoesntexist recursesubdirs createallsubdirs +Source: ..\contrib\tunnels.d\*; DestDir: {userappdata}\i2pd\tunnels.d; Flags: onlyifdoesntexist recursesubdirs createallsubdirs [Icons] Name: {group}\I2Pd; Filename: {app}\i2pd.exe diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/i2pd-2.21.1/android/AndroidManifest.xml new/i2pd-2.22.0/android/AndroidManifest.xml --- old/i2pd-2.21.1/android/AndroidManifest.xml 2018-10-22 16:21:52.000000000 +0200 +++ new/i2pd-2.22.0/android/AndroidManifest.xml 2018-11-09 03:22:55.000000000 +0100 @@ -3,7 +3,7 @@ package="org.purplei2p.i2pd" android:installLocation="auto" android:versionCode="1" - android:versionName="2.21.1"> + android:versionName="2.22.0"> <uses-sdk android:minSdkVersion="14" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/i2pd-2.21.1/android/assets/i2pd.conf new/i2pd-2.22.0/android/assets/i2pd.conf --- old/i2pd-2.21.1/android/assets/i2pd.conf 2018-10-22 16:21:52.000000000 +0200 +++ new/i2pd-2.22.0/android/assets/i2pd.conf 2018-11-09 03:22:55.000000000 +0100 @@ -4,6 +4,7 @@ #logfile = /sdcard/i2pd/i2pd.log loglevel = none +#tunnelsdir = /sdcard/i2pd/tunnels.d # host = 1.2.3.4 # port = 4567 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/i2pd-2.21.1/android/assets/tunnels.d new/i2pd-2.22.0/android/assets/tunnels.d --- old/i2pd-2.21.1/android/assets/tunnels.d 1970-01-01 01:00:00.000000000 +0100 +++ new/i2pd-2.22.0/android/assets/tunnels.d 2018-11-12 09:44:05.968948837 +0100 @@ -0,0 +1 @@ +symbolic link to ../../contrib/tunnels.d diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/i2pd-2.21.1/android/build.gradle new/i2pd-2.22.0/android/build.gradle --- old/i2pd-2.21.1/android/build.gradle 2018-10-22 16:21:52.000000000 +0200 +++ new/i2pd-2.22.0/android/build.gradle 2018-11-09 03:22:55.000000000 +0100 @@ -29,7 +29,7 @@ targetSdkVersion 28 minSdkVersion 14 versionCode 1 - versionName "2.21.1" + versionName "2.22.0" ndk { abiFilters 'armeabi-v7a' abiFilters 'x86' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/i2pd-2.21.1/appveyor.yml new/i2pd-2.22.0/appveyor.yml --- old/i2pd-2.21.1/appveyor.yml 2018-10-22 16:21:52.000000000 +0200 +++ new/i2pd-2.22.0/appveyor.yml 2018-11-09 03:22:55.000000000 +0100 @@ -1,4 +1,4 @@ -version: 2.21.1.{build} +version: 2.22.0.{build} pull_requests: do_not_increment_build_number: true branches: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/i2pd-2.21.1/build/build_mingw.cmd new/i2pd-2.22.0/build/build_mingw.cmd --- old/i2pd-2.21.1/build/build_mingw.cmd 2018-10-22 16:21:52.000000000 +0200 +++ new/i2pd-2.22.0/build/build_mingw.cmd 2018-11-09 03:22:55.000000000 +0100 @@ -21,6 +21,8 @@ set "xSH=%WD%bash -lc" +set "FILELIST=i2pd.exe README.txt contrib/i2pd.conf contrib/tunnels.conf contrib/certificates contrib/tunnels.d" + REM detecting number of processors and subtract 1. set /a threads=%NUMBER_OF_PROCESSORS%-1 @@ -62,12 +64,12 @@ %xSH% "make clean" >> nul echo Building i2pd %tag% for win%bitness%: echo Build AVX+AESNI... -%xSH% "make DEBUG=no USE_UPNP=yes USE_AVX=1 USE_AESNI=1 -j%threads% && zip -r9 build/i2pd_%tag%_win%bitness%_mingw_avx_aesni.zip i2pd.exe README.txt contrib/i2pd.conf contrib/tunnels.conf contrib/certificates && make clean" > build/build_win%bitness%_avx_aesni.log 2>&1 +%xSH% "make DEBUG=no USE_UPNP=yes USE_AVX=1 USE_AESNI=1 -j%threads% && zip -r9 build/i2pd_%tag%_win%bitness%_mingw_avx_aesni.zip %FILELIST% && make clean" > build/build_win%bitness%_avx_aesni_%tag%.log 2>&1 echo Build AVX... -%xSH% "make DEBUG=no USE_UPNP=yes USE_AVX=1 -j%threads% && zip -r9 build/i2pd_%tag%_win%bitness%_mingw_avx.zip i2pd.exe README.txt contrib/i2pd.conf contrib/tunnels.conf contrib/certificates && make clean" > build/build_win%bitness%_avx.log 2>&1 +%xSH% "make DEBUG=no USE_UPNP=yes USE_AVX=1 -j%threads% && zip -r9 build/i2pd_%tag%_win%bitness%_mingw_avx.zip %FILELIST% && make clean" > build/build_win%bitness%_avx_%tag%.log 2>&1 echo Build AESNI... -%xSH% "make DEBUG=no USE_UPNP=yes USE_AESNI=1 -j%threads% && zip -r9 build/i2pd_%tag%_win%bitness%_mingw_aesni.zip i2pd.exe README.txt contrib/i2pd.conf contrib/tunnels.conf contrib/certificates && make clean" > build/build_win%bitness%_aesni.log 2>&1 +%xSH% "make DEBUG=no USE_UPNP=yes USE_AESNI=1 -j%threads% && zip -r9 build/i2pd_%tag%_win%bitness%_mingw_aesni.zip %FILELIST% && make clean" > build/build_win%bitness%_aesni_%tag%.log 2>&1 echo Build without extensions... -%xSH% "make DEBUG=no USE_UPNP=yes -j%threads% && zip -r9 build/i2pd_%tag%_win%bitness%_mingw.zip i2pd.exe README.txt contrib/i2pd.conf contrib/tunnels.conf contrib/certificates && make clean" > build/build_win%bitness%.log 2>&1 +%xSH% "make DEBUG=no USE_UPNP=yes -j%threads% && zip -r9 build/i2pd_%tag%_win%bitness%_mingw.zip %FILELIST% && make clean" > build/build_win%bitness%_%tag%.log 2>&1 :EOF \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/i2pd-2.21.1/contrib/i2pd.conf new/i2pd-2.22.0/contrib/i2pd.conf --- old/i2pd-2.21.1/contrib/i2pd.conf 2018-10-22 16:21:52.000000000 +0200 +++ new/i2pd-2.22.0/contrib/i2pd.conf 2018-11-09 03:22:55.000000000 +0100 @@ -10,6 +10,11 @@ ## Default: ~/.i2pd/tunnels.conf or /var/lib/i2pd/tunnels.conf # tunconf = /var/lib/i2pd/tunnels.conf +## Tunnels config files path +## Use that path to store separated tunnels in different config files. +## Default: ~/.i2pd/tunnels.d or /var/lib/i2pd/tunnels.d +# tunnelsdir = /var/lib/i2pd/tunnels.conf.d + ## Where to write pidfile (don't write by default) # pidfile = /var/run/i2pd.pid diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/i2pd-2.21.1/contrib/i2pd.service new/i2pd-2.22.0/contrib/i2pd.service --- old/i2pd-2.21.1/contrib/i2pd.service 2018-10-22 16:21:52.000000000 +0200 +++ new/i2pd-2.22.0/contrib/i2pd.service 2018-11-09 03:22:55.000000000 +0100 @@ -11,7 +11,7 @@ LogsDirectory=i2pd LogsDirectoryMode=0700 Type=forking -ExecStart=/usr/sbin/i2pd --conf=/etc/i2pd/i2pd.conf --tunconf=/etc/i2pd/tunnels.conf --pidfile=/var/run/i2pd/i2pd.pid --logfile=/var/log/i2pd/i2pd.log --daemon --service +ExecStart=/usr/sbin/i2pd --conf=/etc/i2pd/i2pd.conf --tunconf=/etc/i2pd/tunnels.conf --tunnelsdir=/etc/i2pd/tunnels.conf.d --pidfile=/var/run/i2pd/i2pd.pid --logfile=/var/log/i2pd/i2pd.log --daemon --service ExecReload=/bin/kill -HUP $MAINPID PIDFile=/var/run/i2pd/i2pd.pid ### Uncomment, if auto restart needed @@ -23,8 +23,10 @@ #KillSignal=SIGINT #TimeoutStopSec=10m -# If you have problems with hanging i2pd, you can try enable this +# If you have problems with hanging i2pd, you can try increase this LimitNOFILE=4096 +# To enable write of coredump uncomment this +#LimitCORE=infinity PrivateDevices=yes [Install] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/i2pd-2.21.1/contrib/rpm/i2pd-git.spec new/i2pd-2.22.0/contrib/rpm/i2pd-git.spec --- old/i2pd-2.21.1/contrib/rpm/i2pd-git.spec 2018-10-22 16:21:52.000000000 +0200 +++ new/i2pd-2.22.0/contrib/rpm/i2pd-git.spec 2018-11-09 03:22:55.000000000 +0100 @@ -1,7 +1,7 @@ %define git_hash %(git rev-parse HEAD | cut -c -7) Name: i2pd-git -Version: 2.21.1 +Version: 2.22.0 Release: git%{git_hash}%{?dist} Summary: I2P router written in C++ Conflicts: i2pd @@ -60,11 +60,14 @@ install -D -m 755 %{_builddir}/%{name}-%{version}/contrib/i2pd.conf %{buildroot}%{_sysconfdir}/i2pd/i2pd.conf install -D -m 755 %{_builddir}/%{name}-%{version}/contrib/tunnels.conf %{buildroot}%{_sysconfdir}/i2pd/tunnels.conf install -d -m 755 %{buildroot}%{_datadir}/i2pd +install -d -m 755 %{buildroot}%{_datadir}/i2pd/tunnels.conf.d %{__cp} -r %{_builddir}/%{name}-%{version}/contrib/certificates/ %{buildroot}%{_datadir}/i2pd/certificates +%{__cp} -r %{_builddir}/%{name}-%{version}/contrib/tunnels.d/ %{buildroot}%{_sysconfdir}/i2pd/tunnels.conf.d install -D -m 644 %{_builddir}/%{name}-%{version}/contrib/rpm/i2pd.service %{buildroot}%{_unitdir}/i2pd.service install -d -m 700 %{buildroot}%{_sharedstatedir}/i2pd install -d -m 700 %{buildroot}%{_localstatedir}/log/i2pd ln -s %{_datadir}/%{name}/certificates %{buildroot}%{_sharedstatedir}/i2pd/certificates +ln -s %{_datadir}/i2pd/tunnels.conf.d %{buildroot}%{_sysconfdir}/i2pd/tunnels.conf.d %pre @@ -91,6 +94,7 @@ %{_sbindir}/i2pd %{_datadir}/i2pd/certificates %config(noreplace) %{_sysconfdir}/i2pd/* +%config(noreplace) %{_sysconfdir}/i2pd/tunnels.conf.d/* /%{_unitdir}/i2pd.service %dir %attr(0700,i2pd,i2pd) %{_localstatedir}/log/i2pd %dir %attr(0700,i2pd,i2pd) %{_sharedstatedir}/i2pd @@ -98,5 +102,8 @@ %changelog +* Fri Nov 09 2018 r4sas <[email protected]> - 2.22.0 +- add support of tunnelsdir option + * Thu Feb 01 2018 r4sas <[email protected]> - 2.18.0 - Initial i2pd-git based on i2pd 2.18.0-1 spec diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/i2pd-2.21.1/contrib/rpm/i2pd.spec new/i2pd-2.22.0/contrib/rpm/i2pd.spec --- old/i2pd-2.21.1/contrib/rpm/i2pd.spec 2018-10-22 16:21:52.000000000 +0200 +++ new/i2pd-2.22.0/contrib/rpm/i2pd.spec 2018-11-09 03:22:55.000000000 +0100 @@ -1,5 +1,5 @@ Name: i2pd -Version: 2.21.1 +Version: 2.22.0 Release: 1%{?dist} Summary: I2P router written in C++ Conflicts: i2pd-git @@ -58,11 +58,14 @@ install -D -m 755 %{_builddir}/%{name}-%{version}/contrib/i2pd.conf %{buildroot}%{_sysconfdir}/i2pd/i2pd.conf install -D -m 755 %{_builddir}/%{name}-%{version}/contrib/tunnels.conf %{buildroot}%{_sysconfdir}/i2pd/tunnels.conf install -d -m 755 %{buildroot}%{_datadir}/i2pd +install -d -m 755 %{buildroot}%{_datadir}/i2pd/tunnels.conf.d %{__cp} -r %{_builddir}/%{name}-%{version}/contrib/certificates/ %{buildroot}%{_datadir}/i2pd/certificates +%{__cp} -r %{_builddir}/%{name}-%{version}/contrib/tunnels.d/ %{buildroot}%{_sysconfdir}/i2pd/tunnels.conf.d install -D -m 644 %{_builddir}/%{name}-%{version}/contrib/rpm/i2pd.service %{buildroot}%{_unitdir}/i2pd.service install -d -m 700 %{buildroot}%{_sharedstatedir}/i2pd install -d -m 700 %{buildroot}%{_localstatedir}/log/i2pd ln -s %{_datadir}/%{name}/certificates %{buildroot}%{_sharedstatedir}/i2pd/certificates +ln -s %{_datadir}/i2pd/tunnels.conf.d %{buildroot}%{_sysconfdir}/i2pd/tunnels.conf.d %pre @@ -89,6 +92,7 @@ %{_sbindir}/i2pd %{_datadir}/i2pd/certificates %config(noreplace) %{_sysconfdir}/i2pd/* +%config(noreplace) %{_sysconfdir}/i2pd/tunnels.conf.d/* /%{_unitdir}/i2pd.service %dir %attr(0700,i2pd,i2pd) %{_localstatedir}/log/i2pd %dir %attr(0700,i2pd,i2pd) %{_sharedstatedir}/i2pd @@ -96,6 +100,10 @@ %changelog +* Fri Nov 09 2018 r4sas <[email protected]> - 2.22.0 +- update to 2.22.0 +- add support of tunnelsdir option + * Thu Oct 22 2018 orignal <[email protected]> - 2.21.1 - update to 2.21.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/i2pd-2.21.1/contrib/tunnels.d/IRC-Ilita.conf new/i2pd-2.22.0/contrib/tunnels.d/IRC-Ilita.conf --- old/i2pd-2.21.1/contrib/tunnels.d/IRC-Ilita.conf 1970-01-01 01:00:00.000000000 +0100 +++ new/i2pd-2.22.0/contrib/tunnels.d/IRC-Ilita.conf 2018-11-09 03:22:55.000000000 +0100 @@ -0,0 +1,7 @@ +#[IRC-ILITA] +#type = client +#address = 127.0.0.1 +#port = 6669 +#destination = irc.ilita.i2p +#destinationport = 6667 +#keys = irc-keys.dat diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/i2pd-2.21.1/contrib/tunnels.d/IRC-Irc2P.conf new/i2pd-2.22.0/contrib/tunnels.d/IRC-Irc2P.conf --- old/i2pd-2.21.1/contrib/tunnels.d/IRC-Irc2P.conf 1970-01-01 01:00:00.000000000 +0100 +++ new/i2pd-2.22.0/contrib/tunnels.d/IRC-Irc2P.conf 2018-11-09 03:22:55.000000000 +0100 @@ -0,0 +1,7 @@ +#[IRC-IRC2P] +#type = client +#address = 127.0.0.1 +#port = 6668 +#destination = irc.postman.i2p +#destinationport = 6667 +#keys = irc-keys.dat \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/i2pd-2.21.1/contrib/tunnels.d/README new/i2pd-2.22.0/contrib/tunnels.d/README --- old/i2pd-2.21.1/contrib/tunnels.d/README 1970-01-01 01:00:00.000000000 +0100 +++ new/i2pd-2.22.0/contrib/tunnels.d/README 2018-11-09 03:22:55.000000000 +0100 @@ -0,0 +1 @@ +In that directory you can store separated config files for every tunnel. \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/i2pd-2.21.1/debian/.gitignore new/i2pd-2.22.0/debian/.gitignore --- old/i2pd-2.21.1/debian/.gitignore 2018-10-22 16:21:52.000000000 +0200 +++ new/i2pd-2.22.0/debian/.gitignore 2018-11-09 03:22:55.000000000 +0100 @@ -1,9 +1,9 @@ +debhelper-build-stamp files i2pd-dbg.substvars -i2pd-dbg/ i2pd.postinst.debhelper i2pd.postrm.debhelper i2pd.prerm.debhelper i2pd.substvars i2pd/ - +i2pd-dbg/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/i2pd-2.21.1/debian/changelog new/i2pd-2.22.0/debian/changelog --- old/i2pd-2.21.1/debian/changelog 2018-10-22 16:21:52.000000000 +0200 +++ new/i2pd-2.22.0/debian/changelog 2018-11-09 03:22:55.000000000 +0100 @@ -1,3 +1,12 @@ +i2pd (2.22.0-1) unstable; urgency=medium + + * updated to version 2.22.0/0.9.37 + * update manpage (1) + * update links, install files to support tunnelsdir option + * renamed and updated patch (#1210) + + -- r4sas <[email protected]> Fri, 09 Nov 2018 02:00:00 +0000 + i2pd (2.21.1-1) unstable; urgency=medium * updated to version 2.21.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/i2pd-2.21.1/debian/i2pd.1 new/i2pd-2.22.0/debian/i2pd.1 --- old/i2pd-2.21.1/debian/i2pd.1 2018-10-22 16:21:52.000000000 +0200 +++ new/i2pd-2.22.0/debian/i2pd.1 2018-11-09 03:22:55.000000000 +0100 @@ -45,6 +45,9 @@ \fB\-\-datadir=\fR Path to storage of i2pd data (RI, keys, peer profiles, ...) .TP +\fB\-\-tunnelsdir=\fR +Path to tunnels configuration files (default: \fI~/.i2pd/tunnels.d\fR or \fI/var/lib/i2pd/tunnels.d\fR) +.TP \fB\-\-host=\fR The external IP address .TP diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/i2pd-2.21.1/debian/i2pd.dirs new/i2pd-2.22.0/debian/i2pd.dirs --- old/i2pd-2.21.1/debian/i2pd.dirs 2018-10-22 16:21:52.000000000 +0200 +++ new/i2pd-2.22.0/debian/i2pd.dirs 2018-11-09 03:22:55.000000000 +0100 @@ -1,2 +1,3 @@ etc/i2pd +etc/i2pd/tunnels.conf.d var/lib/i2pd diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/i2pd-2.21.1/debian/i2pd.init new/i2pd-2.22.0/debian/i2pd.init --- old/i2pd-2.21.1/debian/i2pd.init 2018-10-22 16:21:52.000000000 +0200 +++ new/i2pd-2.22.0/debian/i2pd.init 2018-11-09 03:22:55.000000000 +0100 @@ -18,6 +18,7 @@ PIDFILE=/var/run/$NAME/$NAME.pid I2PCONF=/etc/$NAME/i2pd.conf TUNCONF=/etc/$NAME/tunnels.conf +TUNDIR=/etc/$NAME/tunnels.conf.d LOGFILE=/var/log/$NAME/$NAME.log USER="i2pd" @@ -53,7 +54,7 @@ || return 1 start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --chuid "$USER" -- \ --service --daemon --log=file --logfile=$LOGFILE --conf=$I2PCONF --tunconf=$TUNCONF \ - --pidfile=$PIDFILE $DAEMON_OPTS > /dev/null 2>&1 \ + --tunnelsdir=$TUNDIR --pidfile=$PIDFILE $DAEMON_OPTS > /dev/null 2>&1 \ || return 2 return $? } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/i2pd-2.21.1/debian/i2pd.install new/i2pd-2.22.0/debian/i2pd.install --- old/i2pd-2.21.1/debian/i2pd.install 2018-10-22 16:21:52.000000000 +0200 +++ new/i2pd-2.22.0/debian/i2pd.install 2018-11-09 03:22:55.000000000 +0100 @@ -3,4 +3,5 @@ contrib/tunnels.conf etc/i2pd/ contrib/subscriptions.txt etc/i2pd/ contrib/certificates/ usr/share/i2pd/ +contrib/tunnels.d/ etc/i2pd/tunnels.conf.d contrib/apparmor/usr.sbin.i2pd etc/apparmor.d diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/i2pd-2.21.1/debian/i2pd.links new/i2pd-2.22.0/debian/i2pd.links --- old/i2pd-2.21.1/debian/i2pd.links 2018-10-22 16:21:52.000000000 +0200 +++ new/i2pd-2.22.0/debian/i2pd.links 2018-11-09 03:22:55.000000000 +0100 @@ -1,4 +1,5 @@ etc/i2pd/i2pd.conf var/lib/i2pd/i2pd.conf etc/i2pd/tunnels.conf var/lib/i2pd/tunnels.conf etc/i2pd/subscriptions.txt var/lib/i2pd/subscriptions.txt +etc/i2pd/tunnels.conf.d var/lib/i2pd/tunnels.conf.d usr/share/i2pd/certificates var/lib/i2pd/certificates diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/i2pd-2.21.1/debian/i2pd.openrc new/i2pd-2.22.0/debian/i2pd.openrc --- old/i2pd-2.21.1/debian/i2pd.openrc 2018-10-22 16:21:52.000000000 +0200 +++ new/i2pd-2.22.0/debian/i2pd.openrc 2018-11-09 03:22:55.000000000 +0100 @@ -4,10 +4,11 @@ logfile="/var/log/i2pd/i2pd.log" mainconf="/etc/i2pd/i2pd.conf" tunconf="/etc/i2pd/tunnels.conf" +tundir="/etc/i2pd/tunnels.conf.d" name="i2pd" command="/usr/sbin/i2pd" -command_args="--service --daemon --log=file --logfile=$logfile --conf=$mainconf --tunconf=$tunconf --pidfile=$pidfile" +command_args="--service --daemon --log=file --logfile=$logfile --conf=$mainconf --tunconf=$tunconf --tunnelsdir=$tundir --pidfile=$pidfile" description="i2p router written in C++" required_dirs="/var/lib/i2pd" required_files="$mainconf" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/i2pd-2.21.1/debian/patches/02-fix-1210.patch new/i2pd-2.22.0/debian/patches/02-fix-1210.patch --- old/i2pd-2.21.1/debian/patches/02-fix-1210.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/i2pd-2.22.0/debian/patches/02-fix-1210.patch 2018-11-09 03:22:55.000000000 +0100 @@ -0,0 +1,25 @@ +Description: fix #1210 + Disables two options, which not presented in old systemd versions +Author: r4sas <[email protected]> + +Bug: https://github.com/PurpleI2P/i2pd/issues/1210 +Reviewed-By: r4sas <[email protected]> +Last-Update: 2018-08-25 + +--- a/contrib/i2pd.service ++++ b/contrib/i2pd.service +@@ -6,10 +6,10 @@ After=network.target + [Service] + User=i2pd + Group=i2pd +-RuntimeDirectory=i2pd +-RuntimeDirectoryMode=0700 +-LogsDirectory=i2pd +-LogsDirectoryMode=0700 ++#RuntimeDirectory=i2pd ++#RuntimeDirectoryMode=0700 ++#LogsDirectory=i2pd ++#LogsDirectoryMode=0700 + Type=forking + ExecStart=/usr/sbin/i2pd --conf=/etc/i2pd/i2pd.conf --tunconf=/etc/i2pd/tunnels.conf --tunnelsdir=/etc/i2pd/tunnels.conf.d --pidfile=/var/run/i2pd/i2pd.pid --logfile=/var/log/i2pd/i2pd.log --daemon --service + ExecReload=/bin/kill -HUP $MAINPID diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/i2pd-2.21.1/debian/patches/fix-#1210 new/i2pd-2.22.0/debian/patches/fix-#1210 --- old/i2pd-2.21.1/debian/patches/fix-#1210 2018-10-22 16:21:52.000000000 +0200 +++ new/i2pd-2.22.0/debian/patches/fix-#1210 1970-01-01 01:00:00.000000000 +0100 @@ -1,25 +0,0 @@ -Description: fix #1210 - Disables two options, which not presented in old systemd versions -Author: r4sas <[email protected]> - -Bug: https://github.com/PurpleI2P/i2pd/issues/1210 -Reviewed-By: r4sas <[email protected]> -Last-Update: 2018-08-25 - ---- i2pd-2.20.0.orig/contrib/i2pd.service -+++ i2pd-2.20.0/contrib/i2pd.service -@@ -6,10 +6,10 @@ After=network.target - [Service] - User=i2pd - Group=i2pd --RuntimeDirectory=i2pd --RuntimeDirectoryMode=0700 --LogsDirectory=i2pd --LogsDirectoryMode=0700 -+#RuntimeDirectory=i2pd -+#RuntimeDirectoryMode=0700 -+#LogsDirectory=i2pd -+#LogsDirectoryMode=0700 - Type=forking - ExecStart=/usr/sbin/i2pd --conf=/etc/i2pd/i2pd.conf --tunconf=/etc/i2pd/tunnels.conf --pidfile=/var/run/i2pd/i2pd.pid --logfile=/var/log/i2pd/i2pd.log --daemon --service - ExecReload=/bin/kill -HUP $MAINPID diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/i2pd-2.21.1/debian/patches/series new/i2pd-2.22.0/debian/patches/series --- old/i2pd-2.21.1/debian/patches/series 2018-10-22 16:21:52.000000000 +0200 +++ new/i2pd-2.22.0/debian/patches/series 2018-11-09 03:22:55.000000000 +0100 @@ -1,2 +1,2 @@ 01-tune-build-opts.patch -fix-#1210 +02-fix-1210.patch diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/i2pd-2.21.1/libi2pd/Config.cpp new/i2pd-2.22.0/libi2pd/Config.cpp --- old/i2pd-2.21.1/libi2pd/Config.cpp 2018-10-22 16:21:52.000000000 +0200 +++ new/i2pd-2.22.0/libi2pd/Config.cpp 2018-11-09 03:22:55.000000000 +0100 @@ -32,6 +32,7 @@ options_description general("General options"); general.add_options() ("help", "Show this message") + ("version", "Show i2pd version") ("conf", value<std::string>()->default_value(""), "Path to main i2pd config file (default: try ~/.i2pd/i2pd.conf or /var/lib/i2pd/i2pd.conf)") ("tunconf", value<std::string>()->default_value(""), "Path to config with tunnels list and options (default: try ~/.i2pd/tunnels.conf or /var/lib/i2pd/tunnels.conf)") ("tunnelsdir", value<std::string>()->default_value(""), "Path to extra tunnels' configs folder (default: ~/.i2pd/tunnels.d or /var/lib/i2pd/tunnels.d") @@ -283,6 +284,23 @@ std::cout << "i2pd version " << I2PD_VERSION << " (" << I2P_VERSION << ")" << std::endl; std::cout << m_OptionsDesc; exit(EXIT_SUCCESS); + } + else if (m_Options.count("version")) + { + std::cout << "i2pd version " << I2PD_VERSION << " (" << I2P_VERSION << ")" << std::endl; + std::cout << "Boost version " + << BOOST_VERSION / 100000 << "." // maj. version + << BOOST_VERSION / 100 % 1000 << "." // min. version + << BOOST_VERSION % 100 // patch version + << std::endl; +#if defined(OPENSSL_VERSION_TEXT) + std::cout << OPENSSL_VERSION_TEXT << std::endl; +#endif +#if defined(LIBRESSL_VERSION_TEXT) + std::cout << LIBRESSL_VERSION_TEXT << std::endl; +#endif + + exit(EXIT_SUCCESS); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/i2pd-2.21.1/libi2pd/Crypto.cpp new/i2pd-2.22.0/libi2pd/Crypto.cpp --- old/i2pd-2.21.1/libi2pd/Crypto.cpp 2018-10-22 16:21:52.000000000 +0200 +++ new/i2pd-2.22.0/libi2pd/Crypto.cpp 2018-11-09 03:22:55.000000000 +0100 @@ -341,6 +341,16 @@ #endif } + void X25519Keys::GetPrivateKey (uint8_t * priv) const + { +#if OPENSSL_X25519 + size_t len = 32; + EVP_PKEY_get_raw_private_key (m_Pkey, priv, &len); +#else + memcpy (priv, m_PrivateKey, 32); +#endif + } + // ElGamal void ElGamalEncrypt (const uint8_t * key, const uint8_t * data, uint8_t * encrypted, BN_CTX * ctx, bool zeroPadding) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/i2pd-2.21.1/libi2pd/Crypto.h new/i2pd-2.22.0/libi2pd/Crypto.h --- old/i2pd-2.21.1/libi2pd/Crypto.h 2018-10-22 16:21:52.000000000 +0200 +++ new/i2pd-2.22.0/libi2pd/Crypto.h 2018-11-09 03:22:55.000000000 +0100 @@ -72,6 +72,7 @@ void GenerateKeys (); const uint8_t * GetPublicKey () const { return m_PublicKey; }; + void GetPrivateKey (uint8_t * priv) const; void Agree (const uint8_t * pub, uint8_t * shared); private: @@ -124,9 +125,17 @@ else #endif { - // TODO: implement it better - for (int i = 0; i < 16; i++) - buf[i] ^= other.buf[i]; + if (!(((size_t)buf | (size_t)other.buf) & 0x03)) // multiple of 4 ? + { + // we are good to cast to uint32_t * + for (int i = 0; i < 4; i++) + ((uint32_t *)buf)[i] ^= ((uint32_t *)other.buf)[i]; + } + else + { + for (int i = 0; i < 16; i++) + buf[i] ^= other.buf[i]; + } } } }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/i2pd-2.21.1/libi2pd/NTCP2.cpp new/i2pd-2.22.0/libi2pd/NTCP2.cpp --- old/i2pd-2.21.1/libi2pd/NTCP2.cpp 2018-10-22 16:21:52.000000000 +0200 +++ new/i2pd-2.22.0/libi2pd/NTCP2.cpp 2018-11-09 03:22:55.000000000 +0100 @@ -40,7 +40,7 @@ delete[] m_SessionConfirmedBuffer; } - void NTCP2Establisher::MixKey (const uint8_t * inputKeyMaterial, uint8_t * derived) + void NTCP2Establisher::MixKey (const uint8_t * inputKeyMaterial) { // temp_key = HMAC-SHA256(ck, input_key_material) uint8_t tempKey[32]; unsigned int len; @@ -50,7 +50,16 @@ HMAC(EVP_sha256(), tempKey, 32, one, 1, m_CK, &len); // derived = HMAC-SHA256(temp_key, ck || byte(0x02)) m_CK[32] = 2; - HMAC(EVP_sha256(), tempKey, 32, m_CK, 33, derived, &len); + HMAC(EVP_sha256(), tempKey, 32, m_CK, 33, m_K, &len); + } + + void NTCP2Establisher::MixHash (const uint8_t * buf, size_t len) + { + SHA256_CTX ctx; + SHA256_Init (&ctx); + SHA256_Update (&ctx, m_H, 32); + SHA256_Update (&ctx, buf, len); + SHA256_Final (m_H, &ctx); } void NTCP2Establisher::KeyDerivationFunction1 (const uint8_t * pub, i2p::crypto::X25519Keys& priv, const uint8_t * rs, const uint8_t * epub) @@ -73,14 +82,11 @@ SHA256_Update (&ctx, rs, 32); SHA256_Final (m_H, &ctx); // h = SHA256(h || epub) - SHA256_Init (&ctx); - SHA256_Update (&ctx, m_H, 32); - SHA256_Update (&ctx, epub, 32); - SHA256_Final (m_H, &ctx); + MixHash (epub, 32); // x25519 between pub and priv uint8_t inputKeyMaterial[32]; priv.Agree (pub, inputKeyMaterial); - MixKey (inputKeyMaterial, m_K); + MixKey (inputKeyMaterial); } void NTCP2Establisher::KDF1Alice () @@ -95,30 +101,18 @@ void NTCP2Establisher::KeyDerivationFunction2 (const uint8_t * sessionRequest, size_t sessionRequestLen, const uint8_t * epub) { - SHA256_CTX ctx; - SHA256_Init (&ctx); - SHA256_Update (&ctx, m_H, 32); - SHA256_Update (&ctx, sessionRequest + 32, 32); // encrypted payload - SHA256_Final (m_H, &ctx); + MixHash (sessionRequest + 32, 32); // encrypted payload int paddingLength = sessionRequestLen - 64; if (paddingLength > 0) - { - SHA256_Init (&ctx); - SHA256_Update (&ctx, m_H, 32); - SHA256_Update (&ctx, sessionRequest + 64, paddingLength); - SHA256_Final (m_H, &ctx); - } - SHA256_Init (&ctx); - SHA256_Update (&ctx, m_H, 32); - SHA256_Update (&ctx, epub, 32); - SHA256_Final (m_H, &ctx); + MixHash (sessionRequest + 64, paddingLength); + MixHash (epub, 32); // x25519 between remote pub and ephemaral priv uint8_t inputKeyMaterial[32]; m_EphemeralKeys.Agree (GetRemotePub (), inputKeyMaterial); - MixKey (inputKeyMaterial, m_K); + MixKey (inputKeyMaterial); } void NTCP2Establisher::KDF2Alice () @@ -135,14 +129,14 @@ { uint8_t inputKeyMaterial[32]; i2p::context.GetStaticKeys ().Agree (GetRemotePub (), inputKeyMaterial); - MixKey (inputKeyMaterial, m_K); + MixKey (inputKeyMaterial); } void NTCP2Establisher::KDF3Bob () { uint8_t inputKeyMaterial[32]; m_EphemeralKeys.Agree (m_RemoteStaticKey, inputKeyMaterial); - MixKey (inputKeyMaterial, m_K); + MixKey (inputKeyMaterial); } void NTCP2Establisher::CreateEphemeralKey () @@ -170,8 +164,17 @@ memset (options, 0, 16); options[1] = 2; // ver htobe16buf (options + 2, paddingLength); // padLen - m3p2Len = i2p::context.GetRouterInfo ().GetBufferLen () + 20; // (RI header + RI + MAC for now) TODO: implement options + // m3p2Len + auto bufLen = i2p::context.GetRouterInfo ().GetBufferLen (); + m3p2Len = bufLen + 4 + 16; // (RI header + RI + MAC for now) TODO: implement options htobe16buf (options + 4, m3p2Len); + // fill m3p2 payload (RouterInfo block) + m_SessionConfirmedBuffer = new uint8_t[m3p2Len + 48]; // m3p1 is 48 bytes + uint8_t * m3p2 = m_SessionConfirmedBuffer + 48; + m3p2[0] = eNTCP2BlkRouterInfo; // block + htobe16buf (m3p2 + 1, bufLen + 1); // flag + RI + m3p2[3] = 0; // flag + memcpy (m3p2 + 4, i2p::context.GetRouterInfo ().GetBuffer (), bufLen); // TODO: own RI should be protected by mutex // 2 bytes reserved htobe32buf (options + 8, i2p::util::GetSecondsSinceEpoch ()); // tsA // 4 bytes reserved @@ -208,23 +211,12 @@ void NTCP2Establisher::CreateSessionConfirmedMessagePart1 (const uint8_t * nonce) { // update AD - SHA256_CTX ctx; - SHA256_Init (&ctx); - SHA256_Update (&ctx, m_H, 32); - SHA256_Update (&ctx, m_SessionCreatedBuffer + 32, 32); // encrypted payload - SHA256_Final (m_H, &ctx); - + MixHash (m_SessionCreatedBuffer + 32, 32); // encrypted payload int paddingLength = m_SessionCreatedBufferLen - 64; if (paddingLength > 0) - { - SHA256_CTX ctx1; - SHA256_Init (&ctx1); - SHA256_Update (&ctx1, m_H, 32); - SHA256_Update (&ctx1, m_SessionCreatedBuffer + 64, paddingLength); - SHA256_Final (m_H, &ctx1); - } - // part1 48 bytes - m_SessionConfirmedBuffer = new uint8_t[m3p2Len + 48]; + MixHash (m_SessionCreatedBuffer + 64, paddingLength); + + // part1 48 bytes i2p::crypto::AEADChaCha20Poly1305 (i2p::context.GetNTCP2StaticPublicKey (), 32, m_H, 32, m_K, nonce, m_SessionConfirmedBuffer, 48, true); // encrypt } @@ -232,24 +224,13 @@ { // part 2 // update AD again - SHA256_CTX ctx; - SHA256_Init (&ctx); - SHA256_Update (&ctx, m_H, 32); - SHA256_Update (&ctx, m_SessionConfirmedBuffer, 48); - SHA256_Final (m_H, &ctx); - // fill and encrypt - uint8_t * buf = m_SessionConfirmedBuffer + 48; - buf[0] = eNTCP2BlkRouterInfo; // block - htobe16buf (buf + 1, i2p::context.GetRouterInfo ().GetBufferLen () + 1); // flag + RI - buf[3] = 0; // flag - memcpy (buf + 4, i2p::context.GetRouterInfo ().GetBuffer (), i2p::context.GetRouterInfo ().GetBufferLen ()); + MixHash (m_SessionConfirmedBuffer, 48); + // encrypt m3p2, it must be filled in SessionRequest KDF3Alice (); - i2p::crypto::AEADChaCha20Poly1305 (buf, m3p2Len - 16, m_H, 32, m_K, nonce, buf, m3p2Len, true); // encrypt + uint8_t * m3p2 = m_SessionConfirmedBuffer + 48; + i2p::crypto::AEADChaCha20Poly1305 (m3p2, m3p2Len - 16, m_H, 32, m_K, nonce, m3p2, m3p2Len, true); // encrypt // update h again - SHA256_Init (&ctx); - SHA256_Update (&ctx, m_H, 32); - SHA256_Update (&ctx, buf, m3p2Len); - SHA256_Final (m_H, &ctx); //h = SHA256(h || ciphertext) + MixHash (m3p2, m3p2Len); //h = SHA256(h || ciphertext) } bool NTCP2Establisher::ProcessSessionRequestMessage (uint16_t& paddingLen) @@ -339,21 +320,11 @@ bool NTCP2Establisher::ProcessSessionConfirmedMessagePart1 (const uint8_t * nonce) { // update AD - SHA256_CTX ctx; - SHA256_Init (&ctx); - SHA256_Update (&ctx, m_H, 32); - SHA256_Update (&ctx, m_SessionCreatedBuffer + 32, 32); // encrypted payload - SHA256_Final (m_H, &ctx); - + MixHash (m_SessionCreatedBuffer + 32, 32); // encrypted payload int paddingLength = m_SessionCreatedBufferLen - 64; if (paddingLength > 0) - { - SHA256_CTX ctx1; - SHA256_Init (&ctx1); - SHA256_Update (&ctx1, m_H, 32); - SHA256_Update (&ctx1, m_SessionCreatedBuffer + 64, paddingLength); - SHA256_Final (m_H, &ctx1); - } + MixHash (m_SessionCreatedBuffer + 64, paddingLength); + if (!i2p::crypto::AEADChaCha20Poly1305 (m_SessionConfirmedBuffer, 32, m_H, 32, m_K, nonce, m_RemoteStaticKey, 32, false)) // decrypt S { LogPrint (eLogWarning, "NTCP2: SessionConfirmed Part1 AEAD verification failed "); @@ -365,11 +336,7 @@ bool NTCP2Establisher::ProcessSessionConfirmedMessagePart2 (const uint8_t * nonce, uint8_t * m3p2Buf) { // update AD again - SHA256_CTX ctx; - SHA256_Init (&ctx); - SHA256_Update (&ctx, m_H, 32); - SHA256_Update (&ctx, m_SessionConfirmedBuffer, 48); - SHA256_Final (m_H, &ctx); + MixHash (m_SessionConfirmedBuffer, 48); KDF3Bob (); if (i2p::crypto::AEADChaCha20Poly1305 (m_SessionConfirmedBuffer + 48, m3p2Len - 16, m_H, 32, m_K, nonce, m3p2Buf, m3p2Len - 16, false)) // decrypt @@ -1041,7 +1008,7 @@ void NTCP2Session::SendTermination (NTCP2TerminationReason reason) { - if (!IsEstablished ()) return; + if (!m_SendKey || !m_SendSipKey) return; uint8_t payload[12] = { eNTCP2BlkTermination, 0, 9 }; htobe64buf (payload + 3, m_ReceiveSequenceNumber); payload[11] = (uint8_t)reason; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/i2pd-2.21.1/libi2pd/NTCP2.h new/i2pd-2.22.0/libi2pd/NTCP2.h --- old/i2pd-2.21.1/libi2pd/NTCP2.h 2018-10-22 16:21:52.000000000 +0200 +++ new/i2pd-2.22.0/libi2pd/NTCP2.h 2018-11-09 03:22:55.000000000 +0100 @@ -95,7 +95,8 @@ void KDF3Alice (); // for SessionConfirmed part 2 void KDF3Bob (); - void MixKey (const uint8_t * inputKeyMaterial, uint8_t * derived); + void MixKey (const uint8_t * inputKeyMaterial); + void MixHash (const uint8_t * buf, size_t len); void KeyDerivationFunction1 (const uint8_t * pub, i2p::crypto::X25519Keys& priv, const uint8_t * rs, const uint8_t * epub); // for SessionRequest, (pub, priv) for DH void KeyDerivationFunction2 (const uint8_t * sessionRequest, size_t sessionRequestLen, const uint8_t * epub); // for SessionCreate void CreateEphemeralKey (); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/i2pd-2.21.1/libi2pd/RouterContext.cpp new/i2pd-2.22.0/libi2pd/RouterContext.cpp --- old/i2pd-2.21.1/libi2pd/RouterContext.cpp 2018-10-22 16:21:52.000000000 +0200 +++ new/i2pd-2.22.0/libi2pd/RouterContext.cpp 2018-11-09 03:22:55.000000000 +0100 @@ -116,12 +116,12 @@ void RouterContext::NewNTCP2Keys () { + m_StaticKeys.reset (new i2p::crypto::X25519Keys ()); + m_StaticKeys->GenerateKeys (); m_NTCP2Keys.reset (new NTCP2PrivateKeys ()); - RAND_bytes (m_NTCP2Keys->staticPrivateKey, 32); + m_StaticKeys->GetPrivateKey (m_NTCP2Keys->staticPrivateKey); + memcpy (m_NTCP2Keys->staticPublicKey, m_StaticKeys->GetPublicKey (), 32); RAND_bytes (m_NTCP2Keys->iv, 16); - BN_CTX * ctx = BN_CTX_new (); - i2p::crypto::GetEd25519 ()->ScalarMulB (m_NTCP2Keys->staticPrivateKey, m_NTCP2Keys->staticPublicKey, ctx); - BN_CTX_free (ctx); // save std::ofstream fk (i2p::fs::DataDirPath (NTCP2_KEYS), std::ofstream::binary | std::ofstream::out); fk.write ((char *)m_NTCP2Keys.get (), sizeof (NTCP2PrivateKeys)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/i2pd-2.21.1/libi2pd/version.h new/i2pd-2.22.0/libi2pd/version.h --- old/i2pd-2.21.1/libi2pd/version.h 2018-10-22 16:21:52.000000000 +0200 +++ new/i2pd-2.22.0/libi2pd/version.h 2018-11-09 03:22:55.000000000 +0100 @@ -7,8 +7,8 @@ #define MAKE_VERSION(a,b,c) STRINGIZE(a) "." STRINGIZE(b) "." STRINGIZE(c) #define I2PD_VERSION_MAJOR 2 -#define I2PD_VERSION_MINOR 21 -#define I2PD_VERSION_MICRO 1 +#define I2PD_VERSION_MINOR 22 +#define I2PD_VERSION_MICRO 0 #define I2PD_VERSION_PATCH 0 #define I2PD_VERSION MAKE_VERSION(I2PD_VERSION_MAJOR, I2PD_VERSION_MINOR, I2PD_VERSION_MICRO) #define VERSION I2PD_VERSION diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/i2pd-2.21.1/qt/i2pd_qt/android/AndroidManifest.xml new/i2pd-2.22.0/qt/i2pd_qt/android/AndroidManifest.xml --- old/i2pd-2.21.1/qt/i2pd_qt/android/AndroidManifest.xml 2018-10-22 16:21:52.000000000 +0200 +++ new/i2pd-2.22.0/qt/i2pd_qt/android/AndroidManifest.xml 2018-11-09 03:22:55.000000000 +0100 @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<manifest package="org.purplei2p.i2pd" xmlns:android="http://schemas.android.com/apk/res/android"; android:versionName="2.21.1" android:versionCode="1" android:installLocation="auto"> +<manifest package="org.purplei2p.i2pd" xmlns:android="http://schemas.android.com/apk/res/android"; android:versionName="2.22.0" android:versionCode="1" android:installLocation="auto"> <uses-sdk android:minSdkVersion="11" android:targetSdkVersion="23"/> <supports-screens android:largeScreens="true" android:normalScreens="true" android:anyDensity="true" android:smallScreens="true"/> <!-- <application android:hardwareAccelerated="true" --> Binary files old/i2pd-2.21.1/qt/i2pd_qt/data/icons/128x128/website.i2pd.i2pd.png and new/i2pd-2.22.0/qt/i2pd_qt/data/icons/128x128/website.i2pd.i2pd.png differ Binary files old/i2pd-2.21.1/qt/i2pd_qt/data/icons/16x16/website.i2pd.i2pd.png and new/i2pd-2.22.0/qt/i2pd_qt/data/icons/16x16/website.i2pd.i2pd.png differ Binary files old/i2pd-2.21.1/qt/i2pd_qt/data/icons/22x22/website.i2pd.i2pd.png and new/i2pd-2.22.0/qt/i2pd_qt/data/icons/22x22/website.i2pd.i2pd.png differ Binary files old/i2pd-2.21.1/qt/i2pd_qt/data/icons/24x24/website.i2pd.i2pd.png and new/i2pd-2.22.0/qt/i2pd_qt/data/icons/24x24/website.i2pd.i2pd.png differ Binary files old/i2pd-2.21.1/qt/i2pd_qt/data/icons/256x256/website.i2pd.i2pd.png and new/i2pd-2.22.0/qt/i2pd_qt/data/icons/256x256/website.i2pd.i2pd.png differ Binary files old/i2pd-2.21.1/qt/i2pd_qt/data/icons/32x32/website.i2pd.i2pd.png and new/i2pd-2.22.0/qt/i2pd_qt/data/icons/32x32/website.i2pd.i2pd.png differ Binary files old/i2pd-2.21.1/qt/i2pd_qt/data/icons/48x48/website.i2pd.i2pd.png and new/i2pd-2.22.0/qt/i2pd_qt/data/icons/48x48/website.i2pd.i2pd.png differ Binary files old/i2pd-2.21.1/qt/i2pd_qt/data/icons/512x512/website.i2pd.i2pd.png and new/i2pd-2.22.0/qt/i2pd_qt/data/icons/512x512/website.i2pd.i2pd.png differ Binary files old/i2pd-2.21.1/qt/i2pd_qt/data/icons/64x64/website.i2pd.i2pd.png and new/i2pd-2.22.0/qt/i2pd_qt/data/icons/64x64/website.i2pd.i2pd.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/i2pd-2.21.1/qt/i2pd_qt/data/website.i2pd.i2pd.appdata.xml new/i2pd-2.22.0/qt/i2pd_qt/data/website.i2pd.i2pd.appdata.xml --- old/i2pd-2.21.1/qt/i2pd_qt/data/website.i2pd.i2pd.appdata.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/i2pd-2.22.0/qt/i2pd_qt/data/website.i2pd.i2pd.appdata.xml 2018-11-09 03:22:55.000000000 +0100 @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright 2018 Viktor Villainov <[email protected]> --> +<component type="desktop"> + <id>website.i2pd.i2pd</id> + <launchable type="desktop-id">website.i2pd.i2pd.desktop</launchable> + <metadata_license>CC0-1.0</metadata_license> + <project_license>BSD-3-Clause</project_license> + <name>i2pd</name> + <summary>Invisible Internet</summary> + <description> + <p>i2pd (I2P Daemon) is a full-featured C++ implementation of I2P client.</p> + <p>I2P (Invisible Internet Protocol) is a universal anonymous network layer. + All communications over I2P are anonymous and end-to-end encrypted, participants + don't reveal their real IP addresses. </p> + <p>I2P allows people from all around the world to communicate and share information + without restrictions.</p> + <p>Features:</p> + <ul> + <li>Distributed anonymous networking framework</li> + <li>End-to-end encrypted communications</li> + <li>Small footprint, simple dependencies, fast performance</li> + <li>Rich set of APIs for developers of secure applications</li> + </ul> + </description> + <screenshots> + <screenshot type="default"> + <image height="590" width="923">https://i2pd.website/images/i2pd_qt.png</image> + </screenshot> + </screenshots> + <url type="homepage">https://i2pd.website/</url> + <url type="bugtracker">https://github.com/PurpleI2P/i2pd/issues</url> + <url type="help">https://i2pd.readthedocs.io/en/latest/</url> + <update_contact>[email protected]</update_contact> + <developer_name>PurpleI2P Team</developer_name> + <translation type="qt" /> + + <releases> + <release version="2.21.1" date="2018-10-22" /> + <release version="2.21.0" date="2018-10-04" /> + </releases> + <content_rating type="oars-1.1" /> +</component> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/i2pd-2.21.1/qt/i2pd_qt/data/website.i2pd.i2pd.desktop new/i2pd-2.22.0/qt/i2pd_qt/data/website.i2pd.i2pd.desktop --- old/i2pd-2.21.1/qt/i2pd_qt/data/website.i2pd.i2pd.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/i2pd-2.22.0/qt/i2pd_qt/data/website.i2pd.i2pd.desktop 2018-11-09 03:22:55.000000000 +0100 @@ -0,0 +1,11 @@ +[Desktop Entry] +Categories=Network;P2P;Qt; +Exec=i2pd_qt +GenericName=Invisible Internet +Comment=A universal anonymous network layer +Icon=website.i2pd.i2pd +Name=i2pd +Terminal=false +Type=Application +StartupNotify=false +Keywords=i2p;i2pd;vpn;p2p;
