typenative 0.4.0 → 0.5.0
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/.github/workflows/ci.yml +2 -0
- package/CHANGELOG.md +372 -0
- package/CONTRIBUTION.md +1 -1
- package/README.md +62 -22
- package/ROUND2-HANDOFF.md +200 -0
- package/bin/cli.js +2 -0
- package/bin/go/bridge.js +74 -14
- package/bin/go/convert.js +48 -0
- package/bin/go/metadata.js +13 -4
- package/bin/go/overrides.js +4 -6
- package/bin/go/stdlib.generated.js +2 -0
- package/bin/index.js +130 -2
- package/bin/main.js +2 -0
- package/bin/node/assert.js +2 -2
- package/bin/node/async_hooks.js +1 -1
- package/bin/node/buffer.js +16 -5
- package/bin/node/child_process.js +57 -9
- package/bin/node/cluster.js +44 -6
- package/bin/node/core.js +1 -1
- package/bin/node/crypto.js +205 -4
- package/bin/node/crypto_keys.js +21 -21
- package/bin/node/dgram.js +231 -7
- package/bin/node/diagnostics_channel.js +3 -3
- package/bin/node/dns.js +472 -9
- package/bin/node/errno_tables.js +445 -0
- package/bin/node/events.js +3 -3
- package/bin/node/fetch.js +2 -2
- package/bin/node/fs.js +24 -17
- package/bin/node/fs_watch.js +5 -5
- package/bin/node/http.js +131 -33
- package/bin/node/http2.js +7 -4
- package/bin/node/module_v8.js +142 -0
- package/bin/node/net.js +17 -14
- package/bin/node/path.js +17 -3
- package/bin/node/process.js +274 -9
- package/bin/node/readline.js +272 -1
- package/bin/node/registry.js +5 -1
- package/bin/node/sqlite.js +65 -17
- package/bin/node/stream.js +220 -22
- package/bin/node/stream_web.js +10 -10
- package/bin/node/system_extra.js +3 -3
- package/bin/node/test.js +834 -234
- package/bin/node/test_coverage.js +187 -0
- package/bin/node/test_report.js +1392 -0
- package/bin/node/test_run.js +575 -0
- package/bin/node/timers.js +4 -4
- package/bin/node/tls.js +5 -5
- package/bin/node/url.js +23 -5
- package/bin/node/util.js +49 -8
- package/bin/node/util_extra.js +13 -37
- package/bin/node/webview.js +654 -0
- package/bin/node/worker_threads.js +80 -20
- package/bin/node/zlib.js +3 -3
- package/bin/parse-node.js +4 -0
- package/bin/transpiler.js +14457 -1723
- package/bin/typecheck-node.js +1 -0
- package/bin/version.js +1 -1
- package/conformance.md +1153 -884
- package/examples/README.md +47 -10
- package/examples/desktop-notes/README.md +108 -0
- package/examples/desktop-notes/bench.mjs +125 -0
- package/examples/desktop-notes/main.ts +131 -0
- package/examples/desktop-notes/package-lock.json +726 -0
- package/examples/desktop-notes/package.json +9 -0
- package/examples/desktop-notes/ui.ts +176 -0
- package/examples/dupe-finder/README.md +76 -0
- package/examples/dupe-finder/bench.mjs +120 -0
- package/examples/dupe-finder/main.ts +87 -0
- package/examples/json-server/README.md +31 -29
- package/examples/json-server/bench.mjs +130 -38
- package/examples/mandelbrot-png/README.md +65 -0
- package/examples/mandelbrot-png/bench.mjs +95 -0
- package/examples/mandelbrot-png/main.ts +98 -0
- package/examples/mandelbrot-png/preview.png +0 -0
- package/examples/marked-cli/README.md +159 -0
- package/examples/marked-cli/bench.mjs +178 -0
- package/examples/marked-cli/main.ts +292 -0
- package/examples/marked-cli/parity.mjs +185 -0
- package/examples/marked-cli/vendor/marked/LICENSE +44 -0
- package/examples/marked-cli/vendor/marked/VENDOR.md +26 -0
- package/examples/todo-cli/README.md +69 -0
- package/examples/todo-cli/bench.mjs +89 -0
- package/examples/todo-cli/main.ts +92 -0
- package/examples/yaml-cli/README.md +136 -0
- package/examples/yaml-cli/bench.mjs +265 -0
- package/examples/yaml-cli/main.ts +29 -0
- package/examples/yaml-cli/parity.mjs +156 -0
- package/examples/yaml-cli/vendor/yaml/LICENSE +13 -0
- package/examples/yaml-cli/vendor/yaml/VENDOR.md +25 -0
- package/govendor/github.com/jchv/go-webview2/LICENSE +22 -0
- package/govendor/github.com/jchv/go-webview2/README.md +21 -0
- package/govendor/github.com/jchv/go-webview2/common.go +84 -0
- package/govendor/github.com/jchv/go-webview2/go.mod +3 -0
- package/govendor/github.com/jchv/go-webview2/internal/w32/w32.go +194 -0
- package/govendor/github.com/jchv/go-webview2/internal/w32/w32_386.go +14 -0
- package/govendor/github.com/jchv/go-webview2/internal/w32/w32_64bit.go +15 -0
- package/govendor/github.com/jchv/go-webview2/pkg/edge/COREWEBVIEW2_COLOR.go +8 -0
- package/govendor/github.com/jchv/go-webview2/pkg/edge/COREWEBVIEW2_HOST_RESOURCE_ACCESS_KIND.go +9 -0
- package/govendor/github.com/jchv/go-webview2/pkg/edge/COREWEBVIEW2_KEY_EVENT_KIND.go +10 -0
- package/govendor/github.com/jchv/go-webview2/pkg/edge/COREWEBVIEW2_MOVE_FOCUS_REASON.go +9 -0
- package/govendor/github.com/jchv/go-webview2/pkg/edge/COREWEBVIEW2_PHYSICAL_KEY_STATUS.go +10 -0
- package/govendor/github.com/jchv/go-webview2/pkg/edge/COREWEBVIEW2_WEB_RESOURCE_CONTEXT.go +23 -0
- package/govendor/github.com/jchv/go-webview2/pkg/edge/ICoreWebView2AcceleratorKeyPressedEventArgs.go +78 -0
- package/govendor/github.com/jchv/go-webview2/pkg/edge/ICoreWebView2AcceleratorKeyPressedEventHandler.go +52 -0
- package/govendor/github.com/jchv/go-webview2/pkg/edge/ICoreWebView2Controller.go +132 -0
- package/govendor/github.com/jchv/go-webview2/pkg/edge/ICoreWebView2Controller2.go +74 -0
- package/govendor/github.com/jchv/go-webview2/pkg/edge/ICoreWebView2CreateCoreWebView2ControllerCompletedHandler.go +48 -0
- package/govendor/github.com/jchv/go-webview2/pkg/edge/ICoreWebView2NavigationCompletedEventArgs.go +17 -0
- package/govendor/github.com/jchv/go-webview2/pkg/edge/ICoreWebView2NavigationCompletedEventHandler.go +48 -0
- package/govendor/github.com/jchv/go-webview2/pkg/edge/ICoreWebView2Settings.go +270 -0
- package/govendor/github.com/jchv/go-webview2/pkg/edge/ICoreWebView2WebResourceRequest.go +43 -0
- package/govendor/github.com/jchv/go-webview2/pkg/edge/ICoreWebView2WebResourceRequestedEventArgs.go +51 -0
- package/govendor/github.com/jchv/go-webview2/pkg/edge/ICoreWebView2WebResourceRequestedEventHandler.go +48 -0
- package/govendor/github.com/jchv/go-webview2/pkg/edge/ICoreWebView2WebResourceResponse.go +21 -0
- package/govendor/github.com/jchv/go-webview2/pkg/edge/ICoreWebView2_2.go +21 -0
- package/govendor/github.com/jchv/go-webview2/pkg/edge/ICoreWebView2_3.go +60 -0
- package/govendor/github.com/jchv/go-webview2/pkg/edge/ICoreWebViewSettings.go +396 -0
- package/govendor/github.com/jchv/go-webview2/pkg/edge/chromium.go +361 -0
- package/govendor/github.com/jchv/go-webview2/pkg/edge/chromium_386.go +24 -0
- package/govendor/github.com/jchv/go-webview2/pkg/edge/chromium_amd64.go +22 -0
- package/govendor/github.com/jchv/go-webview2/pkg/edge/chromium_arm64.go +26 -0
- package/govendor/github.com/jchv/go-webview2/pkg/edge/comproc.go +13 -0
- package/govendor/github.com/jchv/go-webview2/pkg/edge/comproc_go17.go +51 -0
- package/govendor/github.com/jchv/go-webview2/pkg/edge/comproc_go18.go +16 -0
- package/govendor/github.com/jchv/go-webview2/pkg/edge/corewebview2.go +411 -0
- package/govendor/github.com/jchv/go-webview2/pkg/edge/guid.go +223 -0
- package/govendor/github.com/jchv/go-webview2/webview.go +482 -0
- package/govendor/github.com/jchv/go-webview2/webviewloader/README.md +3 -0
- package/govendor/github.com/jchv/go-webview2/webviewloader/module.go +153 -0
- package/govendor/github.com/jchv/go-webview2/webviewloader/module_386.go +6 -0
- package/govendor/github.com/jchv/go-webview2/webviewloader/module_amd64.go +6 -0
- package/govendor/github.com/jchv/go-webview2/webviewloader/module_arm64.go +6 -0
- package/govendor/github.com/jchv/go-webview2/webviewloader/sdk/arm64/WebView2Loader.dll +0 -0
- package/govendor/github.com/jchv/go-webview2/webviewloader/sdk/x64/WebView2Loader.dll +0 -0
- package/govendor/github.com/jchv/go-webview2/webviewloader/sdk/x86/WebView2Loader.dll +0 -0
- package/govendor/github.com/jchv/go-winloader/LICENSE.md +7 -0
- package/govendor/github.com/jchv/go-winloader/README.md +124 -0
- package/govendor/github.com/jchv/go-winloader/common.go +11 -0
- package/govendor/github.com/jchv/go-winloader/go.mod +3 -0
- package/govendor/github.com/jchv/go-winloader/internal/loader/loader.go +25 -0
- package/govendor/github.com/jchv/go-winloader/internal/loader/machine.go +53 -0
- package/govendor/github.com/jchv/go-winloader/internal/memloader/cache.go +42 -0
- package/govendor/github.com/jchv/go-winloader/internal/memloader/loader.go +253 -0
- package/govendor/github.com/jchv/go-winloader/internal/pe/export.go +76 -0
- package/govendor/github.com/jchv/go-winloader/internal/pe/format.go +522 -0
- package/govendor/github.com/jchv/go-winloader/internal/pe/import.go +106 -0
- package/govendor/github.com/jchv/go-winloader/internal/pe/module.go +91 -0
- package/govendor/github.com/jchv/go-winloader/internal/pe/reloc.go +177 -0
- package/govendor/github.com/jchv/go-winloader/internal/pe/util.go +40 -0
- package/govendor/github.com/jchv/go-winloader/internal/vmem/common.go +55 -0
- package/govendor/github.com/jchv/go-winloader/internal/vmem/memory_other.go +71 -0
- package/govendor/github.com/jchv/go-winloader/internal/vmem/memory_windows.go +179 -0
- package/govendor/github.com/jchv/go-winloader/internal/winloader/hacks_other.go +17 -0
- package/govendor/github.com/jchv/go-winloader/internal/winloader/hacks_windows.go +73 -0
- package/govendor/github.com/jchv/go-winloader/internal/winloader/loader_windows.go +64 -0
- package/govendor/github.com/jchv/go-winloader/internal/winloader/machine_windows.go +32 -0
- package/govendor/github.com/jchv/go-winloader/internal/winloader/nativearch_386.go +9 -0
- package/govendor/github.com/jchv/go-winloader/internal/winloader/nativearch_amd64.go +9 -0
- package/govendor/github.com/jchv/go-winloader/internal/winloader/nativearch_arm64.go +9 -0
- package/govendor/github.com/jchv/go-winloader/loader_other.go +24 -0
- package/govendor/github.com/jchv/go-winloader/loader_windows.go +33 -0
- package/govendor/manifest.txt +3 -1
- package/package.json +1 -1
- package/tsparser/main.go +4 -0
- package/types/typenative-go.d.ts +23 -0
- package/types/typenative-npm.d.ts +359 -7
- package/types/typenative.d.ts +283 -42
package/bin/node/crypto.js
CHANGED
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
// random bytes / UUIDs / ints, timingSafeEqual, PBKDF2 / HKDF, AES ciphers
|
|
3
3
|
// (cbc / ctr / gcm). Backed by Go's crypto packages.
|
|
4
4
|
import { defineClass, defineHelper, defineModule, setResults } from './registry.js';
|
|
5
|
+
import { streamListenerTypes } from './stream.js';
|
|
5
6
|
const cryptoHelper = `// node:crypto
|
|
6
7
|
func tnHashFactory(alg string) func() hash.Hash {
|
|
7
8
|
switch strings.ToLower(alg) {
|
|
@@ -42,6 +43,9 @@ type TnHash struct {
|
|
|
42
43
|
h hash.Hash
|
|
43
44
|
alg string
|
|
44
45
|
finalized bool
|
|
46
|
+
hmac bool
|
|
47
|
+
// set when the hash is used as a stream (hashStream)
|
|
48
|
+
stream interface{}
|
|
45
49
|
}
|
|
46
50
|
|
|
47
51
|
func TnCreateHash(alg string, options ...interface{}) *TnHash {
|
|
@@ -49,7 +53,7 @@ func TnCreateHash(alg string, options ...interface{}) *TnHash {
|
|
|
49
53
|
}
|
|
50
54
|
|
|
51
55
|
func TnCreateHmac(alg string, key interface{}, options ...interface{}) *TnHash {
|
|
52
|
-
return &TnHash{h: hmac.New(tnHashFactory(alg), tnCryptoBytes(key, "")), alg: alg}
|
|
56
|
+
return &TnHash{h: hmac.New(tnHashFactory(alg), tnCryptoBytes(key, "")), alg: alg, hmac: true}
|
|
53
57
|
}
|
|
54
58
|
|
|
55
59
|
// Bytes of data passed to crypto APIs: strings in an encoding (utf8 by default) or Buffers
|
|
@@ -76,6 +80,10 @@ func (h *TnHash) update(data interface{}, enc ...string) *TnHash {
|
|
|
76
80
|
}
|
|
77
81
|
|
|
78
82
|
func (h *TnHash) digestBytes() []byte {
|
|
83
|
+
// a second hmac.digest() is empty; a second hash.digest() throws
|
|
84
|
+
if h.finalized && h.hmac {
|
|
85
|
+
return []byte{}
|
|
86
|
+
}
|
|
79
87
|
if h.finalized {
|
|
80
88
|
panic(TnNodeError("Error", "ERR_CRYPTO_HASH_FINALIZED", "Digest already called"))
|
|
81
89
|
}
|
|
@@ -189,13 +197,158 @@ type TnCipher struct {
|
|
|
189
197
|
authTag []byte
|
|
190
198
|
autoPadding bool
|
|
191
199
|
finalized bool
|
|
200
|
+
wrapped bool
|
|
192
201
|
}
|
|
193
202
|
|
|
194
203
|
func TnGetCiphers() []string {
|
|
195
|
-
return []string{"aes-128-cbc", "aes-128-ctr", "aes-128-gcm", "aes-192-cbc", "aes-192-ctr", "aes-192-gcm", "aes-256-cbc", "aes-256-ctr", "aes-256-gcm"
|
|
204
|
+
return []string{"aes-128-cbc", "aes-128-ctr", "aes-128-gcm", "aes-192-cbc", "aes-192-ctr", "aes-192-gcm", "aes-256-cbc", "aes-256-ctr", "aes-256-gcm",
|
|
205
|
+
"aes128-wrap", "aes128-wrap-pad", "aes192-wrap", "aes192-wrap-pad", "aes256-wrap", "aes256-wrap-pad",
|
|
206
|
+
"id-aes128-wrap", "id-aes128-wrap-pad", "id-aes192-wrap", "id-aes192-wrap-pad", "id-aes256-wrap", "id-aes256-wrap-pad"}
|
|
207
|
+
}
|
|
208
|
+
|
|
209
|
+
// AES key wrap (RFC 3394) and key wrap with padding (RFC 5649): the whole
|
|
210
|
+
// input goes through one update(), as with OpenSSL
|
|
211
|
+
func tnAESWrapRounds(block cipher.Block, a []byte, r [][]byte) []byte {
|
|
212
|
+
n := len(r)
|
|
213
|
+
buf := make([]byte, 16)
|
|
214
|
+
for j := 0; j <= 5; j++ {
|
|
215
|
+
for i := 1; i <= n; i++ {
|
|
216
|
+
copy(buf, a)
|
|
217
|
+
copy(buf[8:], r[i-1])
|
|
218
|
+
block.Encrypt(buf, buf)
|
|
219
|
+
t := uint64(n*j + i)
|
|
220
|
+
for k := 0; k < 8; k++ {
|
|
221
|
+
a[k] = buf[k] ^ byte(t>>(56-8*k))
|
|
222
|
+
}
|
|
223
|
+
copy(r[i-1], buf[8:])
|
|
224
|
+
}
|
|
225
|
+
}
|
|
226
|
+
out := append([]byte{}, a...)
|
|
227
|
+
for _, b := range r {
|
|
228
|
+
out = append(out, b...)
|
|
229
|
+
}
|
|
230
|
+
return out
|
|
231
|
+
}
|
|
232
|
+
|
|
233
|
+
func tnAESUnwrapRounds(block cipher.Block, data []byte) ([]byte, []byte) {
|
|
234
|
+
n := len(data)/8 - 1
|
|
235
|
+
a := append([]byte{}, data[:8]...)
|
|
236
|
+
r := make([][]byte, n)
|
|
237
|
+
for i := range r {
|
|
238
|
+
r[i] = append([]byte{}, data[8*(i+1):8*(i+2)]...)
|
|
239
|
+
}
|
|
240
|
+
buf := make([]byte, 16)
|
|
241
|
+
for j := 5; j >= 0; j-- {
|
|
242
|
+
for i := n; i >= 1; i-- {
|
|
243
|
+
t := uint64(n*j + i)
|
|
244
|
+
for k := 0; k < 8; k++ {
|
|
245
|
+
buf[k] = a[k] ^ byte(t>>(56-8*k))
|
|
246
|
+
}
|
|
247
|
+
copy(buf[8:], r[i-1])
|
|
248
|
+
block.Decrypt(buf, buf)
|
|
249
|
+
copy(a, buf[:8])
|
|
250
|
+
copy(r[i-1], buf[8:])
|
|
251
|
+
}
|
|
252
|
+
}
|
|
253
|
+
plain := []byte{}
|
|
254
|
+
for _, b := range r {
|
|
255
|
+
plain = append(plain, b...)
|
|
256
|
+
}
|
|
257
|
+
return a, plain
|
|
258
|
+
}
|
|
259
|
+
|
|
260
|
+
func tnWrapState() *TnError {
|
|
261
|
+
return TnNodeError("Error", "", "Trying to add data in unsupported state")
|
|
262
|
+
}
|
|
263
|
+
|
|
264
|
+
func (c *TnCipher) keyWrap(data []byte) []byte {
|
|
265
|
+
if c.wrapped {
|
|
266
|
+
panic(tnWrapState())
|
|
267
|
+
}
|
|
268
|
+
c.wrapped = true
|
|
269
|
+
padded := c.mode == "wrap-pad"
|
|
270
|
+
if !c.decrypt {
|
|
271
|
+
if padded {
|
|
272
|
+
aiv := append(append([]byte{}, c.iv...), byte(len(data)>>24), byte(len(data)>>16), byte(len(data)>>8), byte(len(data)))
|
|
273
|
+
plain := append(append([]byte{}, data...), make([]byte, (8-len(data)%8)%8)...)
|
|
274
|
+
if len(plain) == 8 {
|
|
275
|
+
out := make([]byte, 16)
|
|
276
|
+
c.block.Encrypt(out, append(aiv, plain...))
|
|
277
|
+
return out
|
|
278
|
+
}
|
|
279
|
+
data = plain
|
|
280
|
+
c.iv = aiv
|
|
281
|
+
} else if len(data) < 16 || len(data)%8 != 0 {
|
|
282
|
+
panic(tnWrapState())
|
|
283
|
+
}
|
|
284
|
+
r := make([][]byte, len(data)/8)
|
|
285
|
+
for i := range r {
|
|
286
|
+
r[i] = append([]byte{}, data[8*i:8*i+8]...)
|
|
287
|
+
}
|
|
288
|
+
return tnAESWrapRounds(c.block, append([]byte{}, c.iv...), r)
|
|
289
|
+
}
|
|
290
|
+
if len(data) < 16 || len(data)%8 != 0 {
|
|
291
|
+
panic(tnWrapState())
|
|
292
|
+
}
|
|
293
|
+
var a, plain []byte
|
|
294
|
+
if padded && len(data) == 16 {
|
|
295
|
+
buf := make([]byte, 16)
|
|
296
|
+
c.block.Decrypt(buf, data)
|
|
297
|
+
a, plain = buf[:8], buf[8:]
|
|
298
|
+
} else {
|
|
299
|
+
a, plain = tnAESUnwrapRounds(c.block, data)
|
|
300
|
+
}
|
|
301
|
+
if !padded {
|
|
302
|
+
if subtle.ConstantTimeCompare(a, c.iv) != 1 {
|
|
303
|
+
panic(tnWrapState())
|
|
304
|
+
}
|
|
305
|
+
return plain
|
|
306
|
+
}
|
|
307
|
+
size := int(a[4])<<24 | int(a[5])<<16 | int(a[6])<<8 | int(a[7])
|
|
308
|
+
if subtle.ConstantTimeCompare(a[:4], c.iv) != 1 || size > len(plain) || size <= len(plain)-8 {
|
|
309
|
+
panic(tnWrapState())
|
|
310
|
+
}
|
|
311
|
+
for _, b := range plain[size:] {
|
|
312
|
+
if b != 0 {
|
|
313
|
+
panic(tnWrapState())
|
|
314
|
+
}
|
|
315
|
+
}
|
|
316
|
+
return plain[:size]
|
|
317
|
+
}
|
|
318
|
+
|
|
319
|
+
// aes128-wrap / id-aes256-wrap-pad / …
|
|
320
|
+
func tnCreateWrapCipher(alg string, key interface{}, iv interface{}, decrypt bool) *TnCipher {
|
|
321
|
+
name := strings.TrimPrefix(strings.ToLower(alg), "id-")
|
|
322
|
+
mode := "wrap"
|
|
323
|
+
if strings.HasSuffix(name, "-wrap-pad") {
|
|
324
|
+
mode = "wrap-pad"
|
|
325
|
+
}
|
|
326
|
+
bits := strings.TrimSuffix(strings.TrimSuffix(strings.TrimPrefix(name, "aes"), "-pad"), "-wrap")
|
|
327
|
+
k := tnCryptoBytes(key, "")
|
|
328
|
+
if strconv.Itoa(len(k)*8) != bits {
|
|
329
|
+
panic(TnNodeError("RangeError", "ERR_CRYPTO_INVALID_KEYLEN", "Invalid key length"))
|
|
330
|
+
}
|
|
331
|
+
block, err := aes.NewCipher(k)
|
|
332
|
+
if err != nil {
|
|
333
|
+
panic(TnNodeError("RangeError", "ERR_CRYPTO_INVALID_KEYLEN", "Invalid key length"))
|
|
334
|
+
}
|
|
335
|
+
ivBytes := []byte{0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6}
|
|
336
|
+
if mode == "wrap-pad" {
|
|
337
|
+
ivBytes = []byte{0xA6, 0x59, 0x59, 0xA6}
|
|
338
|
+
}
|
|
339
|
+
if iv != nil && !TnIsNil(iv) {
|
|
340
|
+
ivBytes = tnCryptoBytes(iv, "")
|
|
341
|
+
}
|
|
342
|
+
if len(ivBytes) != 8 && mode == "wrap" || len(ivBytes) != 4 && mode == "wrap-pad" {
|
|
343
|
+
panic(TnNodeError("TypeError", "ERR_CRYPTO_INVALID_IV", "Invalid initialization vector"))
|
|
344
|
+
}
|
|
345
|
+
return &TnCipher{decrypt: decrypt, mode: mode, block: block, iv: ivBytes}
|
|
196
346
|
}
|
|
197
347
|
|
|
198
348
|
func TnCreateCipher(alg string, key interface{}, iv interface{}, decrypt bool, options ...interface{}) *TnCipher {
|
|
349
|
+
if strings.Contains(strings.ToLower(alg), "-wrap") {
|
|
350
|
+
return tnCreateWrapCipher(alg, key, iv, decrypt)
|
|
351
|
+
}
|
|
199
352
|
parts := strings.Split(strings.ToLower(alg), "-")
|
|
200
353
|
if len(parts) != 3 || parts[0] != "aes" {
|
|
201
354
|
panic(TnNodeError("Error", "ERR_CRYPTO_UNKNOWN_CIPHER", "Unknown cipher"))
|
|
@@ -238,6 +391,8 @@ func TnCreateCipher(alg string, key interface{}, iv interface{}, decrypt bool, o
|
|
|
238
391
|
|
|
239
392
|
func (c *TnCipher) process(data []byte) []byte {
|
|
240
393
|
switch c.mode {
|
|
394
|
+
case "wrap", "wrap-pad":
|
|
395
|
+
return c.keyWrap(data)
|
|
241
396
|
case "ctr":
|
|
242
397
|
out := make([]byte, len(data))
|
|
243
398
|
c.stream.XORKeyStream(out, data)
|
|
@@ -264,7 +419,7 @@ func (c *TnCipher) finish() []byte {
|
|
|
264
419
|
}
|
|
265
420
|
c.finalized = true
|
|
266
421
|
switch c.mode {
|
|
267
|
-
case "ctr":
|
|
422
|
+
case "ctr", "wrap", "wrap-pad":
|
|
268
423
|
return []byte{}
|
|
269
424
|
case "gcm":
|
|
270
425
|
if c.decrypt {
|
|
@@ -344,6 +499,38 @@ func (c *TnCipher) setAutoPadding(pad ...bool) *TnCipher {
|
|
|
344
499
|
c.autoPadding = len(pad) == 0 || pad[0]
|
|
345
500
|
return c
|
|
346
501
|
}`;
|
|
502
|
+
// Hash / Hmac as streams (write / end / pipe / pipeline): a transform that
|
|
503
|
+
// hashes what is written and pushes the digest at the end, as in Node; only
|
|
504
|
+
// programs that use a hash as a stream carry it
|
|
505
|
+
const hashStreamHelper = `func (h *TnHash) tnStream() *TnStream {
|
|
506
|
+
if h.stream == nil {
|
|
507
|
+
s := TnNewTransform()
|
|
508
|
+
s.goTransform = func(chunk []byte) {
|
|
509
|
+
if !h.finalized {
|
|
510
|
+
h.h.Write(chunk)
|
|
511
|
+
}
|
|
512
|
+
}
|
|
513
|
+
s.goFlush = func() []byte { return h.digestBytes() }
|
|
514
|
+
h.stream = s
|
|
515
|
+
}
|
|
516
|
+
return h.stream.(*TnStream)
|
|
517
|
+
}
|
|
518
|
+
|
|
519
|
+
func (h *TnHash) write(chunk interface{}, args ...interface{}) bool {
|
|
520
|
+
return h.tnStream().write(chunk, args...)
|
|
521
|
+
}
|
|
522
|
+
|
|
523
|
+
func (h *TnHash) end(args ...interface{}) *TnStream { return h.tnStream().end(args...) }
|
|
524
|
+
|
|
525
|
+
func (h *TnHash) on(event string, fn interface{}) *TnEventEmitter { return h.tnStream().on(event, fn) }
|
|
526
|
+
|
|
527
|
+
func (h *TnHash) once(event string, fn interface{}) *TnEventEmitter {
|
|
528
|
+
return h.tnStream().once(event, fn)
|
|
529
|
+
}
|
|
530
|
+
|
|
531
|
+
func (h *TnHash) read(size ...float64) interface{} { return h.tnStream().read(size...) }
|
|
532
|
+
|
|
533
|
+
func (h *TnHash) setEncoding(enc string) *TnStream { return h.tnStream().setEncoding(enc) }`;
|
|
347
534
|
export function registerCrypto(r) {
|
|
348
535
|
defineModule(r, 'crypto');
|
|
349
536
|
r.globals['crypto'] = 'crypto';
|
|
@@ -368,7 +555,21 @@ export function registerCrypto(r) {
|
|
|
368
555
|
'strconv',
|
|
369
556
|
'strings'
|
|
370
557
|
], ['error', 'buffer', 'dynamic'], cryptoHelper);
|
|
371
|
-
defineClass(r, 'crypto.Hash', '*TnHash', 'class', 'update=*TnHash; copy=*TnHash', '', '', '');
|
|
558
|
+
defineClass(r, 'crypto.Hash', '*TnHash', 'class', 'update=*TnHash; copy=*TnHash; write=bool; end=*TnStream; on=*TnEventEmitter; once=*TnEventEmitter; read=interface{}; setEncoding=*TnStream; pipe=interface{}', '', '', '');
|
|
559
|
+
defineHelper(r, 'hashStream', [], ['nodeCrypto', 'nodeStream'], hashStreamHelper);
|
|
560
|
+
for (const method of ['write', 'end', 'on', 'once', 'read', 'setEncoding']) {
|
|
561
|
+
r.methods[`crypto.Hash#${method}`] = (c) => {
|
|
562
|
+
r.helper('hashStream');
|
|
563
|
+
return `${c.recv}.${method}(${c.args.join(', ')})`;
|
|
564
|
+
};
|
|
565
|
+
}
|
|
566
|
+
r.methods['crypto.Hash#pipe'] = (c) => {
|
|
567
|
+
r.helper('hashStream');
|
|
568
|
+
return `TnPipe(${c.recv}, ${c.args.join(', ')})`;
|
|
569
|
+
};
|
|
570
|
+
r.typers['crypto.Hash#pipe'] = (c) => c.types[0] || '*TnStream';
|
|
571
|
+
r.paramTypers['crypto.Hash#on'] = (nodes) => streamListenerTypes(nodes);
|
|
572
|
+
r.paramTypers['crypto.Hash#once'] = r.paramTypers['crypto.Hash#on'];
|
|
372
573
|
r.classes['crypto.Hmac'] = r.classes['crypto.Hash'];
|
|
373
574
|
defineClass(r, 'crypto.Cipher', '*TnCipher', 'class', 'setAAD=*TnCipher; setAuthTag=*TnCipher; getAuthTag=[]byte; setAutoPadding=*TnCipher', '', '', '');
|
|
374
575
|
r.classes['crypto.Cipheriv'] = r.classes['crypto.Cipher'];
|
package/bin/node/crypto_keys.js
CHANGED
|
@@ -272,19 +272,19 @@ func tnReadKeyInput(v interface{}) tnKeyInput {
|
|
|
272
272
|
if v == nil || TnIsNil(v) {
|
|
273
273
|
panic(TnNodeError("TypeError", "ERR_INVALID_ARG_TYPE", "The \\"key\\" argument must be of type string or an instance of ArrayBuffer, Buffer, TypedArray, DataView, KeyObject, or CryptoKey. Received undefined"))
|
|
274
274
|
}
|
|
275
|
-
if f, ok :=
|
|
275
|
+
if f, ok := TnGetValue(v, "format").(string); ok && f != "" {
|
|
276
276
|
in.format = f
|
|
277
277
|
}
|
|
278
|
-
if t, ok :=
|
|
278
|
+
if t, ok := TnGetValue(v, "type").(string); ok {
|
|
279
279
|
in.typ = t
|
|
280
280
|
}
|
|
281
|
-
switch k :=
|
|
281
|
+
switch k := TnGetValue(v, "key").(type) {
|
|
282
282
|
case *TnKeyObject:
|
|
283
283
|
in.object = k
|
|
284
284
|
case *TnCryptoKey:
|
|
285
285
|
in.object = k.key
|
|
286
286
|
case string:
|
|
287
|
-
enc, _ :=
|
|
287
|
+
enc, _ := TnGetValue(v, "encoding").(string)
|
|
288
288
|
if enc != "" && in.format != "pem" {
|
|
289
289
|
in.data = TnBufferFromString(k, enc)
|
|
290
290
|
} else {
|
|
@@ -577,7 +577,7 @@ func tnJWK(pub tncrypto.PublicKey, priv tncrypto.PrivateKey) map[string]interfac
|
|
|
577
577
|
}
|
|
578
578
|
|
|
579
579
|
func tnJWKBytes(jwk interface{}, key string) []byte {
|
|
580
|
-
s, _ :=
|
|
580
|
+
s, _ := TnGetValue(jwk, key).(string)
|
|
581
581
|
if s == "" {
|
|
582
582
|
return nil
|
|
583
583
|
}
|
|
@@ -604,7 +604,7 @@ func tnBigFrom(b []byte) *tnbig.Int { return new(tnbig.Int).SetBytes(b) }
|
|
|
604
604
|
|
|
605
605
|
// Keys from a JWK object (RSA, EC, OKP Ed25519 / X25519)
|
|
606
606
|
func tnKeyFromJWK(jwk interface{}) (tncrypto.PublicKey, tncrypto.PrivateKey) {
|
|
607
|
-
kty, _ :=
|
|
607
|
+
kty, _ := TnGetValue(jwk, "kty").(string)
|
|
608
608
|
switch kty {
|
|
609
609
|
case "RSA":
|
|
610
610
|
pub := &rsa.PublicKey{N: tnBigFrom(tnJWKBytes(jwk, "n")), E: int(tnBigFrom(tnJWKBytes(jwk, "e")).Int64())}
|
|
@@ -616,7 +616,7 @@ func tnKeyFromJWK(jwk interface{}) (tncrypto.PublicKey, tncrypto.PrivateKey) {
|
|
|
616
616
|
priv.Precompute()
|
|
617
617
|
return &priv.PublicKey, priv
|
|
618
618
|
case "EC":
|
|
619
|
-
crv, _ :=
|
|
619
|
+
crv, _ := TnGetValue(jwk, "crv").(string)
|
|
620
620
|
pub := &ecdsa.PublicKey{Curve: tnNamedCurve(crv), X: tnBigFrom(tnJWKBytes(jwk, "x")), Y: tnBigFrom(tnJWKBytes(jwk, "y"))}
|
|
621
621
|
d := tnJWKBytes(jwk, "d")
|
|
622
622
|
if d == nil {
|
|
@@ -625,7 +625,7 @@ func tnKeyFromJWK(jwk interface{}) (tncrypto.PublicKey, tncrypto.PrivateKey) {
|
|
|
625
625
|
priv := &ecdsa.PrivateKey{PublicKey: *pub, D: tnBigFrom(d)}
|
|
626
626
|
return &priv.PublicKey, priv
|
|
627
627
|
case "OKP":
|
|
628
|
-
crv, _ :=
|
|
628
|
+
crv, _ := TnGetValue(jwk, "crv").(string)
|
|
629
629
|
x, d := tnJWKBytes(jwk, "x"), tnJWKBytes(jwk, "d")
|
|
630
630
|
switch crv {
|
|
631
631
|
case "Ed25519":
|
|
@@ -662,8 +662,8 @@ func tnKeyEncodingError(typ string) *TnError {
|
|
|
662
662
|
// export({ format: 'pem' | 'der' | 'jwk', type: 'spki' | 'pkcs1' | 'pkcs8' | 'sec1' })
|
|
663
663
|
func (k *TnKeyObject) export(options ...interface{}) interface{} {
|
|
664
664
|
opts := tnCryptoArg(options)
|
|
665
|
-
format, _ :=
|
|
666
|
-
typ, _ :=
|
|
665
|
+
format, _ := TnGetValue(opts, "format").(string)
|
|
666
|
+
typ, _ := TnGetValue(opts, "type").(string)
|
|
667
667
|
switch k.type_ {
|
|
668
668
|
case "secret":
|
|
669
669
|
if format == "jwk" {
|
|
@@ -756,7 +756,7 @@ func tnGenerateAsymmetric(kind string, options interface{}) tncrypto.PrivateKey
|
|
|
756
756
|
}
|
|
757
757
|
return k
|
|
758
758
|
case "ec":
|
|
759
|
-
name, _ :=
|
|
759
|
+
name, _ := TnGetValue(options, "namedCurve").(string)
|
|
760
760
|
k, err := ecdsa.GenerateKey(tnNamedCurve(name), cryptorand.Reader)
|
|
761
761
|
if err != nil {
|
|
762
762
|
panic(tnCryptoErr(err))
|
|
@@ -937,7 +937,7 @@ func tnReadSignOptions(key interface{}) tnSignOptions {
|
|
|
937
937
|
o.saltLength = int(v)
|
|
938
938
|
o.hasSalt = true
|
|
939
939
|
}
|
|
940
|
-
if s, ok :=
|
|
940
|
+
if s, ok := TnGetValue(key, "dsaEncoding").(string); ok && s != "" {
|
|
941
941
|
o.dsaEncoding = s
|
|
942
942
|
}
|
|
943
943
|
return o
|
|
@@ -1120,7 +1120,7 @@ func tnRSAPadding(key interface{}, def int) (int, tncrypto.Hash, []byte) {
|
|
|
1120
1120
|
if v, ok := tnCryptoNumber(TnGet(key, "padding")); ok {
|
|
1121
1121
|
padding = int(v)
|
|
1122
1122
|
}
|
|
1123
|
-
if s, ok :=
|
|
1123
|
+
if s, ok := TnGetValue(key, "oaepHash").(string); ok && s != "" {
|
|
1124
1124
|
h = tnCryptoHash(s)
|
|
1125
1125
|
}
|
|
1126
1126
|
if l := TnGet(key, "oaepLabel"); l != nil && !TnIsNil(l) {
|
|
@@ -1332,8 +1332,8 @@ func (e *TnECDH) computeSecret(other interface{}, args ...string) interface{} {
|
|
|
1332
1332
|
|
|
1333
1333
|
// diffieHellman({ privateKey, publicKey }): ec and x25519 KeyObjects
|
|
1334
1334
|
func TnDiffieHellman(options interface{}) []byte {
|
|
1335
|
-
priv, _ :=
|
|
1336
|
-
pub, _ :=
|
|
1335
|
+
priv, _ := TnGetValue(options, "privateKey").(*TnKeyObject)
|
|
1336
|
+
pub, _ := TnGetValue(options, "publicKey").(*TnKeyObject)
|
|
1337
1337
|
if priv == nil || pub == nil {
|
|
1338
1338
|
panic(TnNodeError("TypeError", "ERR_INVALID_ARG_TYPE", "The \\"options.privateKey\\" and \\"options.publicKey\\" properties must be KeyObjects"))
|
|
1339
1339
|
}
|
|
@@ -1507,7 +1507,7 @@ func TnGeneratePrimeBig(size float64, options ...interface{}) *tnbig.Int {
|
|
|
1507
1507
|
panic(TnNodeError("RangeError", "ERR_OUT_OF_RANGE", "The value of \\"size\\" is out of range. It must be >= 2."))
|
|
1508
1508
|
}
|
|
1509
1509
|
opts := tnCryptoArg(options)
|
|
1510
|
-
safe, _ :=
|
|
1510
|
+
safe, _ := TnGetValue(opts, "safe").(bool)
|
|
1511
1511
|
add := tnPrimeBig(TnGet(opts, "add"))
|
|
1512
1512
|
rem := tnPrimeBig(TnGet(opts, "rem"))
|
|
1513
1513
|
if add == nil && !safe {
|
|
@@ -1834,7 +1834,7 @@ func tnAlgName(alg interface{}) string {
|
|
|
1834
1834
|
if s, ok := alg.(string); ok {
|
|
1835
1835
|
return s
|
|
1836
1836
|
}
|
|
1837
|
-
n, _ :=
|
|
1837
|
+
n, _ := TnGetValue(alg, "name").(string)
|
|
1838
1838
|
return n
|
|
1839
1839
|
}
|
|
1840
1840
|
|
|
@@ -1961,7 +1961,7 @@ func tnSubtleGenerate(alg interface{}, extractable bool, usages interface{}) int
|
|
|
1961
1961
|
pubUsages, privUsages = tnFilterUsages(us, "verify"), tnFilterUsages(us, "sign")
|
|
1962
1962
|
}
|
|
1963
1963
|
case "ECDSA", "ECDH":
|
|
1964
|
-
curve, _ :=
|
|
1964
|
+
curve, _ := TnGetValue(alg, "namedCurve").(string)
|
|
1965
1965
|
priv = tnGenerateAsymmetric("ec", map[string]interface{}{"namedCurve": curve})
|
|
1966
1966
|
algorithm["namedCurve"] = curve
|
|
1967
1967
|
if name == "ECDSA" {
|
|
@@ -2074,7 +2074,7 @@ func tnSubtleImport(format string, data interface{}, alg interface{}, extractabl
|
|
|
2074
2074
|
}
|
|
2075
2075
|
k = tnPrivateKeyObject(priv)
|
|
2076
2076
|
case "jwk":
|
|
2077
|
-
if kty, _ :=
|
|
2077
|
+
if kty, _ := TnGetValue(data, "kty").(string); kty == "oct" {
|
|
2078
2078
|
k = &TnKeyObject{type_: "secret", secret: tnJWKBytes(data, "k")}
|
|
2079
2079
|
} else {
|
|
2080
2080
|
pub, priv := tnKeyFromJWK(data)
|
|
@@ -2134,7 +2134,7 @@ func tnSubtleExport(format string, key *TnCryptoKey) interface{} {
|
|
|
2134
2134
|
if length, ok := key.algorithm["length"].(float64); ok {
|
|
2135
2135
|
switch key.algorithm["name"] {
|
|
2136
2136
|
case "HMAC":
|
|
2137
|
-
hash, _ :=
|
|
2137
|
+
hash, _ := TnGetValue(key.algorithm["hash"], "name").(string)
|
|
2138
2138
|
jwk["alg"] = "HS" + strings.TrimPrefix(hash, "SHA-")
|
|
2139
2139
|
case "AES-GCM":
|
|
2140
2140
|
jwk["alg"] = fmt.Sprintf("A%dGCM", int(length))
|
|
@@ -2352,7 +2352,7 @@ func tnSubtleDerive(alg interface{}, key *TnCryptoKey, length interface{}) []byt
|
|
|
2352
2352
|
}
|
|
2353
2353
|
return k
|
|
2354
2354
|
case "ECDH", "X25519":
|
|
2355
|
-
pub, _ :=
|
|
2355
|
+
pub, _ := TnGetValue(alg, "public").(*TnCryptoKey)
|
|
2356
2356
|
if pub == nil {
|
|
2357
2357
|
panic(tnDOMError("InvalidAccessError", "algorithm.public must be a public CryptoKey"))
|
|
2358
2358
|
}
|