From 1659a5207b9353b648502fc1d7949a8d52db79f4 Mon Sep 17 00:00:00 2001
From: markm <markm@FreeBSD.org>
Date: Sat, 14 Aug 2004 13:38:35 +0000
Subject: 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     | 3 +++
 crypto/openssl/crypto/engine/eng_padlock.c | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'crypto/openssl')

diff --git a/crypto/openssl/crypto/engine/eng_all.c b/crypto/openssl/crypto/engine/eng_all.c
index 0f6992a..938d1ac 100644
--- a/crypto/openssl/crypto/engine/eng_all.c
+++ b/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
diff --git a/crypto/openssl/crypto/engine/eng_padlock.c b/crypto/openssl/crypto/engine/eng_padlock.c
index db9c52b..4ca4f39 100644
--- a/crypto/openssl/crypto/engine/eng_padlock.c
+++ b/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
-- 
cgit v1.1