diff options
| author |   djm <djm@openbsd.org> | 2009-01-09 12:13:50 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2009-01-09 12:13:50 +0000 |
| commit | 82a8dcafbb30bde31cbded094521103bf43ceb41 (patch) | |
| tree | 8859b263d86cce51b675cde925c3270362dc661e /lib/libcrypto/camellia/cmll_misc.c | |
| parent | Explain that any check pattern will work. (diff) | |
| download | wireguard-openbsd-82a8dcafbb30bde31cbded094521103bf43ceb41.tar.xz wireguard-openbsd-82a8dcafbb30bde31cbded094521103bf43ceb41.zip | |
import openssl-0.9.8j
Diffstat (limited to 'lib/libcrypto/camellia/cmll_misc.c')
| -rw-r--r-- | lib/libcrypto/camellia/cmll_misc.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/lib/libcrypto/camellia/cmll_misc.c b/lib/libcrypto/camellia/cmll_misc.c index f1047b54e03..2cd7aba9bbd 100644 --- a/lib/libcrypto/camellia/cmll_misc.c +++ b/lib/libcrypto/camellia/cmll_misc.c @@ -52,11 +52,24 @@ #include <openssl/opensslv.h> #include <openssl/camellia.h> #include "cmll_locl.h" +#include <openssl/crypto.h> +#ifdef OPENSSL_FIPS +#include <openssl/fips.h> +#endif const char CAMELLIA_version[]="CAMELLIA" OPENSSL_VERSION_PTEXT; int Camellia_set_key(const unsigned char *userKey, const int bits, CAMELLIA_KEY *key) +#ifdef OPENSSL_FIPS + { + if (FIPS_mode()) + FIPS_BAD_ABORT(CAMELLIA) + return private_Camellia_set_key(userKey, bits, key); + } +int private_Camellia_set_key(const unsigned char *userKey, const int bits, + CAMELLIA_KEY *key) +#endif { if (!userKey || !key) { |