diff options
| author | Shane Lontis <shane.lontis@oracle.com> | 2019-08-26 09:05:08 +0200 |
|---|---|---|
| committer | Shane Lontis <shane.lontis@oracle.com> | 2019-08-26 09:05:08 +0200 |
| commit | 4a42e2640499ce46d2733c4316c5fe4594a37c54 (patch) | |
| tree | fe7235c50a838af626b46199beed5f85cb4e8b94 /crypto/des | |
| parent | Fix Issue OSS-Fuzz: Branch on uninitialized memory (in ccm code). (diff) | |
| download | openssl-4a42e2640499ce46d2733c4316c5fe4594a37c54.tar.xz openssl-4a42e2640499ce46d2733c4316c5fe4594a37c54.zip | |
Cleanup ciphers and Add 3des ciphers.
Moved the relevant ciphers into default and restructed headers to allow the move.
This removed most of the cases of #ifdef NO_XXX (which are now specified in build.info)
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9482)
Diffstat (limited to 'crypto/des')
| -rw-r--r-- | crypto/des/build.info | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/crypto/des/build.info b/crypto/des/build.info index 474d14e229..33dd90c89a 100644 --- a/crypto/des/build.info +++ b/crypto/des/build.info @@ -13,13 +13,14 @@ IF[{- !$disabled{asm} -}] ENDIF LIBS=../../libcrypto -SOURCE[../../libcrypto]=\ - set_key.c ecb_enc.c cbc_enc.c \ - ecb3_enc.c cfb64enc.c cfb64ede.c cfb_enc.c \ +$COMMON=set_key.c ecb3_enc.c $DESASM +SOURCE[../../libcrypto]=$COMMON\ + ecb_enc.c cbc_enc.c \ + cfb64enc.c cfb64ede.c cfb_enc.c \ ofb64ede.c ofb64enc.c ofb_enc.c \ str2key.c pcbc_enc.c qud_cksm.c rand_key.c \ - $DESASM \ fcrypt.c xcbc_enc.c cbc_cksm.c +SOURCE[../../providers/fips]=$COMMON GENERATE[des_enc-sparc.S]=asm/des_enc.m4 GENERATE[dest4-sparcv9.S]=asm/dest4-sparcv9.pl $(PERLASM_SCHEME) |