From 0c3cd038dba1c3a4dcfa2ecc9d7da7c44b11730f Mon Sep 17 00:00:00 2001
From: Matthew Ahrens <mahrens@delphix.com>
Date: Thu, 17 Sep 2015 08:39:46 -0700
Subject: [PATCH] 4185 add new cryptographic checksums to ZFS: SHA-512, Skein,
 Edon-R (NULL is not an int)

---
 .../test/zfs-tests/tests/functional/checksum/edonr/edonr_test.c   | 4 ++--
 usr/src/test/zfs-tests/tests/functional/checksum/sha2/sha2_test.c | 8 ++++----
 .../test/zfs-tests/tests/functional/checksum/skein/skein_test.c   | 6 +++---
 usr/src/uts/common/crypto/io/skein_mod.c                          | 2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/usr/src/test/zfs-tests/tests/functional/checksum/edonr/edonr_test.c b/usr/src/test/zfs-tests/tests/functional/checksum/edonr/edonr_test.c
index eb13930f12..a862b2286c 100644
--- a/usr/src/test/zfs-tests/tests/functional/checksum/edonr/edonr_test.c
+++ b/usr/src/test/zfs-tests/tests/functional/checksum/edonr/edonr_test.c
@@ -100,7 +100,7 @@ const uint8_t	edonr_384_test_digests[][48] = {
 	},
 	{
 		/* no test vector for test_msg1 */
-		NULL
+		0
 	},
 	{
 		/* for test_msg2 */
@@ -127,7 +127,7 @@ const uint8_t	edonr_512_test_digests[][64] = {
 	},
 	{
 		/* no test vector for test_msg1 */
-		NULL
+		0
 	},
 	{
 		/* for test_msg2 */
diff --git a/usr/src/test/zfs-tests/tests/functional/checksum/sha2/sha2_test.c b/usr/src/test/zfs-tests/tests/functional/checksum/sha2/sha2_test.c
index 59992e3732..02a669dbcf 100644
--- a/usr/src/test/zfs-tests/tests/functional/checksum/sha2/sha2_test.c
+++ b/usr/src/test/zfs-tests/tests/functional/checksum/sha2/sha2_test.c
@@ -86,7 +86,7 @@ const uint8_t	sha384_test_digests[][48] = {
 	},
 	{
 		/* no test vector for test_msg1 */
-		NULL
+		0
 	},
 	{
 		/* for test_msg2 */
@@ -113,7 +113,7 @@ const uint8_t	sha512_test_digests[][64] = {
 	},
 	{
 		/* no test vector for test_msg1 */
-		NULL
+		0
 	},
 	{
 		/* for test_msg2 */
@@ -138,7 +138,7 @@ const uint8_t	sha512_224_test_digests[][28] = {
 	},
 	{
 		/* no test vector for test_msg1 */
-		NULL
+		0
 	},
 	{
 		/* for test_msg2 */
@@ -159,7 +159,7 @@ const uint8_t	sha512_256_test_digests[][32] = {
 	},
 	{
 		/* no test vector for test_msg1 */
-		NULL
+		0
 	},
 	{
 		/* for test_msg2 */
diff --git a/usr/src/test/zfs-tests/tests/functional/checksum/skein/skein_test.c b/usr/src/test/zfs-tests/tests/functional/checksum/skein/skein_test.c
index ed57fec125..6e37fa1047 100644
--- a/usr/src/test/zfs-tests/tests/functional/checksum/skein/skein_test.c
+++ b/usr/src/test/zfs-tests/tests/functional/checksum/skein/skein_test.c
@@ -165,7 +165,7 @@ const uint8_t	skein_512_test_digests[][64] = {
 	},
 	{
 		/* no test vector for test_msg1 */
-		NULL
+		0
 	},
 	{
 		/* for test_msg2 */
@@ -214,11 +214,11 @@ const uint8_t	skein_1024_test_digests[][128] = {
 	},
 	{
 		/* no test vector for test_msg1 */
-		NULL
+		0
 	},
 	{
 		/* no test vector for test_msg2 */
-		NULL
+		0
 	},
 	{
 		/* for test_msg3 */
diff --git a/usr/src/uts/common/crypto/io/skein_mod.c b/usr/src/uts/common/crypto/io/skein_mod.c
index 49ad9cb0c7..b87c5171b6 100644
--- a/usr/src/uts/common/crypto/io/skein_mod.c
+++ b/usr/src/uts/common/crypto/io/skein_mod.c
@@ -153,7 +153,7 @@ static crypto_provider_info_t skein_prov_info = {
 	skein_mech_info_tab
 };
 
-static crypto_kcf_provider_handle_t skein_prov_handle = NULL;
+static crypto_kcf_provider_handle_t skein_prov_handle = 0;
 
 typedef struct skein_ctx {
 	skein_mech_type_t		sc_mech_type;
-- 
2.11.4.GIT