diff options
author | djm <> | 2009-01-09 12:14:11 +0000 |
---|---|---|
committer | djm <> | 2009-01-09 12:14:11 +0000 |
commit | a0fdc9ec41594852f67ec77dfad9cb06bacc4186 (patch) | |
tree | c43f6b3a4d93ad2cb3dcf93275295679d895a033 /src/lib/libcrypto/cast/c_skey.c | |
parent | 5a3c0a05c7f2c5d3c584b7c8d6aec836dd724c80 (diff) | |
download | openbsd-a0fdc9ec41594852f67ec77dfad9cb06bacc4186.tar.gz openbsd-a0fdc9ec41594852f67ec77dfad9cb06bacc4186.tar.bz2 openbsd-a0fdc9ec41594852f67ec77dfad9cb06bacc4186.zip |
import openssl-0.9.8j
Diffstat (limited to 'src/lib/libcrypto/cast/c_skey.c')
-rw-r--r-- | src/lib/libcrypto/cast/c_skey.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/lib/libcrypto/cast/c_skey.c b/src/lib/libcrypto/cast/c_skey.c index 76e40005c9..68e690a60c 100644 --- a/src/lib/libcrypto/cast/c_skey.c +++ b/src/lib/libcrypto/cast/c_skey.c | |||
@@ -57,6 +57,11 @@ | |||
57 | */ | 57 | */ |
58 | 58 | ||
59 | #include <openssl/cast.h> | 59 | #include <openssl/cast.h> |
60 | #include <openssl/crypto.h> | ||
61 | #ifdef OPENSSL_FIPS | ||
62 | #include <openssl/fips.h> | ||
63 | #endif | ||
64 | |||
60 | #include "cast_lcl.h" | 65 | #include "cast_lcl.h" |
61 | #include "cast_s.h" | 66 | #include "cast_s.h" |
62 | 67 | ||
@@ -72,7 +77,7 @@ | |||
72 | #define S6 CAST_S_table6 | 77 | #define S6 CAST_S_table6 |
73 | #define S7 CAST_S_table7 | 78 | #define S7 CAST_S_table7 |
74 | 79 | ||
75 | void CAST_set_key(CAST_KEY *key, int len, const unsigned char *data) | 80 | FIPS_NON_FIPS_VCIPHER_Init(CAST) |
76 | { | 81 | { |
77 | CAST_LONG x[16]; | 82 | CAST_LONG x[16]; |
78 | CAST_LONG z[16]; | 83 | CAST_LONG z[16]; |