Commit e8c9f01
crypto: disable ssl compression at build time
SSL compression was first disabled at runtime in March 2011 in commit
e83c695 ("Disable compression with OpenSSL.") for performance reasons
and was later shown to be vulnerable to information leakage (CRIME.)
Let's stop compiling it in altogether.
This commit removes a broken CHECK from src/node_crypto.cc; broken
because sk_SSL_COMP_num() returns -1 for a NULL stack, not 0. As a
result, node.js would abort when linked to an OPENSSL_NO_COMP build
of openssl.
PR-URL: #6582
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Fedor Indutny <fedor.indutny@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>1 parent 2d67741 commit e8c9f01
2 files changed
Lines changed: 5 additions & 13 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -214,10 +214,6 @@ | |||
| 214 | 214 | 'openssl/crypto/cms/cms_pwri.c', | |
| 215 | 215 | 'openssl/crypto/cms/cms_sd.c', | |
| 216 | 216 | 'openssl/crypto/cms/cms_smime.c', | |
| 217 | - 'openssl/crypto/comp/c_rle.c', | ||
| 218 | - 'openssl/crypto/comp/c_zlib.c', | ||
| 219 | - 'openssl/crypto/comp/comp_err.c', | ||
| 220 | - 'openssl/crypto/comp/comp_lib.c', | ||
| 221 | 217 | 'openssl/crypto/conf/conf_api.c', | |
| 222 | 218 | 'openssl/crypto/conf/conf_def.c', | |
| 223 | 219 | 'openssl/crypto/conf/conf_err.c', | |
@@ -1252,6 +1248,9 @@ | |||
| 1252 | 1248 | 'PURIFY', | |
| 1253 | 1249 | '_REENTRANT', | |
| 1254 | 1250 | ||
| 1251 | + # Compression is not used and considered insecure (CRIME.) | ||
| 1252 | + 'OPENSSL_NO_COMP', | ||
| 1253 | + | ||
| 1255 | 1254 | # SSLv3 is susceptible to downgrade attacks (POODLE.) | |
| 1256 | 1255 | 'OPENSSL_NO_SSL3', | |
| 1257 | 1256 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -5721,15 +5721,8 @@ void InitCryptoOnce() { | |||
| 5721 | 5721 | ||
| 5722 | 5722 | ||
| 5723 | 5723 | // Turn off compression. Saves memory and protects against CRIME attacks. | |
| 5724 | - #if !defined(OPENSSL_NO_COMP) | ||
| 5725 | - #if OPENSSL_VERSION_NUMBER < 0x00908000L | ||
| 5726 | - STACK_OF(SSL_COMP)* comp_methods = SSL_COMP_get_compression_method(); | ||
| 5727 | - #else | ||
| 5728 | - STACK_OF(SSL_COMP)* comp_methods = SSL_COMP_get_compression_methods(); | ||
| 5729 | - #endif | ||
| 5730 | - sk_SSL_COMP_zero(comp_methods); | ||
| 5731 | - CHECK_EQ(sk_SSL_COMP_num(comp_methods), 0); | ||
| 5732 | - #endif | ||
| 5724 | + // No-op with OPENSSL_NO_COMP builds of OpenSSL. | ||
| 5725 | + sk_SSL_COMP_zero(SSL_COMP_get_compression_methods()); | ||
| 5733 | 5726 | ||
| 5734 | 5727 | #ifndef OPENSSL_NO_ENGINE | |
| 5735 | 5728 | ERR_load_ENGINE_strings(); | |
0 commit comments