diff options
| author | Thordur I. Bjornsson <thib@cvs.openbsd.org> | 2010-07-01 17:44:21 +0000 |
|---|---|---|
| committer | Thordur I. Bjornsson <thib@cvs.openbsd.org> | 2010-07-01 17:44:21 +0000 |
| commit | ab69774ee53b4fa5e2b3a91df57ebaff21f01696 (patch) | |
| tree | f296ef36c074ac49171a78830344972dc2a30f6a /lib/libcrypto/evp | |
| parent | ed956e196a512c01027505409415dff674af7b92 (diff) | |
AES-NI engine support for OpenSSL.
This is code mostly picked up from upstream OpenSSL, or to be more exact
a diff from David Woodhouse <dwmw2 at infradead dot org>.
Remember to make includes before doing a build!
no objections from djm@
OK deraadt@, reyk@ (AES is about 4.25x faster on his x201 now)
Diffstat (limited to 'lib/libcrypto/evp')
| -rw-r--r-- | lib/libcrypto/evp/evp.h | 1 | ||||
| -rw-r--r-- | lib/libcrypto/evp/evp_err.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/lib/libcrypto/evp/evp.h b/lib/libcrypto/evp/evp.h index 51011f2b148..82b5862ce7c 100644 --- a/lib/libcrypto/evp/evp.h +++ b/lib/libcrypto/evp/evp.h @@ -959,6 +959,7 @@ void ERR_load_EVP_strings(void); /* Error codes for the EVP functions. */ /* Function codes. */ +#define EVP_F_AESNI_INIT_KEY 165 #define EVP_F_AES_INIT_KEY 133 #define EVP_F_ALG_MODULE_INIT 138 #define EVP_F_CAMELLIA_INIT_KEY 159 diff --git a/lib/libcrypto/evp/evp_err.c b/lib/libcrypto/evp/evp_err.c index b5b900d4fe4..ec2d127cd8b 100644 --- a/lib/libcrypto/evp/evp_err.c +++ b/lib/libcrypto/evp/evp_err.c @@ -70,6 +70,7 @@ static ERR_STRING_DATA EVP_str_functs[]= { +{ERR_FUNC(EVP_F_AESNI_INIT_KEY), "AESNI_INIT_KEY"}, {ERR_FUNC(EVP_F_AES_INIT_KEY), "AES_INIT_KEY"}, {ERR_FUNC(EVP_F_ALG_MODULE_INIT), "ALG_MODULE_INIT"}, {ERR_FUNC(EVP_F_CAMELLIA_INIT_KEY), "CAMELLIA_INIT_KEY"}, |