summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBert Belder <bertbelder@gmail.com>2012-09-21 18:07:08 +0200
committerisaacs <i@izs.me>2012-09-25 08:51:03 -0700
commit66638a4435b5ccd46277019fea58794f04c82deb (patch)
treef957ab229a9cefb17a36dd99caa784b9d77cc1b9
parentd2fb507556498b9450b6397ac17e821edcab9a68 (diff)
downloadnode-66638a4435b5ccd46277019fea58794f04c82deb.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 aab40e6f1..fed3150f8 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 a545e892a..83aad2354 100755
--- a/deps/openssl/openssl/crypto/aes/asm/aes-x86_64.pl
+++ b/deps/openssl/openssl/crypto/aes/asm/aes-x86_64.pl
@@ -1674,8 +1674,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