@@ -1,9 +1,9 @@
 /*
  * Copyright (C) 1997-1999 Matt Newman <matt@novadigm.com>
  *
- * $Header: /home/rkeene/tmp/cvs2fossil/../tcltls/tls/tls/tls.c,v 1.2 2000/01/20 01:50:55 aborr Exp $
+ * $Header: /home/rkeene/tmp/cvs2fossil/../tcltls/tls/tls/tls.c,v 1.3 2000/05/04 20:40:40 aborr Exp $
  *
  * TLS (aka SSL) Channel - can be layered on any bi-directional
  * Tcl_Channel (Note: Requires Trf Core Patch)
  *
  * This was built (almost) from scratch based upon observation of
@@ -84,18 +84,30 @@
 	return(NULL);
     return(dh);
 }
 #endif
 
+
+/*
+ * We lose the tcl password callback when we use the RSA BSAFE SSL-C 1.1.2
+ * libraries instead of the current OpenSSL libraries.
+ */
+
+#ifdef BSAFE
+#define PRE_OPENSSL_0_9_4 1
+#endif
+
 /*
  * Per OpenSSL 0.9.4 Compat
  */
+
 #ifndef STACK_OF
 #define STACK_OF(x)			STACK
 #define sk_SSL_CIPHER_num(sk)		sk_num((sk))
 #define sk_SSL_CIPHER_value( sk, index)	(SSL_CIPHER*)sk_value((sk), (index))
 #endif
+
 
 /*
  *-------------------------------------------------------------------
  *
  * InfoCallback --
@@ -850,11 +862,14 @@
     if (ciphers != NULL)
 	SSL_CTX_set_cipher_list(ctx, ciphers);
 
     /* set some callbacks */
     SSL_CTX_set_default_passwd_cb(ctx, PasswordCallback);
+
+#ifndef BSAFE
     SSL_CTX_set_default_passwd_cb_userdata(ctx, (void *)interp);
+#endif
 
 #ifndef NO_DH
     {
 	DH* dh = get_dh512();
 	SSL_CTX_set_tmp_dh(ctx, dh);