diff -u -p a/apps/ts.c b/apps/ts.c
--- a/apps/ts.c 2009-04-30 13:22:25.000000000 +0200
+++ b/apps/ts.c 2009-04-30 14:32:19.000000000 +0200
@@ -611,7 +611,7 @@ static int create_digest(BIO *input, cha
 		int length;
 
 		*md_value = OPENSSL_malloc(md_value_len);
-		if (*md_value == 0) goto err;
+		if (!*md_value) goto err;
 
 		EVP_DigestInit(&md_ctx, md);
 		while ((length = BIO_read(input, buffer, sizeof(buffer))) > 0)
diff -u -p a/crypto/ecdh/ech_ossl.c b/crypto/ecdh/ech_ossl.c
--- a/crypto/ecdh/ech_ossl.c 2009-04-30 13:22:30.000000000 +0200
+++ b/crypto/ecdh/ech_ossl.c 2009-04-30 14:27:45.000000000 +0200
@@ -186,7 +186,7 @@ static int ecdh_compute_key(void *out, s
 		goto err;
 		}
 
-	if (KDF != 0)
+	if (KDF != NULL)
 		{
 		if (KDF(buf, buflen, out, &outlen) == NULL)
 			{
diff -u -p a/crypto/bio/b_print.c b/crypto/bio/b_print.c
--- a/crypto/bio/b_print.c 2009-04-30 13:22:33.000000000 +0200
+++ b/crypto/bio/b_print.c 2009-04-30 14:27:58.000000000 +0200
@@ -443,7 +443,7 @@ fmtstr(
     int padlen, strln;
     int cnt = 0;
 
-    if (value == 0)
+    if (value == NULL)
         value = "<NULL>";
     for (strln = 0; value[strln]; ++strln)
         ;
diff -u -p a/crypto/sha/sha512.c b/crypto/sha/sha512.c
--- a/crypto/sha/sha512.c 2009-04-30 13:22:34.000000000 +0200
+++ b/crypto/sha/sha512.c 2009-04-30 14:27:32.000000000 +0200
@@ -158,7 +158,7 @@ int SHA512_Final (unsigned char *md, SHA
 
 	sha512_block_data_order (c,p,1);
 
-	if (md==0) return 0;
+	if (md==NULL) return 0;
 
 #if defined(SHA512_ASM) && (defined(__arm__) || defined(__arm))
 	/* recall assembler dword order... */
diff -u -p a/crypto/mem.c b/crypto/mem.c
--- a/crypto/mem.c 2009-04-30 13:22:34.000000000 +0200
+++ b/crypto/mem.c 2009-04-30 14:28:10.000000000 +0200
@@ -127,7 +127,7 @@ int CRYPTO_set_mem_functions(void *(*m)(
 	{
 	if (!allow_customize)
 		return 0;
-	if ((m == 0) || (r == 0) || (f == 0))
+	if ((m == NULL) || (r == NULL) || (f == NULL))
 		return 0;
 	malloc_func=m; malloc_ex_func=default_malloc_ex;
 	realloc_func=r; realloc_ex_func=default_realloc_ex;
@@ -144,7 +144,7 @@ int CRYPTO_set_mem_ex_functions(
 	{
 	if (!allow_customize)
 		return 0;
-	if ((m == 0) || (r == 0) || (f == 0))
+	if ((m == NULL) || (r == NULL) || (f == NULL))
 		return 0;
 	malloc_func=0; malloc_ex_func=m;
 	realloc_func=0; realloc_ex_func=r;