diff options
| author | Mark Murray <markm@FreeBSD.org> | 2004-08-14 13:38:35 +0000 |
|---|---|---|
| committer | Mark Murray <markm@FreeBSD.org> | 2004-08-14 13:38:35 +0000 |
| commit | 1f9bb6cd2551e99f570c3a36d016fc74c05bbc12 (patch) | |
| tree | b5a7aec3d73271d863f637ed2313b3bcb93b2324 /crypto | |
| parent | 71fd4f60dafb4cf82f0ae8c8ba514879d20d4f9e (diff) | |
| download | src-1f9bb6cd2551e99f570c3a36d016fc74c05bbc12.tar.gz src-1f9bb6cd2551e99f570c3a36d016fc74c05bbc12.zip | |
Add support for C3 Nehemiah ACE ("Padlock") AES crypto. This comes
from OpenSSL 0.9.5 (yet to be released), and is pretty complete.
Notes
Notes:
svn path=/head/; revision=133718
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/openssl/crypto/engine/eng_all.c | 3 | ||||
| -rw-r--r-- | crypto/openssl/crypto/engine/eng_padlock.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/crypto/openssl/crypto/engine/eng_all.c b/crypto/openssl/crypto/engine/eng_all.c index 0f6992a40dbf..938d1ac8037a 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 db9c52bfb566..4ca4f39d8969 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 |