Add support for C3 Nehemiah ACE ("Padlock") AES crypto. This comes

from OpenSSL 0.9.5 (yet to be released), and is pretty complete.

crypto/openssl/crypto/engine/eng_all.c

@@ -86,6 +86,9 @@ void ENGINE_load_builtin_engines(void)
 #ifndef OPENSSL_NO_HW_UBSEC
 	ENGINE_load_ubsec();
 #endif
+#ifndef OPENSSL_NO_HW_PADLOCK
+	ENGINE_load_padlock();
+#endif
 #ifndef OPENSSL_NO_HW_AEP
 	ENGINE_load_aep();
 #endif

crypto/openssl/crypto/engine/eng_padlock.c

@@ -65,7 +65,7 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
 #ifdef _MSC_VER
 # define alloca   _alloca
 # define snprintf _snprintf

secure/lib/libcrypto/Makefile

@@ -129,7 +129,7 @@ INCS+=	ec.h
 
 # engine
 SRCS+=	eng_all.c eng_cnf.c eng_ctrl.c eng_dyn.c eng_err.c eng_fat.c \
-	eng_init.c eng_lib.c eng_list.c eng_openssl.c eng_pkey.c \
+	eng_init.c eng_lib.c eng_list.c eng_openssl.c eng_padlock.c eng_pkey.c \
 	eng_table.c hw_4758_cca.c hw_4758_cca_err.c hw_aep.c hw_aep_err.c \
 	hw_atalla.c hw_atalla_err.c hw_cryptodev.c hw_cswift.c \
 	hw_cswift_err.c hw_ncipher.c hw_ncipher_err.c hw_nuron.c \