QuasarApp/openssl
4
0
Fork 0
mirror of https://github.com/QuasarApp/openssl.git synced 2025-05-02 12:39:38 +00:00
Code Issues Projects Releases Wiki Activity

Remove GOST again

Browse Source 
The config for the removed GOST engine reappeared by mistake.  Now
removed again.

Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
This commit is contained in:
Richard Levitte 2016-01-23 22:58:51 +01:00
parent 107b5792b2
commit 9e4d6fbf3d
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Configure
View File

@ -275,7 +275,6 @@ my @disablables = (
"ec_nistp_64_gcc_128", "ec_nistp_64_gcc_128",
"engine", "engine",
"err", # Really??? "err", # Really???
"gost",
"heartbeats", "heartbeats",
"hmac", "hmac",
"hw(-.+)?", "hw(-.+)?",
@ -358,9 +357,7 @@ my @disable_cascades = (
"zlib" => [ "zlib-dynamic" ], "zlib" => [ "zlib-dynamic" ],
"rijndael" => [ "aes" ], "rijndael" => [ "aes" ],
"des" => [ "mdc2" ], "des" => [ "mdc2" ],
"ec" => [ "ecdsa", "ecdh", "gost" ], "ec" => [ "ecdsa", "ecdh" ],
"dsa" => [ "gost" ],
"dh" => [ "gost" ],
"psk" => [ "jpake" ], "psk" => [ "jpake" ],
"dgram" => [ "dtls" ], "dgram" => [ "dtls" ],
@ -761,8 +758,6 @@ foreach (sort (keys %disabled))
{ $no_sse2 = 1; } { $no_sse2 = 1; }
elsif (/^engine$/) elsif (/^engine$/)
{ @{$config{dirs}} = grep !/^engine$/, @{$config{dirs}}; } { @{$config{dirs}} = grep !/^engine$/, @{$config{dirs}}; }
elsif (/^gost$/)
{ @{$config{engdirs}} = grep !/^ccgost$/, @{$config{engdirs}}; }
else else
{ {
my ($ALGO, $algo); my ($ALGO, $algo);