diff options
author | simon <simon@FreeBSD.org> | 2009-06-07 19:56:18 +0000 |
---|---|---|
committer | simon <simon@FreeBSD.org> | 2009-06-07 19:56:18 +0000 |
commit | fc5b6d55de4ea73602809deec0b965745f83a804 (patch) | |
tree | 873f9f63931a5d069bbcb053ea49eec4a92802dc /crypto/aes/aes_cbc.c | |
parent | 212fba63d3a2fed2e6ca619035a42526db27a3b8 (diff) | |
download | FreeBSD-src-fc5b6d55de4ea73602809deec0b965745f83a804.zip FreeBSD-src-fc5b6d55de4ea73602809deec0b965745f83a804.tar.gz |
Import OpenSSL 0.9.8k.
Diffstat (limited to 'crypto/aes/aes_cbc.c')
-rw-r--r-- | crypto/aes/aes_cbc.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/crypto/aes/aes_cbc.c b/crypto/aes/aes_cbc.c index d2ba6bc..373864c 100644 --- a/crypto/aes/aes_cbc.c +++ b/crypto/aes/aes_cbc.c @@ -59,6 +59,7 @@ #include <openssl/aes.h> #include "aes_locl.h" +#if !defined(OPENSSL_FIPS_AES_ASM) void AES_cbc_encrypt(const unsigned char *in, unsigned char *out, const unsigned long length, const AES_KEY *key, unsigned char *ivec, const int enc) { @@ -129,3 +130,4 @@ void AES_cbc_encrypt(const unsigned char *in, unsigned char *out, } } } +#endif |