diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2011-06-05 17:36:44 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2011-06-05 17:36:44 +0000 |
| commit | c6fa97a6d6fffb057b3b96e7c0b75711dfd3bbc8 (patch) | |
| tree | ba309f05634d09ca5e76487e63bab7404c6ab412 /crypto/evp | |
| parent | 24d7159abd5e8a3fb5a75167e01b24230fb0874b (diff) | |
FIPS low level blocking for AES, RC4 and Camellia. This is complicated by
use of assembly language routines: rename the assembly language function
to the private_* variant unconditionally and perform tests from a small
C wrapper.
Diffstat (limited to 'crypto/evp')
| -rw-r--r-- | crypto/evp/e_rc4.c | 1 | ||||
| -rw-r--r-- | crypto/evp/evp_locl.h | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/crypto/evp/e_rc4.c b/crypto/evp/e_rc4.c index 8b5175e0fd..b4f6bda82d 100644 --- a/crypto/evp/e_rc4.c +++ b/crypto/evp/e_rc4.c @@ -62,6 +62,7 @@ #ifndef OPENSSL_NO_RC4 #include <openssl/evp.h> +#include "evp_locl.h" #include <openssl/objects.h> #include <openssl/rc4.h> diff --git a/crypto/evp/evp_locl.h b/crypto/evp/evp_locl.h index 0f2aacfb72..3f018f756f 100644 --- a/crypto/evp/evp_locl.h +++ b/crypto/evp/evp_locl.h @@ -363,6 +363,8 @@ void evp_pkey_set_cb_translate(BN_GENCB *cb, EVP_PKEY_CTX *ctx); #define idea_set_encrypt_key private_idea_set_encrypt_key #define SEED_set_key private_SEED_set_key #define RC2_set_key private_RC2_set_key +#define RC4_set_key private_RC4_set_key #define DES_set_key_unchecked private_DES_set_key_unchecked +#define Camellia_set_key private_Camellia_set_key #endif |