Index: doc/tls.html
==================================================================
--- doc/tls.html
+++ doc/tls.html
@@ -484,11 +484,11 @@
 	</dd>
 
 	<br>
 
 	<dt>
-	  <strong>info</strong> <em>channel major minor message</em>
+	  <strong>info</strong> <em>channel major minor message type</em>
 	</dt>
 	<dd>
 	  This form of callback is invoked by the OpenSSL function
 	  <code>SSL_CTX_set_info_callback()</code>.
 	  <br>
@@ -503,10 +503,14 @@
 	  The <em>message</em> argument is a descriptive string which may
 	  be generated either by
 	  <code>SSL_state_string_long()</code> or by
 	  <code>SSL_alert_desc_string_long()</code>,
 	  depending on context.
+	  <dt>For alerts, the possible values for <em>type</em> are:</dt>
+	  <dl>
+	  <dd><code>warning, fatal, and unknown</code>.</dd>
+	  </dl>
 	</dd>
 
 	<br>
 
 	<dt>

Index: generic/tls.c
==================================================================
--- generic/tls.c
+++ generic/tls.c
@@ -154,26 +154,26 @@
 	else if (where & SSL_CB_LOOP)		minor = "loop";
 	else if (where & SSL_CB_EXIT)		minor = "exit";
 	else					minor = "unknown";
     }
 
+    /* info channel major minor message type */
     Tcl_ListObjAppendElement(interp, cmdPtr, Tcl_NewStringObj("info", -1));
     Tcl_ListObjAppendElement(interp, cmdPtr,
 	    Tcl_NewStringObj(Tcl_GetChannelName(statePtr->self), -1));
     Tcl_ListObjAppendElement(interp, cmdPtr, Tcl_NewStringObj(major, -1));
     Tcl_ListObjAppendElement(interp, cmdPtr, Tcl_NewStringObj(minor, -1));
 
-    if (where & (SSL_CB_LOOP|SSL_CB_EXIT)) {
+    if (where & SSL_CB_ALERT) {
+	Tcl_ListObjAppendElement(interp, cmdPtr,
+	    Tcl_NewStringObj(SSL_alert_desc_string_long(ret), -1));
 	Tcl_ListObjAppendElement(interp, cmdPtr,
-	    Tcl_NewStringObj(SSL_state_string_long(ssl), -1));
-    } else if (where & SSL_CB_ALERT) {
-	const char *cp = (char *) SSL_alert_desc_string_long(ret);
-
-	Tcl_ListObjAppendElement(interp, cmdPtr, Tcl_NewStringObj(cp, -1));
+	    Tcl_NewStringObj(SSL_alert_type_string_long(ret), -1));
     } else {
 	Tcl_ListObjAppendElement(interp, cmdPtr,
 	    Tcl_NewStringObj(SSL_state_string_long(ssl), -1));
+	Tcl_ListObjAppendElement(interp, cmdPtr, Tcl_NewStringObj("info", -1));
     }
     Tcl_Preserve((ClientData) interp);
     Tcl_Preserve((ClientData) statePtr);
 
     Tcl_IncrRefCount(cmdPtr);