diff options
| author | markm <markm@FreeBSD.org> | 2004-08-14 13:38:35 +0000 |
|---|---|---|
| committer | markm <markm@FreeBSD.org> | 2004-08-14 13:38:35 +0000 |
| commit | 1659a5207b9353b648502fc1d7949a8d52db79f4 (patch) | |
| tree | b5a7aec3d73271d863f637ed2313b3bcb93b2324 | |
| parent | 3d9480a58869d144e4bd14f19403d0e2f2392fa1 (diff) | |
| download | FreeBSD-src-1659a5207b9353b648502fc1d7949a8d52db79f4.zip FreeBSD-src-1659a5207b9353b648502fc1d7949a8d52db79f4.tar.gz | |
Add support for C3 Nehemiah ACE ("Padlock") AES crypto. This comes
from OpenSSL 0.9.5 (yet to be released), and is pretty complete.
| -rw-r--r-- | crypto/openssl/crypto/engine/eng_all.c | 3 | ||||
| -rw-r--r-- | crypto/openssl/crypto/engine/eng_padlock.c | 2 | ||||
| -rw-r--r-- | secure/lib/libcrypto/Makefile | 2 |
3 files changed, 5 insertions, 2 deletions
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 diff --git a/secure/lib/libcrypto/Makefile b/secure/lib/libcrypto/Makefile index 81ac3c3..22c367f 100644 --- a/secure/lib/libcrypto/Makefile +++ b/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 \ |
