Control: tags -1 + patch
Attached is a patch which fixes the two minor API usage issues, and
allows the package to build.
diff --git a/eiskaltdcpp-2.2.9/dcpp/CryptoManager.cpp b/eiskaltdcpp-2.2.9/dcpp/CryptoManager.cpp
index 08893a7..fd381a5 100644
--- a/eiskaltdcpp-2.2.9/dcpp/CryptoManager.cpp
+++ b/eiskaltdcpp-2.2.9/dcpp/CryptoManager.cpp
@@ -109,10 +109,12 @@ CryptoManager::CryptoManager()
};
if(dh) {
- dh->p = BN_bin2bn(dh4096_p, sizeof(dh4096_p), 0);
- dh->g = BN_bin2bn(dh4096_g, sizeof(dh4096_g), 0);
+ BIGNUM *p = BN_bin2bn(dh4096_p, sizeof(dh4096_p), 0);
+ BIGNUM *g = BN_bin2bn(dh4096_g, sizeof(dh4096_g), 0);
- if(!dh->p || !dh->g) {
+ DH_set0_pqg(dh, p, NULL, g);
+
+ if(!p || !g) {
dh.reset();
} else {
SSL_CTX_set_options(serverContext, SSL_OP_SINGLE_DH_USE);
diff --git a/eiskaltdcpp-2.2.9/dcpp/SSLSocket.cpp b/eiskaltdcpp-2.2.9/dcpp/SSLSocket.cpp
index 54db316..5705029 100644
--- a/eiskaltdcpp-2.2.9/dcpp/SSLSocket.cpp
+++ b/eiskaltdcpp-2.2.9/dcpp/SSLSocket.cpp
@@ -54,9 +54,9 @@ bool SSLSocket::waitConnected(uint32_t millis) {
}
while(true) {
- int ret = ssl->server?SSL_accept(ssl):SSL_connect(ssl);
+ int ret = SSL_is_server(ssl)?SSL_accept(ssl):SSL_connect(ssl);
if(ret == 1) {
- dcdebug("Connected to SSL server using %s as %s\n", SSL_get_cipher(ssl), ssl->server?"server":"client");
+ dcdebug("Connected to SSL server using %s as %s\n", SSL_get_cipher(ssl), SSL_is_server(ssl)?"server":"client");
return true;
}
if(!waitWant(ret, millis)) {
diff --git a/eiskaltdcpp-2.2.9/debian/control b/eiskaltdcpp-2.2.9/debian/control
index a4f06c3..9679bce 100644
--- a/eiskaltdcpp-2.2.9/debian/control
+++ b/eiskaltdcpp-2.2.9/debian/control
@@ -19,7 +19,7 @@ Build-Depends: chrpath,
libnotify-dev,
libpcre3-dev,
libqt4-dev,
- libssl1.0-dev,
+ libssl-dev,
pkg-config,
po-debconf,
qt4-dev-tools,
