summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBert Belder <bertbelder@gmail.com>2012-09-21 18:07:08 +0200
committerFedor Indutny <fedor.indutny@gmail.com>2013-02-20 16:49:03 +0400
commiteb29c4b2e6a294c66375bef19c2aaa9be8655f4a (patch)
tree9f49d9eddb2d6b94a145f3e3694946bda576209e
parentf317f5aee91a2c21d68a9b94b0742d6b45bc44e8 (diff)
downloadnode-eb29c4b2e6a294c66375bef19c2aaa9be8655f4a.tar.gz
openssl: disable HT sidechannel attack mitigation
It used to be off before. It's extremely unlikely that such an attack would be a viable attack against node. And it makes AES much slower.
-rwxr-xr-xdeps/openssl/openssl/crypto/aes/asm/aes-586.pl4
-rwxr-xr-xdeps/openssl/openssl/crypto/aes/asm/aes-x86_64.pl4
2 files changed, 4 insertions, 4 deletions
diff --git a/deps/openssl/openssl/crypto/aes/asm/aes-586.pl b/deps/openssl/openssl/crypto/aes/asm/aes-586.pl
index 687ed811b..6eb479035 100755
--- a/deps/openssl/openssl/crypto/aes/asm/aes-586.pl
+++ b/deps/openssl/openssl/crypto/aes/asm/aes-586.pl
@@ -2054,8 +2054,8 @@ my $mark=&DWP(76+240,"esp"); # copy of aes_key->rounds
&test ($s2,15);
&jnz (&label("slow_way"));
if (!$x86only) {
- &bt (&DWP(0,$s0),28); # check for hyper-threading bit
- &jc (&label("slow_way"));
+ #&bt (&DWP(0,$s0),28); # check for hyper-threading bit
+ #&jc (&label("slow_way"));
}
# pre-allocate aligned stack frame...
&lea ($acc,&DWP(-80-244,"esp"));
diff --git a/deps/openssl/openssl/crypto/aes/asm/aes-x86_64.pl b/deps/openssl/openssl/crypto/aes/asm/aes-x86_64.pl
index 34cbb5d84..9fa4ff5a6 100755
--- a/deps/openssl/openssl/crypto/aes/asm/aes-x86_64.pl
+++ b/deps/openssl/openssl/crypto/aes/asm/aes-x86_64.pl
@@ -1684,8 +1684,8 @@ AES_cbc_encrypt:
jb .Lcbc_slow_prologue
test \$15,%rdx
jnz .Lcbc_slow_prologue
- bt \$28,%r10d
- jc .Lcbc_slow_prologue
+ #bt \$28,%r10d
+ #jc .Lcbc_slow_prologue
# allocate aligned stack frame...
lea -88-248(%rsp),$key