Synchronise with 0.9.7-stable.

crypto/engine/hw_4758_cca.c

@@ -287,13 +287,13 @@ err:
 		DSO_free(dso);
 	dso = NULL;
 
-	keyRecordRead = (F_KEYRECORDREAD)NULL;
-	randomNumberGenerate = (F_RANDOMNUMBERGENERATE)NULL;
-	digitalSignatureGenerate = (F_DIGITALSIGNATUREGENERATE)NULL;
-	digitalSignatureVerify = (F_DIGITALSIGNATUREVERIFY)NULL;
-	publicKeyExtract = (F_PUBLICKEYEXTRACT)NULL;
-	pkaEncrypt = (F_PKAENCRYPT)NULL;
-	pkaDecrypt = (F_PKADECRYPT)NULL;
+	keyRecordRead = (F_KEYRECORDREAD)0;
+	randomNumberGenerate = (F_RANDOMNUMBERGENERATE)0;
+	digitalSignatureGenerate = (F_DIGITALSIGNATUREGENERATE)0;
+	digitalSignatureVerify = (F_DIGITALSIGNATUREVERIFY)0;
+	publicKeyExtract = (F_PUBLICKEYEXTRACT)0;
+	pkaEncrypt = (F_PKAENCRYPT)0;
+	pkaDecrypt = (F_PKADECRYPT)0;
 	return 0;
 	}
 
@@ -312,13 +312,13 @@ static int ibm_4758_cca_finish(ENGINE *e)
 		return 0;
 		}
 	dso = NULL;
-	keyRecordRead = (F_KEYRECORDREAD)NULL;
-	randomNumberGenerate = (F_RANDOMNUMBERGENERATE)NULL;
-	digitalSignatureGenerate = (F_DIGITALSIGNATUREGENERATE)NULL;
-	digitalSignatureVerify = (F_DIGITALSIGNATUREVERIFY)NULL;
-	publicKeyExtract = (F_PUBLICKEYEXTRACT)NULL;
-	pkaEncrypt = (F_PKAENCRYPT)NULL;
-	pkaDecrypt = (F_PKADECRYPT)NULL;
+	keyRecordRead = (F_KEYRECORDREAD)0;
+	randomNumberGenerate = (F_RANDOMNUMBERGENERATE)0;
+	digitalSignatureGenerate = (F_DIGITALSIGNATUREGENERATE)0;
+	digitalSignatureVerify = (F_DIGITALSIGNATUREVERIFY)0;
+	publicKeyExtract = (F_PUBLICKEYEXTRACT)0;
+	pkaEncrypt = (F_PKAENCRYPT)0;
+	pkaDecrypt = (F_PKADECRYPT)0;
 	return 1;
 	}
 

crypto/engine/hw_sureware.c

@@ -95,10 +95,10 @@ static EVP_PKEY *surewarehk_load_privkey(ENGINE *e, const char *key_id,
 static EVP_PKEY *surewarehk_load_pubkey(ENGINE *e, const char *key_id,
 	UI_METHOD *ui_method, void *callback_data);
 static void surewarehk_ex_free(void *obj, void *item, CRYPTO_EX_DATA *ad,
-	int index_,long argl, void *argp);
+	int idx,long argl, void *argp);
 #if 0
 static void surewarehk_dh_ex_free(void *obj, void *item, CRYPTO_EX_DATA *ad,
-	int index_,long argl, void *argp);
+	int idx,long argl, void *argp);
 #endif
 
 #ifndef OPENSSL_NO_RSA
@@ -816,7 +816,7 @@ static EVP_PKEY *surewarehk_load_pubkey(ENGINE *e, const char *key_id,
 /* This cleans up an RSA/DSA KM key(do not destroy the key into the hardware)
 , called when ex_data is freed */
 static void surewarehk_ex_free(void *obj, void *item, CRYPTO_EX_DATA *ad,
-	int index_,long argl, void *argp)
+	int idx,long argl, void *argp)
 {
 	if(!p_surewarehk_Free)
 	{
@@ -831,7 +831,7 @@ static void surewarehk_ex_free(void *obj, void *item, CRYPTO_EX_DATA *ad,
 /* This cleans up an DH KM key (destroys the key into hardware), 
 called when ex_data is freed */
 static void surewarehk_dh_ex_free(void *obj, void *item, CRYPTO_EX_DATA *ad,
-	int index_,long argl, void *argp)
+	int idx,long argl, void *argp)
 {
 	if(!p_surewarehk_Free)
 	{

crypto/ripemd/rmdtest.c

@@ -59,6 +59,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
+#include <openssl/ripemd.h>
 
 #ifdef OPENSSL_NO_RIPEMD
 int main(int argc, char *argv[])
@@ -67,7 +68,6 @@ int main(int argc, char *argv[])
     return(0);
 }
 #else
-#include <openssl/ripemd.h>
 #include <openssl/evp.h>
 
 #ifdef CHARSET_EBCDIC

ssl/ssl_cert.c

@@ -824,7 +824,7 @@ int SSL_add_dir_cert_subjects_to_stack(STACK_OF(X509_NAME) *stack,
 
 err:
 	FindClose(hFind);
-err_noclose:	
+err_noclose:
 	CRYPTO_w_unlock(CRYPTO_LOCK_READDIR);
 	return ret;
 	}