@electerm/ssh2 1.16.0 → 1.16.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/client.js +2 -12
- package/lib/protocol/crypto/src/binding.cc +48 -24
- package/package.json +1 -1
- package/lib/protocol/crypto/build/Makefile +0 -347
- package/lib/protocol/crypto/build/Release/.deps/Release/obj.target/sshcrypto/src/binding.o.d +0 -247
- package/lib/protocol/crypto/build/Release/.deps/Release/sshcrypto.node.d +0 -1
- package/lib/protocol/crypto/build/Release/obj.target/sshcrypto/src/binding.o +0 -0
- package/lib/protocol/crypto/build/Release/sshcrypto.node +0 -0
- package/lib/protocol/crypto/build/binding.Makefile +0 -6
- package/lib/protocol/crypto/build/gyp-mac-tool +0 -772
- package/lib/protocol/crypto/build/sshcrypto.target.mk +0 -194
package/lib/client.js
CHANGED
|
@@ -461,18 +461,8 @@ class Client extends EventEmitter {
|
|
|
461
461
|
});
|
|
462
462
|
});
|
|
463
463
|
} else if (curAuth.type === 'publickey') {
|
|
464
|
-
proto.authPK(curAuth.username, curAuth.key, (buf, cb) => {
|
|
465
|
-
|
|
466
|
-
if (curAuth.key.type === 'ssh-rsa') {
|
|
467
|
-
if (this._protocol._remoteHostKeyAlgorithms
|
|
468
|
-
.includes('rsa-sha2-512')) {
|
|
469
|
-
signatureAlgo = 'sha512';
|
|
470
|
-
} else if (this._protocol._remoteHostKeyAlgorithms
|
|
471
|
-
.includes('rsa-sha2-256')) {
|
|
472
|
-
signatureAlgo = 'sha256';
|
|
473
|
-
}
|
|
474
|
-
}
|
|
475
|
-
const signature = curAuth.key.sign(buf, signatureAlgo);
|
|
464
|
+
proto.authPK(curAuth.username, curAuth.key, keyAlgo, (buf, cb) => {
|
|
465
|
+
const signature = curAuth.key.sign(buf, hashAlgo);
|
|
476
466
|
if (signature instanceof Error) {
|
|
477
467
|
signature.message =
|
|
478
468
|
`Error signing data with key: ${signature.message}`;
|
|
@@ -84,11 +84,15 @@ class ChaChaPolyCipher : public ObjectWrap {
|
|
|
84
84
|
SetPrototypeMethod(tpl, "encrypt", Encrypt);
|
|
85
85
|
SetPrototypeMethod(tpl, "free", Free);
|
|
86
86
|
|
|
87
|
-
|
|
87
|
+
Local<Function> func = Nan::GetFunction(tpl).ToLocalChecked();
|
|
88
|
+
Local<Context> context = Nan::GetCurrentContext();
|
|
89
|
+
v8::Isolate* isolate = context->GetIsolate();
|
|
90
|
+
|
|
91
|
+
constructor().Set(isolate, func);
|
|
88
92
|
|
|
89
93
|
Nan::Set(target,
|
|
90
94
|
Nan::New("ChaChaPolyCipher").ToLocalChecked(),
|
|
91
|
-
|
|
95
|
+
func);
|
|
92
96
|
}
|
|
93
97
|
|
|
94
98
|
private:
|
|
@@ -387,8 +391,8 @@ out:
|
|
|
387
391
|
obj->clear();
|
|
388
392
|
}
|
|
389
393
|
|
|
390
|
-
static inline
|
|
391
|
-
static
|
|
394
|
+
static inline v8::Eternal<v8::Function> & constructor() {
|
|
395
|
+
static v8::Eternal<v8::Function> my_constructor;
|
|
392
396
|
return my_constructor;
|
|
393
397
|
}
|
|
394
398
|
|
|
@@ -414,11 +418,15 @@ class AESGCMCipher : public ObjectWrap {
|
|
|
414
418
|
SetPrototypeMethod(tpl, "encrypt", Encrypt);
|
|
415
419
|
SetPrototypeMethod(tpl, "free", Free);
|
|
416
420
|
|
|
417
|
-
|
|
421
|
+
Local<Function> func = Nan::GetFunction(tpl).ToLocalChecked();
|
|
422
|
+
Local<Context> context = Nan::GetCurrentContext();
|
|
423
|
+
v8::Isolate* isolate = context->GetIsolate();
|
|
424
|
+
|
|
425
|
+
constructor().Set(isolate, func);
|
|
418
426
|
|
|
419
427
|
Nan::Set(target,
|
|
420
428
|
Nan::New("AESGCMCipher").ToLocalChecked(),
|
|
421
|
-
|
|
429
|
+
func);
|
|
422
430
|
}
|
|
423
431
|
|
|
424
432
|
private:
|
|
@@ -633,8 +641,8 @@ out:
|
|
|
633
641
|
obj->clear();
|
|
634
642
|
}
|
|
635
643
|
|
|
636
|
-
static inline
|
|
637
|
-
static
|
|
644
|
+
static inline v8::Eternal<v8::Function> & constructor() {
|
|
645
|
+
static v8::Eternal<v8::Function> my_constructor;
|
|
638
646
|
return my_constructor;
|
|
639
647
|
}
|
|
640
648
|
|
|
@@ -651,11 +659,15 @@ class GenericCipher : public ObjectWrap {
|
|
|
651
659
|
SetPrototypeMethod(tpl, "encrypt", Encrypt);
|
|
652
660
|
SetPrototypeMethod(tpl, "free", Free);
|
|
653
661
|
|
|
654
|
-
|
|
662
|
+
Local<Function> func = Nan::GetFunction(tpl).ToLocalChecked();
|
|
663
|
+
Local<Context> context = Nan::GetCurrentContext();
|
|
664
|
+
v8::Isolate* isolate = context->GetIsolate();
|
|
665
|
+
|
|
666
|
+
constructor().Set(isolate, func);
|
|
655
667
|
|
|
656
668
|
Nan::Set(target,
|
|
657
669
|
Nan::New("GenericCipher").ToLocalChecked(),
|
|
658
|
-
|
|
670
|
+
func);
|
|
659
671
|
}
|
|
660
672
|
|
|
661
673
|
private:
|
|
@@ -1014,8 +1026,8 @@ out:
|
|
|
1014
1026
|
obj->clear();
|
|
1015
1027
|
}
|
|
1016
1028
|
|
|
1017
|
-
static inline
|
|
1018
|
-
static
|
|
1029
|
+
static inline v8::Eternal<v8::Function> & constructor() {
|
|
1030
|
+
static v8::Eternal<v8::Function> my_constructor;
|
|
1019
1031
|
return my_constructor;
|
|
1020
1032
|
}
|
|
1021
1033
|
|
|
@@ -1044,11 +1056,15 @@ class ChaChaPolyDecipher : public ObjectWrap {
|
|
|
1044
1056
|
SetPrototypeMethod(tpl, "decryptLen", DecryptLen);
|
|
1045
1057
|
SetPrototypeMethod(tpl, "free", Free);
|
|
1046
1058
|
|
|
1047
|
-
|
|
1059
|
+
Local<Function> func = Nan::GetFunction(tpl).ToLocalChecked();
|
|
1060
|
+
Local<Context> context = Nan::GetCurrentContext();
|
|
1061
|
+
v8::Isolate* isolate = context->GetIsolate();
|
|
1062
|
+
|
|
1063
|
+
constructor().Set(isolate, func);
|
|
1048
1064
|
|
|
1049
1065
|
Nan::Set(target,
|
|
1050
1066
|
Nan::New("ChaChaPolyDecipher").ToLocalChecked(),
|
|
1051
|
-
|
|
1067
|
+
func);
|
|
1052
1068
|
}
|
|
1053
1069
|
|
|
1054
1070
|
private:
|
|
@@ -1440,8 +1456,8 @@ out:
|
|
|
1440
1456
|
obj->clear();
|
|
1441
1457
|
}
|
|
1442
1458
|
|
|
1443
|
-
static inline
|
|
1444
|
-
static
|
|
1459
|
+
static inline v8::Eternal<v8::Function> & constructor() {
|
|
1460
|
+
static v8::Eternal<v8::Function> my_constructor;
|
|
1445
1461
|
return my_constructor;
|
|
1446
1462
|
}
|
|
1447
1463
|
|
|
@@ -1468,11 +1484,15 @@ class AESGCMDecipher : public ObjectWrap {
|
|
|
1468
1484
|
SetPrototypeMethod(tpl, "decrypt", Decrypt);
|
|
1469
1485
|
SetPrototypeMethod(tpl, "free", Free);
|
|
1470
1486
|
|
|
1471
|
-
|
|
1487
|
+
Local<Function> func = Nan::GetFunction(tpl).ToLocalChecked();
|
|
1488
|
+
Local<Context> context = Nan::GetCurrentContext();
|
|
1489
|
+
v8::Isolate* isolate = context->GetIsolate();
|
|
1490
|
+
|
|
1491
|
+
constructor().Set(isolate, func);
|
|
1472
1492
|
|
|
1473
1493
|
Nan::Set(target,
|
|
1474
1494
|
Nan::New("AESGCMDecipher").ToLocalChecked(),
|
|
1475
|
-
|
|
1495
|
+
func);
|
|
1476
1496
|
}
|
|
1477
1497
|
|
|
1478
1498
|
private:
|
|
@@ -1697,8 +1717,8 @@ out:
|
|
|
1697
1717
|
obj->clear();
|
|
1698
1718
|
}
|
|
1699
1719
|
|
|
1700
|
-
static inline
|
|
1701
|
-
static
|
|
1720
|
+
static inline v8::Eternal<v8::Function> & constructor() {
|
|
1721
|
+
static v8::Eternal<v8::Function> my_constructor;
|
|
1702
1722
|
return my_constructor;
|
|
1703
1723
|
}
|
|
1704
1724
|
|
|
@@ -1716,11 +1736,15 @@ class GenericDecipher : public ObjectWrap {
|
|
|
1716
1736
|
SetPrototypeMethod(tpl, "decrypt", Decrypt);
|
|
1717
1737
|
SetPrototypeMethod(tpl, "free", Free);
|
|
1718
1738
|
|
|
1719
|
-
|
|
1739
|
+
Local<Function> func = Nan::GetFunction(tpl).ToLocalChecked();
|
|
1740
|
+
Local<Context> context = Nan::GetCurrentContext();
|
|
1741
|
+
v8::Isolate* isolate = context->GetIsolate();
|
|
1742
|
+
|
|
1743
|
+
constructor().Set(isolate, func);
|
|
1720
1744
|
|
|
1721
1745
|
Nan::Set(target,
|
|
1722
1746
|
Nan::New("GenericDecipher").ToLocalChecked(),
|
|
1723
|
-
|
|
1747
|
+
func);
|
|
1724
1748
|
}
|
|
1725
1749
|
|
|
1726
1750
|
private:
|
|
@@ -2183,8 +2207,8 @@ out:
|
|
|
2183
2207
|
obj->clear();
|
|
2184
2208
|
}
|
|
2185
2209
|
|
|
2186
|
-
static inline
|
|
2187
|
-
static
|
|
2210
|
+
static inline v8::Eternal<v8::Function> & constructor() {
|
|
2211
|
+
static v8::Eternal<v8::Function> my_constructor;
|
|
2188
2212
|
return my_constructor;
|
|
2189
2213
|
}
|
|
2190
2214
|
|
package/package.json
CHANGED
|
@@ -1,347 +0,0 @@
|
|
|
1
|
-
# We borrow heavily from the kernel build setup, though we are simpler since
|
|
2
|
-
# we don't have Kconfig tweaking settings on us.
|
|
3
|
-
|
|
4
|
-
# The implicit make rules have it looking for RCS files, among other things.
|
|
5
|
-
# We instead explicitly write all the rules we care about.
|
|
6
|
-
# It's even quicker (saves ~200ms) to pass -r on the command line.
|
|
7
|
-
MAKEFLAGS=-r
|
|
8
|
-
|
|
9
|
-
# The source directory tree.
|
|
10
|
-
srcdir := ..
|
|
11
|
-
abs_srcdir := $(abspath $(srcdir))
|
|
12
|
-
|
|
13
|
-
# The name of the builddir.
|
|
14
|
-
builddir_name ?= .
|
|
15
|
-
|
|
16
|
-
# The V=1 flag on command line makes us verbosely print command lines.
|
|
17
|
-
ifdef V
|
|
18
|
-
quiet=
|
|
19
|
-
else
|
|
20
|
-
quiet=quiet_
|
|
21
|
-
endif
|
|
22
|
-
|
|
23
|
-
# Specify BUILDTYPE=Release on the command line for a release build.
|
|
24
|
-
BUILDTYPE ?= Release
|
|
25
|
-
|
|
26
|
-
# Directory all our build output goes into.
|
|
27
|
-
# Note that this must be two directories beneath src/ for unit tests to pass,
|
|
28
|
-
# as they reach into the src/ directory for data with relative paths.
|
|
29
|
-
builddir ?= $(builddir_name)/$(BUILDTYPE)
|
|
30
|
-
abs_builddir := $(abspath $(builddir))
|
|
31
|
-
depsdir := $(builddir)/.deps
|
|
32
|
-
|
|
33
|
-
# Object output directory.
|
|
34
|
-
obj := $(builddir)/obj
|
|
35
|
-
abs_obj := $(abspath $(obj))
|
|
36
|
-
|
|
37
|
-
# We build up a list of every single one of the targets so we can slurp in the
|
|
38
|
-
# generated dependency rule Makefiles in one pass.
|
|
39
|
-
all_deps :=
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
CC.target ?= $(CC)
|
|
44
|
-
CFLAGS.target ?= $(CPPFLAGS) $(CFLAGS)
|
|
45
|
-
CXX.target ?= $(CXX)
|
|
46
|
-
CXXFLAGS.target ?= $(CPPFLAGS) $(CXXFLAGS)
|
|
47
|
-
LINK.target ?= $(LINK)
|
|
48
|
-
LDFLAGS.target ?= $(LDFLAGS)
|
|
49
|
-
AR.target ?= $(AR)
|
|
50
|
-
PLI.target ?= pli
|
|
51
|
-
|
|
52
|
-
# C++ apps need to be linked with g++.
|
|
53
|
-
LINK ?= $(CXX.target)
|
|
54
|
-
|
|
55
|
-
# TODO(evan): move all cross-compilation logic to gyp-time so we don't need
|
|
56
|
-
# to replicate this environment fallback in make as well.
|
|
57
|
-
CC.host ?= gcc
|
|
58
|
-
CFLAGS.host ?= $(CPPFLAGS_host) $(CFLAGS_host)
|
|
59
|
-
CXX.host ?= g++
|
|
60
|
-
CXXFLAGS.host ?= $(CPPFLAGS_host) $(CXXFLAGS_host)
|
|
61
|
-
LINK.host ?= $(CXX.host)
|
|
62
|
-
LDFLAGS.host ?= $(LDFLAGS_host)
|
|
63
|
-
AR.host ?= ar
|
|
64
|
-
PLI.host ?= pli
|
|
65
|
-
|
|
66
|
-
# Define a dir function that can handle spaces.
|
|
67
|
-
# http://www.gnu.org/software/make/manual/make.html#Syntax-of-Functions
|
|
68
|
-
# "leading spaces cannot appear in the text of the first argument as written.
|
|
69
|
-
# These characters can be put into the argument value by variable substitution."
|
|
70
|
-
empty :=
|
|
71
|
-
space := $(empty) $(empty)
|
|
72
|
-
|
|
73
|
-
# http://stackoverflow.com/questions/1189781/using-make-dir-or-notdir-on-a-path-with-spaces
|
|
74
|
-
replace_spaces = $(subst $(space),?,$1)
|
|
75
|
-
unreplace_spaces = $(subst ?,$(space),$1)
|
|
76
|
-
dirx = $(call unreplace_spaces,$(dir $(call replace_spaces,$1)))
|
|
77
|
-
|
|
78
|
-
# Flags to make gcc output dependency info. Note that you need to be
|
|
79
|
-
# careful here to use the flags that ccache and distcc can understand.
|
|
80
|
-
# We write to a dep file on the side first and then rename at the end
|
|
81
|
-
# so we can't end up with a broken dep file.
|
|
82
|
-
depfile = $(depsdir)/$(call replace_spaces,$@).d
|
|
83
|
-
DEPFLAGS = -MMD -MF $(depfile).raw
|
|
84
|
-
|
|
85
|
-
# We have to fixup the deps output in a few ways.
|
|
86
|
-
# (1) the file output should mention the proper .o file.
|
|
87
|
-
# ccache or distcc lose the path to the target, so we convert a rule of
|
|
88
|
-
# the form:
|
|
89
|
-
# foobar.o: DEP1 DEP2
|
|
90
|
-
# into
|
|
91
|
-
# path/to/foobar.o: DEP1 DEP2
|
|
92
|
-
# (2) we want missing files not to cause us to fail to build.
|
|
93
|
-
# We want to rewrite
|
|
94
|
-
# foobar.o: DEP1 DEP2 \
|
|
95
|
-
# DEP3
|
|
96
|
-
# to
|
|
97
|
-
# DEP1:
|
|
98
|
-
# DEP2:
|
|
99
|
-
# DEP3:
|
|
100
|
-
# so if the files are missing, they're just considered phony rules.
|
|
101
|
-
# We have to do some pretty insane escaping to get those backslashes
|
|
102
|
-
# and dollar signs past make, the shell, and sed at the same time.
|
|
103
|
-
# Doesn't work with spaces, but that's fine: .d files have spaces in
|
|
104
|
-
# their names replaced with other characters.
|
|
105
|
-
define fixup_dep
|
|
106
|
-
# The depfile may not exist if the input file didn't have any #includes.
|
|
107
|
-
touch $(depfile).raw
|
|
108
|
-
# Fixup path as in (1).
|
|
109
|
-
sed -e "s|^$(notdir $@)|$@|" $(depfile).raw >> $(depfile)
|
|
110
|
-
# Add extra rules as in (2).
|
|
111
|
-
# We remove slashes and replace spaces with new lines;
|
|
112
|
-
# remove blank lines;
|
|
113
|
-
# delete the first line and append a colon to the remaining lines.
|
|
114
|
-
sed -e 's|\\||' -e 'y| |\n|' $(depfile).raw |\
|
|
115
|
-
grep -v '^$$' |\
|
|
116
|
-
sed -e 1d -e 's|$$|:|' \
|
|
117
|
-
>> $(depfile)
|
|
118
|
-
rm $(depfile).raw
|
|
119
|
-
endef
|
|
120
|
-
|
|
121
|
-
# Command definitions:
|
|
122
|
-
# - cmd_foo is the actual command to run;
|
|
123
|
-
# - quiet_cmd_foo is the brief-output summary of the command.
|
|
124
|
-
|
|
125
|
-
quiet_cmd_cc = CC($(TOOLSET)) $@
|
|
126
|
-
cmd_cc = $(CC.$(TOOLSET)) -o $@ $< $(GYP_CFLAGS) $(DEPFLAGS) $(CFLAGS.$(TOOLSET)) -c
|
|
127
|
-
|
|
128
|
-
quiet_cmd_cxx = CXX($(TOOLSET)) $@
|
|
129
|
-
cmd_cxx = $(CXX.$(TOOLSET)) -o $@ $< $(GYP_CXXFLAGS) $(DEPFLAGS) $(CXXFLAGS.$(TOOLSET)) -c
|
|
130
|
-
|
|
131
|
-
quiet_cmd_objc = CXX($(TOOLSET)) $@
|
|
132
|
-
cmd_objc = $(CC.$(TOOLSET)) $(GYP_OBJCFLAGS) $(DEPFLAGS) -c -o $@ $<
|
|
133
|
-
|
|
134
|
-
quiet_cmd_objcxx = CXX($(TOOLSET)) $@
|
|
135
|
-
cmd_objcxx = $(CXX.$(TOOLSET)) $(GYP_OBJCXXFLAGS) $(DEPFLAGS) -c -o $@ $<
|
|
136
|
-
|
|
137
|
-
# Commands for precompiled header files.
|
|
138
|
-
quiet_cmd_pch_c = CXX($(TOOLSET)) $@
|
|
139
|
-
cmd_pch_c = $(CC.$(TOOLSET)) $(GYP_PCH_CFLAGS) $(DEPFLAGS) $(CXXFLAGS.$(TOOLSET)) -c -o $@ $<
|
|
140
|
-
quiet_cmd_pch_cc = CXX($(TOOLSET)) $@
|
|
141
|
-
cmd_pch_cc = $(CC.$(TOOLSET)) $(GYP_PCH_CXXFLAGS) $(DEPFLAGS) $(CXXFLAGS.$(TOOLSET)) -c -o $@ $<
|
|
142
|
-
quiet_cmd_pch_m = CXX($(TOOLSET)) $@
|
|
143
|
-
cmd_pch_m = $(CC.$(TOOLSET)) $(GYP_PCH_OBJCFLAGS) $(DEPFLAGS) -c -o $@ $<
|
|
144
|
-
quiet_cmd_pch_mm = CXX($(TOOLSET)) $@
|
|
145
|
-
cmd_pch_mm = $(CC.$(TOOLSET)) $(GYP_PCH_OBJCXXFLAGS) $(DEPFLAGS) -c -o $@ $<
|
|
146
|
-
|
|
147
|
-
# gyp-mac-tool is written next to the root Makefile by gyp.
|
|
148
|
-
# Use $(4) for the command, since $(2) and $(3) are used as flag by do_cmd
|
|
149
|
-
# already.
|
|
150
|
-
quiet_cmd_mac_tool = MACTOOL $(4) $<
|
|
151
|
-
cmd_mac_tool = ./gyp-mac-tool $(4) $< "$@"
|
|
152
|
-
|
|
153
|
-
quiet_cmd_mac_package_framework = PACKAGE FRAMEWORK $@
|
|
154
|
-
cmd_mac_package_framework = ./gyp-mac-tool package-framework "$@" $(4)
|
|
155
|
-
|
|
156
|
-
quiet_cmd_infoplist = INFOPLIST $@
|
|
157
|
-
cmd_infoplist = $(CC.$(TOOLSET)) -E -P -Wno-trigraphs -x c $(INFOPLIST_DEFINES) "$<" -o "$@"
|
|
158
|
-
|
|
159
|
-
quiet_cmd_touch = TOUCH $@
|
|
160
|
-
cmd_touch = touch $@
|
|
161
|
-
|
|
162
|
-
quiet_cmd_copy = COPY $@
|
|
163
|
-
# send stderr to /dev/null to ignore messages when linking directories.
|
|
164
|
-
cmd_copy = ln -f "$<" "$@" 2>/dev/null || (rm -rf "$@" && cp -af "$<" "$@")
|
|
165
|
-
|
|
166
|
-
quiet_cmd_symlink = SYMLINK $@
|
|
167
|
-
cmd_symlink = ln -sf "$<" "$@"
|
|
168
|
-
|
|
169
|
-
quiet_cmd_alink = LIBTOOL-STATIC $@
|
|
170
|
-
cmd_alink = rm -f $@ && ./gyp-mac-tool filter-libtool libtool $(GYP_LIBTOOLFLAGS) -static -o $@ $(filter %.o,$^)
|
|
171
|
-
|
|
172
|
-
quiet_cmd_link = LINK($(TOOLSET)) $@
|
|
173
|
-
cmd_link = $(LINK.$(TOOLSET)) $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -o "$@" $(LD_INPUTS) $(LIBS)
|
|
174
|
-
|
|
175
|
-
quiet_cmd_solink = SOLINK($(TOOLSET)) $@
|
|
176
|
-
cmd_solink = $(LINK.$(TOOLSET)) -shared $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -o "$@" $(LD_INPUTS) $(LIBS)
|
|
177
|
-
|
|
178
|
-
quiet_cmd_solink_module = SOLINK_MODULE($(TOOLSET)) $@
|
|
179
|
-
cmd_solink_module = $(LINK.$(TOOLSET)) -bundle $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -o $@ $(filter-out FORCE_DO_CMD, $^) $(LIBS)
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
# Define an escape_quotes function to escape single quotes.
|
|
183
|
-
# This allows us to handle quotes properly as long as we always use
|
|
184
|
-
# use single quotes and escape_quotes.
|
|
185
|
-
escape_quotes = $(subst ','\'',$(1))
|
|
186
|
-
# This comment is here just to include a ' to unconfuse syntax highlighting.
|
|
187
|
-
# Define an escape_vars function to escape '$' variable syntax.
|
|
188
|
-
# This allows us to read/write command lines with shell variables (e.g.
|
|
189
|
-
# $LD_LIBRARY_PATH), without triggering make substitution.
|
|
190
|
-
escape_vars = $(subst $$,$$$$,$(1))
|
|
191
|
-
# Helper that expands to a shell command to echo a string exactly as it is in
|
|
192
|
-
# make. This uses printf instead of echo because printf's behaviour with respect
|
|
193
|
-
# to escape sequences is more portable than echo's across different shells
|
|
194
|
-
# (e.g., dash, bash).
|
|
195
|
-
exact_echo = printf '%s\n' '$(call escape_quotes,$(1))'
|
|
196
|
-
|
|
197
|
-
# Helper to compare the command we're about to run against the command
|
|
198
|
-
# we logged the last time we ran the command. Produces an empty
|
|
199
|
-
# string (false) when the commands match.
|
|
200
|
-
# Tricky point: Make has no string-equality test function.
|
|
201
|
-
# The kernel uses the following, but it seems like it would have false
|
|
202
|
-
# positives, where one string reordered its arguments.
|
|
203
|
-
# arg_check = $(strip $(filter-out $(cmd_$(1)), $(cmd_$@)) \
|
|
204
|
-
# $(filter-out $(cmd_$@), $(cmd_$(1))))
|
|
205
|
-
# We instead substitute each for the empty string into the other, and
|
|
206
|
-
# say they're equal if both substitutions produce the empty string.
|
|
207
|
-
# .d files contain ? instead of spaces, take that into account.
|
|
208
|
-
command_changed = $(or $(subst $(cmd_$(1)),,$(cmd_$(call replace_spaces,$@))),\
|
|
209
|
-
$(subst $(cmd_$(call replace_spaces,$@)),,$(cmd_$(1))))
|
|
210
|
-
|
|
211
|
-
# Helper that is non-empty when a prerequisite changes.
|
|
212
|
-
# Normally make does this implicitly, but we force rules to always run
|
|
213
|
-
# so we can check their command lines.
|
|
214
|
-
# $? -- new prerequisites
|
|
215
|
-
# $| -- order-only dependencies
|
|
216
|
-
prereq_changed = $(filter-out FORCE_DO_CMD,$(filter-out $|,$?))
|
|
217
|
-
|
|
218
|
-
# Helper that executes all postbuilds until one fails.
|
|
219
|
-
define do_postbuilds
|
|
220
|
-
@E=0;\
|
|
221
|
-
for p in $(POSTBUILDS); do\
|
|
222
|
-
eval $$p;\
|
|
223
|
-
E=$$?;\
|
|
224
|
-
if [ $$E -ne 0 ]; then\
|
|
225
|
-
break;\
|
|
226
|
-
fi;\
|
|
227
|
-
done;\
|
|
228
|
-
if [ $$E -ne 0 ]; then\
|
|
229
|
-
rm -rf "$@";\
|
|
230
|
-
exit $$E;\
|
|
231
|
-
fi
|
|
232
|
-
endef
|
|
233
|
-
|
|
234
|
-
# do_cmd: run a command via the above cmd_foo names, if necessary.
|
|
235
|
-
# Should always run for a given target to handle command-line changes.
|
|
236
|
-
# Second argument, if non-zero, makes it do asm/C/C++ dependency munging.
|
|
237
|
-
# Third argument, if non-zero, makes it do POSTBUILDS processing.
|
|
238
|
-
# Note: We intentionally do NOT call dirx for depfile, since it contains ? for
|
|
239
|
-
# spaces already and dirx strips the ? characters.
|
|
240
|
-
define do_cmd
|
|
241
|
-
$(if $(or $(command_changed),$(prereq_changed)),
|
|
242
|
-
@$(call exact_echo, $($(quiet)cmd_$(1)))
|
|
243
|
-
@mkdir -p "$(call dirx,$@)" "$(dir $(depfile))"
|
|
244
|
-
$(if $(findstring flock,$(word 2,$(cmd_$1))),
|
|
245
|
-
@$(cmd_$(1))
|
|
246
|
-
@echo " $(quiet_cmd_$(1)): Finished",
|
|
247
|
-
@$(cmd_$(1))
|
|
248
|
-
)
|
|
249
|
-
@$(call exact_echo,$(call escape_vars,cmd_$(call replace_spaces,$@) := $(cmd_$(1)))) > $(depfile)
|
|
250
|
-
@$(if $(2),$(fixup_dep))
|
|
251
|
-
$(if $(and $(3), $(POSTBUILDS)),
|
|
252
|
-
$(call do_postbuilds)
|
|
253
|
-
)
|
|
254
|
-
)
|
|
255
|
-
endef
|
|
256
|
-
|
|
257
|
-
# Declare the "all" target first so it is the default,
|
|
258
|
-
# even though we don't have the deps yet.
|
|
259
|
-
.PHONY: all
|
|
260
|
-
all:
|
|
261
|
-
|
|
262
|
-
# make looks for ways to re-generate included makefiles, but in our case, we
|
|
263
|
-
# don't have a direct way. Explicitly telling make that it has nothing to do
|
|
264
|
-
# for them makes it go faster.
|
|
265
|
-
%.d: ;
|
|
266
|
-
|
|
267
|
-
# Use FORCE_DO_CMD to force a target to run. Should be coupled with
|
|
268
|
-
# do_cmd.
|
|
269
|
-
.PHONY: FORCE_DO_CMD
|
|
270
|
-
FORCE_DO_CMD:
|
|
271
|
-
|
|
272
|
-
TOOLSET := target
|
|
273
|
-
# Suffix rules, putting all outputs into $(obj).
|
|
274
|
-
$(obj).$(TOOLSET)/%.o: $(srcdir)/%.c FORCE_DO_CMD
|
|
275
|
-
@$(call do_cmd,cc,1)
|
|
276
|
-
$(obj).$(TOOLSET)/%.o: $(srcdir)/%.cc FORCE_DO_CMD
|
|
277
|
-
@$(call do_cmd,cxx,1)
|
|
278
|
-
$(obj).$(TOOLSET)/%.o: $(srcdir)/%.cpp FORCE_DO_CMD
|
|
279
|
-
@$(call do_cmd,cxx,1)
|
|
280
|
-
$(obj).$(TOOLSET)/%.o: $(srcdir)/%.cxx FORCE_DO_CMD
|
|
281
|
-
@$(call do_cmd,cxx,1)
|
|
282
|
-
$(obj).$(TOOLSET)/%.o: $(srcdir)/%.m FORCE_DO_CMD
|
|
283
|
-
@$(call do_cmd,objc,1)
|
|
284
|
-
$(obj).$(TOOLSET)/%.o: $(srcdir)/%.mm FORCE_DO_CMD
|
|
285
|
-
@$(call do_cmd,objcxx,1)
|
|
286
|
-
$(obj).$(TOOLSET)/%.o: $(srcdir)/%.s FORCE_DO_CMD
|
|
287
|
-
@$(call do_cmd,cc,1)
|
|
288
|
-
$(obj).$(TOOLSET)/%.o: $(srcdir)/%.S FORCE_DO_CMD
|
|
289
|
-
@$(call do_cmd,cc,1)
|
|
290
|
-
|
|
291
|
-
# Try building from generated source, too.
|
|
292
|
-
$(obj).$(TOOLSET)/%.o: $(obj).$(TOOLSET)/%.c FORCE_DO_CMD
|
|
293
|
-
@$(call do_cmd,cc,1)
|
|
294
|
-
$(obj).$(TOOLSET)/%.o: $(obj).$(TOOLSET)/%.cc FORCE_DO_CMD
|
|
295
|
-
@$(call do_cmd,cxx,1)
|
|
296
|
-
$(obj).$(TOOLSET)/%.o: $(obj).$(TOOLSET)/%.cpp FORCE_DO_CMD
|
|
297
|
-
@$(call do_cmd,cxx,1)
|
|
298
|
-
$(obj).$(TOOLSET)/%.o: $(obj).$(TOOLSET)/%.cxx FORCE_DO_CMD
|
|
299
|
-
@$(call do_cmd,cxx,1)
|
|
300
|
-
$(obj).$(TOOLSET)/%.o: $(obj).$(TOOLSET)/%.m FORCE_DO_CMD
|
|
301
|
-
@$(call do_cmd,objc,1)
|
|
302
|
-
$(obj).$(TOOLSET)/%.o: $(obj).$(TOOLSET)/%.mm FORCE_DO_CMD
|
|
303
|
-
@$(call do_cmd,objcxx,1)
|
|
304
|
-
$(obj).$(TOOLSET)/%.o: $(obj).$(TOOLSET)/%.s FORCE_DO_CMD
|
|
305
|
-
@$(call do_cmd,cc,1)
|
|
306
|
-
$(obj).$(TOOLSET)/%.o: $(obj).$(TOOLSET)/%.S FORCE_DO_CMD
|
|
307
|
-
@$(call do_cmd,cc,1)
|
|
308
|
-
|
|
309
|
-
$(obj).$(TOOLSET)/%.o: $(obj)/%.c FORCE_DO_CMD
|
|
310
|
-
@$(call do_cmd,cc,1)
|
|
311
|
-
$(obj).$(TOOLSET)/%.o: $(obj)/%.cc FORCE_DO_CMD
|
|
312
|
-
@$(call do_cmd,cxx,1)
|
|
313
|
-
$(obj).$(TOOLSET)/%.o: $(obj)/%.cpp FORCE_DO_CMD
|
|
314
|
-
@$(call do_cmd,cxx,1)
|
|
315
|
-
$(obj).$(TOOLSET)/%.o: $(obj)/%.cxx FORCE_DO_CMD
|
|
316
|
-
@$(call do_cmd,cxx,1)
|
|
317
|
-
$(obj).$(TOOLSET)/%.o: $(obj)/%.m FORCE_DO_CMD
|
|
318
|
-
@$(call do_cmd,objc,1)
|
|
319
|
-
$(obj).$(TOOLSET)/%.o: $(obj)/%.mm FORCE_DO_CMD
|
|
320
|
-
@$(call do_cmd,objcxx,1)
|
|
321
|
-
$(obj).$(TOOLSET)/%.o: $(obj)/%.s FORCE_DO_CMD
|
|
322
|
-
@$(call do_cmd,cc,1)
|
|
323
|
-
$(obj).$(TOOLSET)/%.o: $(obj)/%.S FORCE_DO_CMD
|
|
324
|
-
@$(call do_cmd,cc,1)
|
|
325
|
-
|
|
326
|
-
|
|
327
|
-
ifeq ($(strip $(foreach prefix,$(NO_LOAD),\
|
|
328
|
-
$(findstring $(join ^,$(prefix)),\
|
|
329
|
-
$(join ^,sshcrypto.target.mk)))),)
|
|
330
|
-
include sshcrypto.target.mk
|
|
331
|
-
endif
|
|
332
|
-
|
|
333
|
-
quiet_cmd_regen_makefile = ACTION Regenerating $@
|
|
334
|
-
cmd_regen_makefile = cd $(srcdir); /Users/home/.nvm/versions/node/v18.17.1/lib/node_modules/npm/node_modules/node-gyp/gyp/gyp_main.py -fmake --ignore-environment "-Dlibrary=shared_library" "-Dvisibility=default" "-Dnode_root_dir=/Users/home/Library/Caches/node-gyp/18.17.1" "-Dnode_gyp_dir=/Users/home/.nvm/versions/node/v18.17.1/lib/node_modules/npm/node_modules/node-gyp" "-Dnode_lib_file=/Users/home/Library/Caches/node-gyp/18.17.1/<(target_arch)/node.lib" "-Dmodule_root_dir=/Users/home/dev/ssh2/lib/protocol/crypto" "-Dnode_engine=v8" "--depth=." "-Goutput_dir=." "--generator-output=build" -I/Users/home/dev/ssh2/lib/protocol/crypto/build/config.gypi -I/Users/home/.nvm/versions/node/v18.17.1/lib/node_modules/npm/node_modules/node-gyp/addon.gypi -I/Users/home/Library/Caches/node-gyp/18.17.1/include/node/common.gypi "--toplevel-dir=." binding.gyp
|
|
335
|
-
Makefile: $(srcdir)/build/config.gypi $(srcdir)/binding.gyp $(srcdir)/../../../../../.nvm/versions/node/v18.17.1/lib/node_modules/npm/node_modules/node-gyp/addon.gypi $(srcdir)/../../../../../Library/Caches/node-gyp/18.17.1/include/node/common.gypi
|
|
336
|
-
$(call do_cmd,regen_makefile)
|
|
337
|
-
|
|
338
|
-
# "all" is a concatenation of the "all" targets from all the included
|
|
339
|
-
# sub-makefiles. This is just here to clarify.
|
|
340
|
-
all:
|
|
341
|
-
|
|
342
|
-
# Add in dependency-tracking rules. $(all_deps) is the list of every single
|
|
343
|
-
# target in our tree. Only consider the ones with .d (dependency) info:
|
|
344
|
-
d_files := $(wildcard $(foreach f,$(all_deps),$(depsdir)/$(f).d))
|
|
345
|
-
ifneq ($(d_files),)
|
|
346
|
-
include $(d_files)
|
|
347
|
-
endif
|