Skip to content

Commit

Permalink
Merge pull request #275 from InfoHunter/cast-removal
Browse files Browse the repository at this point in the history
Remove CAST cipher
  • Loading branch information
InfoHunter authored Aug 17, 2022
2 parents c04440f + f536b7c commit bff6711
Show file tree
Hide file tree
Showing 58 changed files with 1,953 additions and 4,498 deletions.
1 change: 0 additions & 1 deletion .github/workflows/run-checker-daily.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ jobs:
no-bulk,
no-cached-fetch,
no-capieng,
no-cast,
no-chacha,
no-cmac,
no-comp,
Expand Down
2 changes: 2 additions & 0 deletions CHANGES
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@

*) 支持新特性 - 添加导出符号前缀

*) 删除CAST算法

*) 删除PA-RISC架构代码

*) 删除MD2算法
Expand Down
5 changes: 2 additions & 3 deletions Configure
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ $config{perlargv} = [ @argvcopy ];
# crypto/build.info)
# We reverse the input list for cosmetic purely reasons, to compensate that
# 'unshift' adds at the front of the list (i.e. in reverse input order).
foreach ( reverse sort( 'aes', 'bf', 'cast', 'des', 'dh',
foreach ( reverse sort( 'aes', 'bf', 'des', 'dh',
'dsa', 'ec', 'hmac', 'idea', 'md5', 'mdc2',
'rc2', 'rc4', 'rc5', 'ripemd', 'sha',
'sm2', 'sm3', 'sm4', 'zuc', 'eia3') ) {
Expand Down Expand Up @@ -418,7 +418,6 @@ my @disablables = (
"bulk",
"cached-fetch",
"capieng",
"cast",
"chacha",
"cmac",
"cmp",
Expand Down Expand Up @@ -588,7 +587,7 @@ my @disable_cascades = (
# "what" => [ "cascade", ... ]
"bulk" => [ "shared", "dso",
"async", "autoload-config",
"blake2", "bf", "cast", "chacha",
"blake2", "bf", "chacha",
"cmac", "cms", "cmp", "comp", "ct",
"des", "dgram", "dh", "dsa",
"ec", "engine",
Expand Down
3 changes: 0 additions & 3 deletions apps/list.c
Original file line number Diff line number Diff line change
Expand Up @@ -1292,9 +1292,6 @@ static void list_disabled(void)
#ifdef OPENSSL_NO_BLAKE2
BIO_puts(bio_out, "BLAKE2\n");
#endif
#ifdef OPENSSL_NO_CAST
BIO_puts(bio_out, "CAST\n");
#endif
#ifdef OPENSSL_NO_CMAC
BIO_puts(bio_out, "CMAC\n");
#endif
Expand Down
6 changes: 2 additions & 4 deletions apps/progs.pl
Original file line number Diff line number Diff line change
Expand Up @@ -170,24 +170,22 @@
my %cipher_disabler = (
des3 => "des",
desx => "des",
cast5 => "cast",
);
foreach my $cmd (
"aes-128-cbc", "aes-128-ecb",
"aes-192-cbc", "aes-192-ecb",
"aes-256-cbc", "aes-256-ecb",
"base64", "zlib",
"des", "des3", "desx", "idea", "rc4", "rc4-40",
"rc2", "bf", "cast", "rc5",
"rc2", "bf", "rc5",
"des-ecb", "des-ede", "des-ede3",
"des-cbc", "des-ede-cbc","des-ede3-cbc",
"des-cfb", "des-ede-cfb","des-ede3-cfb",
"des-ofb", "des-ede-ofb","des-ede3-ofb",
"idea-cbc","idea-ecb", "idea-cfb", "idea-ofb",
"rc2-cbc", "rc2-ecb", "rc2-cfb","rc2-ofb", "rc2-64-cbc", "rc2-40-cbc",
"bf-cbc", "bf-ecb", "bf-cfb", "bf-ofb",
"cast5-cbc","cast5-ecb", "cast5-cfb","cast5-ofb",
"cast-cbc", "rc5-cbc", "rc5-ecb", "rc5-cfb", "rc5-ofb",
"rc5-cbc", "rc5-ecb", "rc5-cfb", "rc5-ofb",
"sm4-cbc", "sm4-ecb", "sm4-cfb", "sm4-ofb", "sm4-ctr"
) {
my $str = " {FT_cipher, \"$cmd\", enc_main, enc_options, NULL},\n";
Expand Down
5 changes: 1 addition & 4 deletions apps/speed.c
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ static const char *names[ALGOR_NUM] = {
"mdc2", "md4", "md5", "sha1", "rmd160",
"sha256", "sha512", "whirlpool", "hmac(md5)",
"des-cbc", "des-ede3", "rc4", "idea-cbc",
"rc2-cbc", "rc5-cbc", "blowfish", "cast-cbc",
"rc2-cbc", "rc5-cbc", "blowfish",
"aes-128-cbc", "aes-192-cbc", "aes-256-cbc",
"evp", "ghash", "rand", "cmac", "sm3", "sm4"
};
Expand Down Expand Up @@ -315,9 +315,6 @@ static const OPT_PAIR doit_choices[] = {
{"bf-cbc", D_CBC_BF},
{"blowfish", D_CBC_BF},
{"bf", D_CBC_BF},
{"cast-cbc", D_CBC_CAST},
{"cast", D_CBC_CAST},
{"cast5", D_CBC_CAST},
{"ghash", D_GHASH},
{"rand", D_RAND},
#ifndef OPENSSL_NO_SM3
Expand Down
2 changes: 1 addition & 1 deletion crypto/build.info
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
SUBDIRS=objects buffer bio stack lhash rand evp asn1 pem x509 conf \
txt_db pkcs7 pkcs12 ui kdf store property \
md4 md5 sha mdc2 hmac ripemd whrlpool poly1305 eia3 \
siphash sm3 des aes rc2 rc4 rc5 idea bf cast zuc \
siphash sm3 des aes rc2 rc4 rc5 idea bf zuc \
sm4 chacha modes bn ec rsa dsa dh sm2 dso engine \
err comp http ocsp cms ts srp cmac ct async ess crmf cmp encode_decode \
ffc
Expand Down
191 changes: 0 additions & 191 deletions crypto/cast/asm/cast-586.pl

This file was deleted.

26 changes: 0 additions & 26 deletions crypto/cast/build.info

This file was deleted.

Loading

0 comments on commit bff6711

Please sign in to comment.