@@ -4,10 +4,31 @@
  * Provides BIO layer to interface openssl to Tcl.
  */
 
 #include "tlsInt.h"
 
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#define BIO_get_data(bio)                ((bio)->ptr)
+#define BIO_get_init(bio)                ((bio)->init)
+#define BIO_get_shutdown(bio)            ((bio)->shutdown)
+#define BIO_set_data(bio, val)           (bio)->ptr = (val)
+#define BIO_set_init(bio, val)           (bio)->init = (val)
+#define BIO_set_shutdown(bio, val)       (bio)->shutdown = (val)
+
+/* XXX: This assumes the variable being assigned to is BioMethods */
+#define BIO_meth_new(type_, name_)       (BIO_METHOD *)Tcl_Alloc(sizeof(BIO_METHOD)); \
+                                         memset(BioMethods, 0, sizeof(BIO_METHOD)); \
+                                         BioMethods->type = type_; \
+                                         BioMethods->name = name_;
+#define BIO_meth_set_write(bio, val)     (bio)->bwrite = val;
+#define BIO_meth_set_read(bio, val)      (bio)->bread = val;
+#define BIO_meth_set_puts(bio, val)      (bio)->bputs = val;
+#define BIO_meth_set_ctrl(bio, val)      (bio)->ctrl = val;
+#define BIO_meth_set_create(bio, val)    (bio)->create = val;
+#define BIO_meth_set_destroy(bio, val)   (bio)->destroy = val;
+#endif
+
 /*
  * Forward declarations
  */
 
 static int BioWrite	_ANSI_ARGS_ ((BIO *h, CONST char *buf, int num));
@@ -190,10 +211,11 @@
 	if (channelTypeVersion == TLS_CHANNEL_VERSION_2) {
 	    ret = ((Tcl_WriteRaw(chan, "", 0) >= 0) ? 1 : -1);
 	} else {
 	    ret = ((Tcl_Flush(chan) == TCL_OK) ? 1 : -1);
 	}
+        dprintf("BIO_CTRL_FLUSH returning value %li", ret);
 	break;
     default:
 	ret = 0;
 	break;
     }