diff --git a/lib/modules/SSL.pmod/connection.pike b/lib/modules/SSL.pmod/connection.pike
index f9c1bf0821dad60daea95548c995868998d27c6d..62e5980bd58dc2576c407a11bdb85561d7941bef 100644
--- a/lib/modules/SSL.pmod/connection.pike
+++ b/lib/modules/SSL.pmod/connection.pike
@@ -1,4 +1,4 @@
-/* $Id: connection.pike,v 1.8 1998/05/20 23:13:52 grubba Exp $
+/* $Id: connection.pike,v 1.9 1998/08/26 11:44:24 grubba Exp $
  *
  * SSL packet layer
  */
@@ -90,7 +90,11 @@ void send_packet(object packet, int|void priority)
 	          PACKET_handshake : PRI_urgent,
 		  PACKET_application_data : PRI_application ])[packet->content_type];
 #ifdef SSL3_DEBUG
-  werror(sprintf("SSL.connection->send_packet: type %d, %d, '%s'\n",
+  if (packet->content_type == 22)
+    werror(sprintf("SSL.connection->send_packet() called from:\n"
+		   "%s\n", describe_backtrace(backtrace())));
+
+  werror(sprintf("SSL.connection->send_packet: type %d, %d, '%O'\n",
 		 packet->content_type, priority,  packet->fragment[..5]));
 #endif
   switch (priority)
diff --git a/lib/modules/SSL.pmod/handshake.pike b/lib/modules/SSL.pmod/handshake.pike
index 1f878ae6f74482a3e17d6c85ce6d066bd0e2822d..25352943228a2da8a6e60bb4192f3683924e89a4 100644
--- a/lib/modules/SSL.pmod/handshake.pike
+++ b/lib/modules/SSL.pmod/handshake.pike
@@ -1,4 +1,4 @@
-/* $Id: handshake.pike,v 1.10 1998/08/26 07:10:36 nisse Exp $
+/* $Id: handshake.pike,v 1.11 1998/08/26 11:42:44 grubba Exp $
  *
  */
 
@@ -75,7 +75,7 @@ object server_hello_packet()
 
   string data = struct->pop_data();
 #ifdef SSL3_DEBUG
-  werror(sprintf("SSL.handshake: Server hello: '%s'\n", data));
+  werror(sprintf("SSL.handshake: Server hello: '%O'\n", data));
 #endif
   return handshake_packet(HANDSHAKE_server_hello, data);
 }
@@ -157,8 +157,8 @@ int reply_new_session(array(int) cipher_suites, array(int) compression_methods)
 
     object s = context->rsa->raw_sign(digest);
 #ifdef SSL3_DEBUG
-    werror(sprintf("  Digest: '%s'\n"
-		   "  Signature: '%s'\n",
+    werror(sprintf("  Digest: '%O'\n"
+		   "  Signature: '%O'\n",
 		   digest, s->digits(256)));
 #endif
     
@@ -222,7 +222,7 @@ string server_derive_master_secret(string data)
    {
      /* Decrypt the pre_master_secret */
 #ifdef SSL3_DEBUG
-     werror(sprintf("encrypted premaster_secret: '%s'\n", data));
+     werror(sprintf("encrypted premaster_secret: '%O'\n", data));
 #endif
      // trace(1);
      string s = (temp_key || context->rsa)->decrypt(data);
@@ -260,7 +260,7 @@ string server_derive_master_secret(string data)
    }
   }
 #ifdef SSL3_DEBUG
-//  werror(sprintf("master: '%s'\n", res));
+//  werror(sprintf("master: '%O'\n", res));
 #endif
   return res;
 }
@@ -329,13 +329,13 @@ int handle_handshake(int type, string data, string raw)
 
 #ifdef SSL3_DEBUG
 	if (strlen(id))
-	  werror(sprintf("SSL.handshake: Looking up session %s\n", id));
+	  werror(sprintf("SSL.handshake: Looking up session %O\n", id));
 #endif
 	session = strlen(id) && context->lookup_session(id);
 	if (session)
 	{
 #ifdef SSL3_DEBUG
-	  werror(sprintf("SSL.handshake: Reusing session %s\n", id));
+	  werror(sprintf("SSL.handshake: Reusing session %O\n", id));
 #endif
 	  /* Reuse session */
 	  reuse = 1;
@@ -560,7 +560,7 @@ int handle_handshake(int type, string data, string raw)
    }
   }
 #ifdef SSL3_DEBUG
-//  werror(sprintf("SSL.handshake: messages = '%s'\n", handshake_messages));
+//  werror(sprintf("SSL.handshake: messages = '%O'\n", handshake_messages));
 #endif
   return 0;
 }
diff --git a/lib/modules/SSL.pmod/sslfile.pike b/lib/modules/SSL.pmod/sslfile.pike
index 5ad5d86e423988d1e22a39cc0cd1579bdd28bd8a..28ecf21abbd0c584c656006c18bfb500816b33b9 100644
--- a/lib/modules/SSL.pmod/sslfile.pike
+++ b/lib/modules/SSL.pmod/sslfile.pike
@@ -1,4 +1,4 @@
-/* $Id: sslfile.pike,v 1.12 1998/06/11 18:50:56 grubba Exp $
+/* $Id: sslfile.pike,v 1.13 1998/08/26 11:43:40 grubba Exp $
  *
  */
 
@@ -57,7 +57,7 @@ private int queue_write()
   if (stringp(data))
     write_buffer += data;
 #ifdef SSL3_DEBUG
-  werror(sprintf("SSL.sslfile->queue_write: buffer = '%s'\n", write_buffer));
+  werror(sprintf("SSL.sslfile->queue_write: buffer = '%O'\n", write_buffer));
 #endif
 
   if (catch {
@@ -127,7 +127,7 @@ private void ssl_read_callback(mixed id, string s)
   if (stringp(data))
   {
 #ifdef SSL3_DEBUG
-    werror(sprintf("SSL.sslfile->ssl_read_callback: application_data: '%s'\n", data));
+    werror(sprintf("SSL.sslfile->ssl_read_callback: application_data: '%O'\n", data));
 #endif
     if (!connected && handshake_finished)
     {