@@ -332,11 +332,11 @@
 
 	    log 0 "TLS/$chan: error: $msg"
 	}
 	"info" {
 	    # poor man's lassign
-	    foreach {chan major minor state msg type} $args break
+	    foreach {chan major minor msg type} $args break
 
 	    if {$msg != ""} {
 		append state ": $msg"
 	    }
 	    # For tracing
@@ -343,14 +343,20 @@
 	    upvar #0 tls::$chan cb
 	    set cb($major) $minor
 
 	    log 2 "TLS/$chan: $major/$minor: $state"
 	}
+	"message" {
+	    # poor man's lassign
+	    foreach {chan direction version content_type msg} $args break
+
+	    log 0 "TLS/$chan: info: $direction $msg"
+	}
 	"session" {
-	    foreach {session_id ticket lifetime} $args break
+	    foreach {chan session_id ticket lifetime} $args break
 
-	    log 0 "TLS/$chan: error: $msg"
+	    log 0 "TLS/$chan: session: lifetime $lifetime"
 	}
 	default	{
 	    return -code error "bad option \"$option\":\
 		    must be one of error, info, or session"
 	}
@@ -365,21 +371,21 @@
 
     #log 2 [concat $option $args]
 
     switch -- $option {
 	"alpn" {
-	    foreach {protocol} $args break
+	    foreach {chan protocol match} $args break
 
-	    log 0 "TLS/$chan: alpn: $protocol"
+	    log 0 "TLS/$chan: alpn: $protocol $match"
 	}
 	"hello" {
-	    foreach {servername} $args break
+	    foreach {chan servername} $args break
 
 	    log 0 "TLS/$chan: hello: $servername"
 	}
 	"sni" {
-	    foreach {servername} $args break
+	    foreach {chan servername} $args break
 
 	    log 0 "TLS/$chan: sni: $servername"
 	}
 	"verify" {
 	    # poor man's lassign
@@ -422,11 +428,11 @@
 	    return 1
 	}
     }
 }
 
-proc tls::password {} {
+proc tls::password {rwflag size} {
     log 0 "TLS/Password: did you forget to set your passwd!"
     # Return the worlds best kept secret password.
     return "secret"
 }