Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-02-17 21:34:10 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

TOU avoid forging BIO_METHOD in openssl >= 1.1.0

Browse Source 
Forging of BIO_METHOD may be the cause of the stack overflow as the
internal structure in openssl changed so the methods get assigned to
wrong pointer.
Kudos Cyril to notice newer openssl internal struct had one new pointer
inserted as second member
This commit is contained in:
Gioacchino Mazzurco 2018-11-05 22:23:40 +01:00
parent 81cad2ab02
commit 18e02c9f4a
No known key found for this signature in database
GPG Key ID: A1FBCA3872E87051
1 changed files with 25 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -102,44 +102,41 @@ static void BIO_set_data(BIO *a,void *p) { a->ptr = p; }
#endif
static BIO_METHOD methods_tou_sockp =
{
BIO_TYPE_TOU_SOCKET,
"tou_socket",
tou_socket_write,
tou_socket_read,
tou_socket_puts,
NULL, /* tou_gets, */
tou_socket_ctrl,
tou_socket_new,
tou_socket_free,
NULL,
};
#else
typedef struct bio_method_st {
int type;
const char *name;
int (*bwrite) (BIO *, const char *, int);
int (*bread) (BIO *, char *, int);
int (*bputs) (BIO *, const char *);
int (*bgets) (BIO *, char *, int);
long (*ctrl) (BIO *, int, long, void *);
int (*create) (BIO *);
int (*destroy) (BIO *);
long (*callback_ctrl) (BIO *, int, bio_info_cb *);
} BIO_METHOD;
static BIO_METHOD methods_tou_sockp =
BIO_meth_new(BIO_TYPE_TOU_SOCKET, "tou_socket");
BIO_meth_set_write(&methods_tou_sockp, tou_socket_write);
BIO_meth_set_read(&methods_tou_sockp, tou_socket_read);
BIO_meth_set_puts(&methods_tou_sockp, tou_socket_puts);
BIO_meth_set_ctrl(&methods_tou_sockp, tou_socket_ctrl);
BIO_meth_set_create(&methods_tou_sockp,tou_socket_new);
BIO_meth_set_destroy(&methods_tou_sockp,tou_socket_free);
#endif
static BIO_METHOD methods_tou_sockp=
{
BIO_TYPE_TOU_SOCKET,
"tou_socket",
tou_socket_write,
tou_socket_read,
tou_socket_puts,
NULL, /* tou_gets, */
tou_socket_ctrl,
tou_socket_new,
tou_socket_free,
NULL,
};
BIO_METHOD *BIO_s_tou_socket(void)
{
{
#ifdef DEBUG_TOU_BIO
fprintf(stderr, "BIO_s_tou_socket(void)\n");
#endif
return(&methods_tou_sockp);
}
}
BIO *BIO_new_tou_socket(int fd, int close_flag)
{