Attachment #37747 for bug #65160

View | Details | Raw Unified | Return to bug 65160
Collapse All | Expand All





static long bio_filter_out_ctrl(BIO *bio, int cmd, long num, void *ptr)
{
    long ret = 0;
    bio_filter_out_ctx_t *outctx = (bio_filter_out_ctx_t *)BIO_get_data(bio);

    switch (cmd) {


static long bio_filter_in_ctrl(BIO *bio, int cmd, long num, void *ptr)
{
    return 0;
}

#if MODSSL_USE_OPENSSL_PRE_1_1_API

    bio_filter_in_read,
    bio_filter_in_puts,         /* puts is never called */
    bio_filter_in_gets,         /* gets is never called */
    bio_filter_in_ctrl, 
    bio_filter_create,
    bio_filter_destroy,
    NULL

    BIO_meth_set_read(bio_filter_in_method, &bio_filter_in_read);
    BIO_meth_set_puts(bio_filter_in_method, &bio_filter_in_puts);   /* puts is never called */
    BIO_meth_set_gets(bio_filter_in_method, &bio_filter_in_gets);   /* gets is never called */
    BIO_meth_set_ctrl(bio_filter_in_method, &bio_filter_in_ctrl);
    BIO_meth_set_create(bio_filter_in_method, &bio_filter_create);
    BIO_meth_set_destroy(bio_filter_in_method, &bio_filter_destroy);
}

Return to bug 65160

Lines 242-248 static int bio_filter_out_write(BIO bio, const char Link Here

(-)modules/ssl/ssl_engine_io.c.orig (-4 / +4 lines)
242		242
243	static long bio_filter_out_ctrl(BIO bio, int cmd, long num, void ptr)	243	static long bio_filter_out_ctrl(BIO bio, int cmd, long num, void ptr)
244	{	244	{
245	long ret = 1;	245	long ret = 0;
246	bio_filter_out_ctx_t outctx = (bio_filter_out_ctx_t )BIO_get_data(bio);	246	bio_filter_out_ctx_t outctx = (bio_filter_out_ctx_t )BIO_get_data(bio);
247		247
248	switch (cmd) {	248	switch (cmd) {
Lines 542-548 static int bio_filter_in_gets(BIO bio, char buf, int Link Here
542		542
543	static long bio_filter_in_ctrl(BIO bio, int cmd, long num, void ptr)	543	static long bio_filter_in_ctrl(BIO bio, int cmd, long num, void ptr)
544	{	544	{
545	return -1;	545	return 0;
546	}	546	}
547		547
548	#if MODSSL_USE_OPENSSL_PRE_1_1_API	548	#if MODSSL_USE_OPENSSL_PRE_1_1_API
Lines 567-573 static BIO_METHOD bio_filter_in_method = { Link Here
567	bio_filter_in_read,	567	bio_filter_in_read,
568	bio_filter_in_puts, /* puts is never called */	568	bio_filter_in_puts, /* puts is never called */
569	bio_filter_in_gets, /* gets is never called */	569	bio_filter_in_gets, /* gets is never called */
570	bio_filter_in_ctrl, /* ctrl is never called */	570	bio_filter_in_ctrl,
571	bio_filter_create,	571	bio_filter_create,
572	bio_filter_destroy,	572	bio_filter_destroy,
573	NULL	573	NULL
Lines 594-600 void init_bio_methods(void) Link Here
594	BIO_meth_set_read(bio_filter_in_method, &bio_filter_in_read);	594	BIO_meth_set_read(bio_filter_in_method, &bio_filter_in_read);
595	BIO_meth_set_puts(bio_filter_in_method, &bio_filter_in_puts); /* puts is never called */	595	BIO_meth_set_puts(bio_filter_in_method, &bio_filter_in_puts); /* puts is never called */
596	BIO_meth_set_gets(bio_filter_in_method, &bio_filter_in_gets); /* gets is never called */	596	BIO_meth_set_gets(bio_filter_in_method, &bio_filter_in_gets); /* gets is never called */
597	BIO_meth_set_ctrl(bio_filter_in_method, &bio_filter_in_ctrl); /* ctrl is never called */	597	BIO_meth_set_ctrl(bio_filter_in_method, &bio_filter_in_ctrl);
598	BIO_meth_set_create(bio_filter_in_method, &bio_filter_create);	598	BIO_meth_set_create(bio_filter_in_method, &bio_filter_create);
599	BIO_meth_set_destroy(bio_filter_in_method, &bio_filter_destroy);	599	BIO_meth_set_destroy(bio_filter_in_method, &bio_filter_destroy);
600	}	600	}