--- old/usr/src/cmd/mdb/common/modules/zfs/zfs.c	Tue Feb  3 13:17:11 2009
+++ new/usr/src/cmd/mdb/common/modules/zfs/zfs.c	Tue Feb  3 13:17:10 2009
@@ -408,6 +408,7 @@
 	dmu_object_type_info_t *doti;
 	zio_compress_info_t *zct;
 	zio_checksum_info_t *zci;
+	zio_crypt_info_t *zcc;
 	int i;
 	char buf[MAXPATHLEN];
 
@@ -437,6 +438,13 @@
 		zct[i].ci_name = local_strdup(buf);
 	}
 
+	if (read_symbol("zio_crypt_table", (void **)&zcc) != DCMD_OK)
+		return (DCMD_ERR);
+	for (i = 0; i < ZIO_CRYPT_FUNCTIONS; i++) {
+		mdb_readstr(buf, sizeof (buf), (uintptr_t)zcc[i].ci_name);
+		zcc[i].ci_name = local_strdup(buf);
+	}
+
 	/*
 	 * Super-ick warning:  This code is also duplicated in
 	 * cmd/zdb.c .   Yeah, I hate code replication, too.
@@ -463,9 +471,10 @@
 	    doti[BP_GET_TYPE(&bp)].ot_name);
 	mdb_printf("BIRTH:  %-16llx   LEVEL: %-2d\tFILL:  %llx\n",
 	    bp.blk_birth, BP_GET_LEVEL(&bp), bp.blk_fill);
-	mdb_printf("CKFUNC: %-16s\t\tCOMP:  %s\n",
+	mdb_printf("CKFUNC: %-16s\tCOMP: %s\tCRYPT: %s\n",
 	    zci[BP_GET_CHECKSUM(&bp)].ci_name,
-	    zct[BP_GET_COMPRESS(&bp)].ci_name);
+	    zct[BP_GET_COMPRESS(&bp)].ci_name,
+	    zcc[BP_GET_CRYPT(&bp)].ci_name);
 	mdb_printf("CKSUM:  %llx:%llx:%llx:%llx\n",
 	    bp.blk_cksum.zc_word[0],
 	    bp.blk_cksum.zc_word[1],