mirrors/i2pd
2
0
Fork 0
mirror of https://github.com/PurpleI2P/i2pd synced 2024-11-10 08:00:38 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'openssl' into openbsd-build

Browse Source
This commit is contained in:
Vlad Glagolev 2016-10-22 16:44:15 -04:00
commit 87a85fff08
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Crypto.h
View File

@ -282,7 +282,7 @@ namespace crypto
// take care about openssl version // take care about openssl version
#include <openssl/opensslv.h> #include <openssl/opensslv.h>
#if (OPENSSL_VERSION_NUMBER < 0x010100000) // 1.1.0 #if (OPENSSL_VERSION_NUMBER < 0x010100000) || defined(LIBRESSL_VERSION_NUMBER) // 1.1.0 or LibreSSL
// define getters and setters introduced in 1.1.0 // define getters and setters introduced in 1.1.0
inline int DSA_set0_pqg(DSA *d, BIGNUM *p, BIGNUM *q, BIGNUM *g) { d->p = p; d->q = q; d->g = g; return 1; } inline int DSA_set0_pqg(DSA *d, BIGNUM *p, BIGNUM *q, BIGNUM *g) { d->p = p; d->q = q; d->g = g; return 1; }
inline int DSA_set0_key(DSA *d, BIGNUM *pub_key, BIGNUM *priv_key) { d->pub_key = pub_key; d->priv_key = priv_key; return 1; } inline int DSA_set0_key(DSA *d, BIGNUM *pub_key, BIGNUM *priv_key) { d->pub_key = pub_key; d->priv_key = priv_key; return 1; }

4
I2PTunnel.cpp
View File

@ -175,7 +175,9 @@ namespace client
Write (m_StreamBuffer, bytes_transferred); // postpone termination Write (m_StreamBuffer, bytes_transferred); // postpone termination
else else
Terminate (); Terminate ();
} }
else
Terminate ();
} }
else else
Write (m_StreamBuffer, bytes_transferred); Write (m_StreamBuffer, bytes_transferred);

8
contrib/rpm/i2pd.spec
View File

@ -1,12 +1,11 @@
Name: i2pd Name: i2pd
Version: 2.10.0 Version: 2.10.0
Release: 2%{?dist} Release: 3%{?dist}
Summary: I2P router written in C++ Summary: I2P router written in C++
License: BSD License: BSD
URL: https://github.com/PurpleI2P/i2pd URL: https://github.com/PurpleI2P/i2pd
Source0: https://github.com/PurpleI2P/i2pd/archive/%{version}/%name-%version.tar.gz Source0: https://github.com/PurpleI2P/i2pd/archive/%{version}/%name-%version.tar.gz
Source1: i2pd.service
%if 0%{?rhel} == 7 %if 0%{?rhel} == 7
BuildRequires: cmake3 BuildRequires: cmake3
@ -68,7 +67,7 @@ make %{?_smp_mflags}
cd build cd build
chrpath -d i2pd chrpath -d i2pd
install -D -m 755 i2pd %{buildroot}%{_bindir}/i2pd install -D -m 755 i2pd %{buildroot}%{_bindir}/i2pd
install -D -m 644 %{SOURCE1} %{buildroot}/%{_unitdir}/i2pd.service 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}/%{_sharedstatedir}/i2pd
@ -102,8 +101,9 @@ getent passwd i2pd >/dev/null || \
%changelog %changelog
* Tue Oct 20 2016 Anatolii Vorona <vorona.tolik@gmail.com> - 2.10.0-2 * Tue Oct 20 2016 Anatolii Vorona <vorona.tolik@gmail.com> - 2.10.0-3
- add support C7 - add support C7
- move rpm-related files to contrib folder
* Sun Oct 16 2016 Oleg Girko <ol@infoserver.lv> - 2.10.0-1 * Sun Oct 16 2016 Oleg Girko <ol@infoserver.lv> - 2.10.0-1
- update to 2.10.0 - update to 2.10.0