diff options
| author | Parménides GV <parmegv@sdf.org> | 2014-06-13 12:21:38 +0200 |
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2014-06-13 12:21:38 +0200 |
| commit | d09435a9d2adb0d0cafa0b1f9f6cfe326346cbc6 (patch) | |
| tree | 946278cd836aa6af639675f4eb5ec7378d783dd8 /app/openssl/crypto/des/set_key.c | |
| parent | 5d47fde84a03acb1201f8650c55dc0cd981df679 (diff) | |
| parent | 3a71bc9e4aa4296f460e2e3c55de74c9852477ad (diff) | |
Merge branch 'develop' into release-0.5.2
Diffstat (limited to 'app/openssl/crypto/des/set_key.c')
| -rw-r--r-- | app/openssl/crypto/des/set_key.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/app/openssl/crypto/des/set_key.c b/app/openssl/crypto/des/set_key.c index 3004cc3a..da4d62e1 100644 --- a/app/openssl/crypto/des/set_key.c +++ b/app/openssl/crypto/des/set_key.c @@ -63,6 +63,7 @@ * 1.1 added norm_expand_bits * 1.0 First working version */ +#include <openssl/crypto.h> #include "des_locl.h" OPENSSL_IMPLEMENT_GLOBAL(int,DES_check_key,0) /* defaults to false */ @@ -335,6 +336,13 @@ int DES_set_key_checked(const_DES_cblock *key, DES_key_schedule *schedule) } void DES_set_key_unchecked(const_DES_cblock *key, DES_key_schedule *schedule) +#ifdef OPENSSL_FIPS + { + fips_cipher_abort(DES); + private_DES_set_key_unchecked(key, schedule); + } +void private_DES_set_key_unchecked(const_DES_cblock *key, DES_key_schedule *schedule) +#endif { static const int shifts2[16]={0,0,1,1,1,1,1,1,0,1,1,1,1,1,1,0}; register DES_LONG c,d,t,s,t2; |