Index: doc/tls.html
==================================================================
--- doc/tls.html
+++ doc/tls.html
@@ -30,11 +30,11 @@
 	    <dd><b>tls::connection </b> <em>channel</em></dd>
 	    <dd><b>tls::import</b> <em>channel ?options?</em></dd>
 	    <dd><b>tls::unimport</b> <em>channel</em></dd>
 	    <dt>&nbsp;</dt>
 	    <dd><b>tls::ciphers</b> <em>?protocol? ?verbose? ?supported?</em></dd>
-	    <dd><b>tls::digests</b></dd>
+	    <dd><b>tls::digests</b> <em>?name?</em></dd>
 	    <dd><b>tls::macs</b></dd>
 	    <dd><b>tls::protocols</b></dd>
 	    <dd><b>tls::version</b></dd>
 	    <dt>&nbsp;</dt>
 	    <dd><b>tls::digest</b> <b>-digest</b> <em>name ?options?</em></dd>
@@ -74,11 +74,11 @@
 <a href="#tls::handshake"><b>tls::handshake</b> <i>channel</i></a><br>
 <a href="#tls::import"><b>tls::import</b> <i>channel ?options?</i></a><br>
 <a href="#tls::unimport"><b>tls::unimport</b> <i>channel</i></a><br>
 <br>
 <a href="#tls::ciphers"><b>tls::ciphers</b> <i>?protocol? ?verbose? ?supported?</i></a><br>
-<a href="#tls::digests"><b>tls::digests</b></a><br>
+<a href="#tls::digests"><b>tls::digests</b> <i>?name?</i></a><br>
 <a href="#tls::macs"><b>tls::macs</b></a><br>
 <a href="#tls::protocols"><b>tls::protocols</b></a><br>
 <a href="#tls::version"><b>tls::version</b></a><br>
 <br>
 <a href="#tls::digest"><b>tls::digest</b> <b>-digest</b> <i>name ?options?</i></a><br>
@@ -444,12 +444,15 @@
 	<em>verbose</em> is specified as true then a verbose, human readable
 	list is returned with additional information on the cipher. If
 	<em>supported</em> is specified as true, then only the ciphers
 	supported for protocol will be listed.</dd>
 
-    <dt><a name="tls::digests"><strong>tls::digests</strong></a></dt>
-    <dd>Returns a list of the hash algorithms for <b>tls::digest</b> command.</dd>
+    <dt><a name="tls::digests"><strong>tls::digests</strong> <em>?name?</em></a></dt>
+    <dd>Without <em>name</em>, returns a list of the supported hash algorithms
+	for <b>tls::digest</b> command. With <em>name</em>, returns a list of
+	property names and values describing digest <i>name</i>. Properties
+	include name, description, size, block_size, type, and flags list.</dd>
 
     <dt><a name="tls::macs"><strong>tls::macs</strong></a></dt>
     <dd>Returns a list of the available Message Authentication Codes (MAC) for
 	the <b>tls::digest</b> command.</dd>
 

Index: generic/tlsInfo.c
==================================================================
--- generic/tlsInfo.c
+++ generic/tlsInfo.c
@@ -249,10 +249,60 @@
 }
 
 /*
  *-------------------------------------------------------------------
  *
+ * DigestInfo --
+ *
+ *	Return a list of properties and values for digestName.
+ *
+ * Results:
+ *	A standard Tcl list.
+ *
+ * Side effects:
+ *	None.
+ *
+ *-------------------------------------------------------------------
+ */
+int DigestInfo(Tcl_Interp *interp, char *digestName) {
+    Tcl_Obj *objPtr, *listPtr;
+    EVP_MD *md = EVP_get_digestbyname(digestName);
+    unsigned long flags;
+
+    if (md == NULL) {
+	Tcl_AppendResult(interp, "Invalid digest \"", digestName, "\"", NULL);
+	return TCL_ERROR;
+    }
+
+    /* Get properties */
+    objPtr = Tcl_NewListObj(0, NULL);
+    LAPPEND_STR(interp, objPtr, "name", EVP_MD_name(md), -1);
+    LAPPEND_STR(interp, objPtr, "description", "", -1);
+    LAPPEND_INT(interp, objPtr, "size", EVP_MD_size(md));
+    LAPPEND_INT(interp, objPtr, "block_size", EVP_MD_block_size(md));
+    LAPPEND_STR(interp, objPtr, "provider", "", -1);
+    LAPPEND_STR(interp, objPtr, "type", OBJ_nid2ln(EVP_MD_type(md)), -1);
+    LAPPEND_STR(interp, objPtr, "pkey_type", OBJ_nid2ln(EVP_MD_pkey_type(md)), -1);
+    flags = EVP_MD_flags(md);
+
+    /* Flags */
+    listPtr = Tcl_NewListObj(0, NULL);
+    LAPPEND_BOOL(interp, listPtr, "One-shot", flags & EVP_MD_FLAG_ONESHOT);
+    LAPPEND_BOOL(interp, listPtr, "XOF", flags & EVP_MD_FLAG_XOF);
+    LAPPEND_BOOL(interp, listPtr, "DigestAlgorithmId_NULL", flags & EVP_MD_FLAG_DIGALGID_NULL);
+    LAPPEND_BOOL(interp, listPtr, "DigestAlgorithmId_Abscent", flags & EVP_MD_FLAG_DIGALGID_ABSENT);
+    LAPPEND_BOOL(interp, listPtr, "DigestAlgorithmId_Custom", flags & EVP_MD_FLAG_DIGALGID_CUSTOM);
+    LAPPEND_BOOL(interp, listPtr, "FIPS", flags & EVP_MD_FLAG_FIPS);
+    LAPPEND_OBJ(interp, objPtr, "flags", listPtr);
+
+    Tcl_SetObjResult(interp, objPtr);
+    return TCL_OK;
+}
+
+/*
+ *-------------------------------------------------------------------
+ *
  * DigestsObjCmd --
  *
  *	Return a list of all valid hash algorithms or message digests.
  *
  * Results:
@@ -271,12 +321,15 @@
 #if OPENSSL_VERSION_NUMBER < 0x10100000L
     OpenSSL_add_all_digests(); /* Make sure they're loaded */
 #endif
 
     /* Validate arg count */
-    if (objc != 1) {
-	Tcl_WrongNumArgs(interp, 1, objv, NULL);
+    if (objc == 2) {
+	char *digestName = Tcl_GetStringFromObj(objv[1],NULL);
+	return DigestInfo(interp, digestName);
+    } else if (objc > 2) {
+	Tcl_WrongNumArgs(interp, 1, objv, "?name?");
 	return TCL_ERROR;
     }
 
     /* List all digests */
     objPtr = Tcl_NewListObj(0, NULL);