Skip to content
This repository was archived by the owner on Apr 22, 2023. It is now read-only.

File tree

4 files changed

+5
-13
lines changed

4 files changed

+5
-13
lines changed
 

‎deps/openssl/openssl.gyp

+1-4
Original file line numberDiff line numberDiff line change
@@ -939,10 +939,7 @@
939939
],
940940
}],
941941
['target_arch=="arm"', {
942-
'sources': [
943-
'openssl/crypto/armcap.c',
944-
'openssl/crypto/armv4cpuid.S',
945-
],
942+
'sources': ['openssl/crypto/armcap.c'],
946943
}],
947944
],
948945
'include_dirs': [

‎deps/openssl/openssl/crypto/cryptlib.c

+2-4
Original file line numberDiff line numberDiff line change
@@ -661,11 +661,9 @@ const char *CRYPTO_get_lock_name(int type)
661661
return(sk_OPENSSL_STRING_value(app_locks,type-CRYPTO_NUM_LOCKS));
662662
}
663663

664-
#if !defined(_ARM_ARCH__) && \
665-
(defined(__i386) || defined(__i386__) || defined(_M_IX86) || \
664+
#if defined(__i386) || defined(__i386__) || defined(_M_IX86) || \
666665
defined(__INTEL__) || \
667-
defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD64) || \
668-
defined(_M_X64))
666+
defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD64) || defined(_M_X64)
669667

670668
unsigned int OPENSSL_ia32cap_P[2];
671669
unsigned long *OPENSSL_ia32cap_loc(void)

‎deps/openssl/openssl/crypto/mem_clr.c

-3
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,6 @@
6161

6262
unsigned char cleanse_ctr = 0;
6363

64-
#if !defined(_ARM_ARCH__)
65-
6664
void OPENSSL_cleanse(void *ptr, size_t len)
6765
{
6866
unsigned char *p = ptr;
@@ -77,4 +75,3 @@ void OPENSSL_cleanse(void *ptr, size_t len)
7775
ctr += (63 + (size_t)p);
7876
cleanse_ctr = (unsigned char)ctr;
7977
}
80-
#endif

‎node.gyp

+2-2
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@
162162
],
163163
},
164164
'conditions': [
165-
['OS in "linux freebsd"', {
165+
['OS=="linux"', {
166166
'ldflags': [
167167
'-Wl,--whole-archive <(PRODUCT_DIR)/libopenssl.a -Wl,--no-whole-archive',
168168
],
@@ -318,7 +318,7 @@
318318
],
319319
}],
320320
[
321-
'OS in "linux freebsd" and node_shared_v8=="false"', {
321+
'OS=="linux" and node_shared_v8=="false"', {
322322
'ldflags': [
323323
'-Wl,--whole-archive <(V8_BASE) -Wl,--no-whole-archive',
324324
],

0 commit comments

Comments
 (0)
This repository has been archived.