Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix compilation for ubuntu 18.04 LTS

Browse Source 
Ubuntu 18.04 still ships OpenSSL 1.1.0g which has bugs in BIO API, this
commit work around those bugs
This commit is contained in:
Gioacchino Mazzurco 2018-11-06 13:02:56 +01:00
parent d00d0816ff
commit a3c81e163d
No known key found for this signature in database
GPG Key ID: A1FBCA3872E87051
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libretroshare/src/tcponudp/bss_tou.c
View File

@ -267,17 +267,16 @@ static long tou_socket_ctrl(BIO *b, int cmd, long num, void *ptr)
break; break;
case BIO_C_SET_FD: case BIO_C_SET_FD:
tou_socket_free(b); tou_socket_free(b);
ret = BIO_meth_get_ctrl(BIO_s_fd())(b,cmd,num,ptr); ret = BIO_meth_get_ctrl((BIO_METHOD*)BIO_s_fd())(b,cmd,num,ptr);
break; break;
case BIO_C_GET_FD: case BIO_C_GET_FD:
ret = BIO_meth_get_ctrl(BIO_s_fd())(b,cmd,num,ptr); ret = BIO_meth_get_ctrl((BIO_METHOD*)BIO_s_fd())(b,cmd,num,ptr);
break; break;
case BIO_CTRL_GET_CLOSE: case BIO_CTRL_GET_CLOSE:
ret = BIO_meth_get_ctrl(BIO_s_fd())(b,cmd,num,ptr); ret = BIO_meth_get_ctrl((BIO_METHOD*)BIO_s_fd())(b,cmd,num,ptr);
break; break;
case BIO_CTRL_SET_CLOSE: case BIO_CTRL_SET_CLOSE:
ret = BIO_meth_get_ctrl(BIO_s_fd())(b,cmd,num,ptr); ret = BIO_meth_get_ctrl((BIO_METHOD*)BIO_s_fd())(b,cmd,num,ptr);
break; break;
case BIO_CTRL_PENDING: case BIO_CTRL_PENDING:
ret = tou_maxread(BIO_get_fd(b,NULL)); ret = tou_maxread(BIO_get_fd(b,NULL));