Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
deno
提交
e939ec0f
D
deno
项目概览
张重言
/
deno
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
deno
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
e939ec0f
编写于
8月 28, 2019
作者:
B
Bert Belder
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
third_party: upgrade 'rustls' and related crates
上级
177727d7
变更
6
展开全部
隐藏空白更改
内联
并排
Showing
6 changed file
with
266 addition
and
135 deletion
+266
-135
Cargo.lock
Cargo.lock
+183
-44
build_extra/rust/BUILD.gn
build_extra/rust/BUILD.gn
+72
-80
cli/Cargo.toml
cli/Cargo.toml
+3
-3
cli/compilers/ts.rs
cli/compilers/ts.rs
+6
-6
third_party
third_party
+1
-1
tools/hyper_hello/Cargo.toml
tools/hyper_hello/Cargo.toml
+1
-1
未找到文件。
Cargo.lock
浏览文件 @
e939ec0f
此差异已折叠。
点击以展开。
build_extra/rust/BUILD.gn
浏览文件 @
e939ec0f
...
...
@@ -204,7 +204,7 @@ rust_rlib("crossbeam_utils") {
rust_rlib("ct_logs") {
cap_lints = "allow"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/ct-logs-0.
5.1
/src/lib.rs"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/ct-logs-0.
6.0
/src/lib.rs"
extern_rlib = [ "sct" ]
}
...
...
@@ -401,8 +401,7 @@ rust_rlib("hyper") {
rust_rlib("hyper_rustls") {
cap_lints = "allow"
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/hyper-rustls-0.16.1/src/lib.rs"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/hyper-rustls-0.17.1/src/lib.rs"
features = [
"ct-logs",
"default",
...
...
@@ -957,11 +956,12 @@ rust_rlib("remove_dir_all") {
rust_rlib("ring") {
cap_lints = "allow"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.1
4.6
/src/lib.rs"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.1
6.8
/src/lib.rs"
features = [
"alloc",
"default",
"dev_urandom_fallback",
"
use_heap
",
"
lazy_static
",
]
deps = [
":ring-core",
...
...
@@ -969,12 +969,14 @@ rust_rlib("ring") {
# ":ring-test",
]
extern_rlib = [
"libc",
"spin",
"untrusted",
]
if (is_linux) {
extern_rlib += [ "lazy_static" ]
extern_rlib += [
"lazy_static",
"libc",
]
}
# Per the #[link(...)] attribute found in 'src/rand.rs'.
...
...
@@ -988,38 +990,37 @@ rust_rlib("ring") {
static_library("ring-core") {
include_dirs = [
"$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.1
4.6
/include",
"$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.1
6.8
/include",
]
sources = [
"$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.14.6/crypto/block.c",
"$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.14.6/crypto/cpu-intel.c",
"$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.14.6/crypto/crypto.c",
"$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.14.6/crypto/fipsmodule/bn/generic.c",
"$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.14.6/crypto/fipsmodule/bn/montgomery.c",
"$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.14.6/crypto/fipsmodule/bn/montgomery_inv.c",
"$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.14.6/crypto/fipsmodule/ec/ecp_nistz.c",
"$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.14.6/crypto/fipsmodule/ec/ecp_nistz256.c",
"$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.14.6/crypto/fipsmodule/ec/gfp_p256.c",
"$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.14.6/crypto/fipsmodule/ec/gfp_p384.c",
"$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.14.6/crypto/fipsmodule/modes/gcm.c",
"$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.14.6/crypto/limbs/limbs.c",
"$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.14.6/crypto/mem.c",
"$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.14.6/third_party/fiat/curve25519.c",
"$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.16.8/crypto/cpu-intel.c",
"$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.16.8/crypto/crypto.c",
"$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.16.8/crypto/fipsmodule/bn/generic.c",
"$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.16.8/crypto/fipsmodule/bn/montgomery.c",
"$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.16.8/crypto/fipsmodule/bn/montgomery_inv.c",
"$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.16.8/crypto/fipsmodule/ec/ecp_nistz.c",
"$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.16.8/crypto/fipsmodule/ec/ecp_nistz256.c",
"$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.16.8/crypto/fipsmodule/ec/gfp_p256.c",
"$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.16.8/crypto/fipsmodule/ec/gfp_p384.c",
"$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.16.8/crypto/fipsmodule/modes/gcm.c",
"$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.16.8/crypto/limbs/limbs.c",
"$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.16.8/crypto/mem.c",
"$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.16.8/third_party/fiat/curve25519.c",
]
if (is_linux) {
sources += [
"$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.1
4.6
/pregenerated/aes-x86_64-elf.S",
"$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.1
4.6
/pregenerated/aesni-gcm-x86_64-elf.S",
"$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.1
4.6
/pregenerated/aesni-x86_64-elf.S",
"$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.1
4.6
/pregenerated/chacha-x86_64-elf.S",
"$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.1
4.6
/pregenerated/ghash-x86_64-elf.S",
"$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.1
4.6
/pregenerated/p256-x86_64-asm-elf.S",
"$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.1
4.6
/pregenerated/poly1305-x86_64-elf.S",
"$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.1
4.6
/pregenerated/sha256-x86_64-elf.S",
"$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.1
4.6
/pregenerated/sha512-x86_64-elf.S",
"$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.1
4.6
/pregenerated/vpaes-x86_64-elf.S",
"$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.1
4.6
/pregenerated/x86_64-mont-elf.S",
"$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.1
4.6
/pregenerated/x86_64-mont5-elf.S",
"$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.1
6.8
/pregenerated/aes-x86_64-elf.S",
"$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.1
6.8
/pregenerated/aesni-gcm-x86_64-elf.S",
"$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.1
6.8
/pregenerated/aesni-x86_64-elf.S",
"$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.1
6.8
/pregenerated/chacha-x86_64-elf.S",
"$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.1
6.8
/pregenerated/ghash-x86_64-elf.S",
"$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.1
6.8
/pregenerated/p256-x86_64-asm-elf.S",
"$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.1
6.8
/pregenerated/poly1305-x86_64-elf.S",
"$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.1
6.8
/pregenerated/sha256-x86_64-elf.S",
"$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.1
6.8
/pregenerated/sha512-x86_64-elf.S",
"$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.1
6.8
/pregenerated/vpaes-x86_64-elf.S",
"$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.1
6.8
/pregenerated/x86_64-mont-elf.S",
"$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.1
6.8
/pregenerated/x86_64-mont5-elf.S",
]
# Supress "warning: '_GNU_SOURCE' macro redefined."
...
...
@@ -1027,34 +1028,34 @@ static_library("ring-core") {
}
if (is_mac) {
sources += [
"$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.1
4.6
/pregenerated/aes-x86_64-macosx.S",
"$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.1
4.6
/pregenerated/aesni-gcm-x86_64-macosx.S",
"$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.1
4.6
/pregenerated/aesni-x86_64-macosx.S",
"$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.1
4.6
/pregenerated/chacha-x86_64-macosx.S",
"$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.1
4.6
/pregenerated/ghash-x86_64-macosx.S",
"$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.1
4.6
/pregenerated/p256-x86_64-asm-macosx.S",
"$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.1
4.6
/pregenerated/poly1305-x86_64-macosx.S",
"$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.1
4.6
/pregenerated/sha256-x86_64-macosx.S",
"$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.1
4.6
/pregenerated/sha512-x86_64-macosx.S",
"$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.1
4.6
/pregenerated/vpaes-x86_64-macosx.S",
"$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.1
4.6
/pregenerated/x86_64-mont-macosx.S",
"$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.1
4.6
/pregenerated/x86_64-mont5-macosx.S",
"$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.1
6.8
/pregenerated/aes-x86_64-macosx.S",
"$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.1
6.8
/pregenerated/aesni-gcm-x86_64-macosx.S",
"$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.1
6.8
/pregenerated/aesni-x86_64-macosx.S",
"$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.1
6.8
/pregenerated/chacha-x86_64-macosx.S",
"$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.1
6.8
/pregenerated/ghash-x86_64-macosx.S",
"$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.1
6.8
/pregenerated/p256-x86_64-asm-macosx.S",
"$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.1
6.8
/pregenerated/poly1305-x86_64-macosx.S",
"$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.1
6.8
/pregenerated/sha256-x86_64-macosx.S",
"$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.1
6.8
/pregenerated/sha512-x86_64-macosx.S",
"$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.1
6.8
/pregenerated/vpaes-x86_64-macosx.S",
"$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.1
6.8
/pregenerated/x86_64-mont-macosx.S",
"$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.1
6.8
/pregenerated/x86_64-mont5-macosx.S",
]
}
if (is_win) {
libs = [
"$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.1
4.6
/pregenerated/aes-x86_64-nasm.obj",
"$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.1
4.6
/pregenerated/aesni-gcm-x86_64-nasm.obj",
"$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.1
4.6
/pregenerated/aesni-x86_64-nasm.obj",
"$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.1
4.6
/pregenerated/chacha-x86_64-nasm.obj",
"$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.1
4.6
/pregenerated/ghash-x86_64-nasm.obj",
"$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.1
4.6
/pregenerated/p256-x86_64-asm-nasm.obj",
"$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.1
4.6
/pregenerated/poly1305-x86_64-nasm.obj",
"$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.1
4.6
/pregenerated/sha256-x86_64-nasm.obj",
"$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.1
4.6
/pregenerated/sha512-x86_64-nasm.obj",
"$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.1
4.6
/pregenerated/vpaes-x86_64-nasm.obj",
"$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.1
4.6
/pregenerated/x86_64-mont-nasm.obj",
"$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.1
4.6
/pregenerated/x86_64-mont5-nasm.obj",
"$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.1
6.8
/pregenerated/aes-x86_64-nasm.obj",
"$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.1
6.8
/pregenerated/aesni-gcm-x86_64-nasm.obj",
"$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.1
6.8
/pregenerated/aesni-x86_64-nasm.obj",
"$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.1
6.8
/pregenerated/chacha-x86_64-nasm.obj",
"$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.1
6.8
/pregenerated/ghash-x86_64-nasm.obj",
"$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.1
6.8
/pregenerated/p256-x86_64-asm-nasm.obj",
"$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.1
6.8
/pregenerated/poly1305-x86_64-nasm.obj",
"$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.1
6.8
/pregenerated/sha256-x86_64-nasm.obj",
"$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.1
6.8
/pregenerated/sha512-x86_64-nasm.obj",
"$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.1
6.8
/pregenerated/vpaes-x86_64-nasm.obj",
"$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.1
6.8
/pregenerated/x86_64-mont-nasm.obj",
"$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.1
6.8
/pregenerated/x86_64-mont5-nasm.obj",
]
# Suppress "warning: '_addcarry_u64' is not a recognized builtin."
...
...
@@ -1064,13 +1065,13 @@ static_library("ring-core") {
## Override: don't build 'ring-test' static library.
# static_library("ring-test") {
# include_dirs = [ "$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.1
4.6
/include" ]
# sources = [ "$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.1
4.6
/crypto/constant_time_test.c" ]
# include_dirs = [ "$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.1
6.8
/include" ]
# sources = [ "$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.1
6.8
/crypto/constant_time_test.c" ]
# }
rust_rlib("rustls") {
cap_lints = "allow"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/rustls-0.1
5.2
/src/lib.rs"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/rustls-0.1
6.0
/src/lib.rs"
features = [
"default",
"log",
...
...
@@ -1081,7 +1082,6 @@ rust_rlib("rustls") {
"log",
"ring",
"sct",
"untrusted",
"webpki",
]
}
...
...
@@ -1133,7 +1133,7 @@ rust_rlib("scopeguard") {
rust_rlib("sct") {
cap_lints = "allow"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/sct-0.
5
.0/src/lib.rs"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/sct-0.
6
.0/src/lib.rs"
extern_rlib = [
"ring",
"untrusted",
...
...
@@ -1245,7 +1245,7 @@ rust_rlib("source_map_mappings") {
rust_rlib("spin") {
cap_lints = "allow"
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/spin-0.5.
1
/src/lib.rs"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/spin-0.5.
2
/src/lib.rs"
}
## Override: avoid dependency on on 'owning_ref'.
...
...
@@ -1283,6 +1283,7 @@ rust_rlib("syn") {
"clone-impls",
"default",
"derive",
"full",
"parsing",
"printing",
"proc-macro",
...
...
@@ -1532,15 +1533,11 @@ rust_rlib("tokio_reactor") {
rust_rlib("tokio_rustls") {
cap_lints = "allow"
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/tokio-rustls-0.9.3/src/lib.rs"
features = [
"default",
"futures",
"tokio-io",
"tokio-support",
]
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/tokio-rustls-0.10.0/src/lib.rs"
extern_rlib = [
"bytes",
"futures",
"iovec",
"rustls",
"tokio_io",
"webpki",
...
...
@@ -1658,8 +1655,7 @@ rust_rlib("unicode_xid") {
rust_rlib("untrusted") {
cap_lints = "allow"
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/untrusted-0.6.2/src/untrusted.rs"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/untrusted-0.7.0/src/untrusted.rs"
}
rust_rlib("url") {
...
...
@@ -1731,8 +1727,7 @@ rust_rlib("want") {
rust_rlib("webpki") {
cap_lints = "allow"
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/webpki-0.19.1/src/webpki.rs"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/webpki-0.21.0/src/webpki.rs"
features = [
"default",
"std",
...
...
@@ -1746,11 +1741,8 @@ rust_rlib("webpki") {
rust_rlib("webpki_roots") {
cap_lints = "allow"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/webpki-roots-0.16.0/src/lib.rs"
extern_rlib = [
"untrusted",
"webpki",
]
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/webpki-roots-0.17.0/src/lib.rs"
extern_rlib = [ "webpki" ]
}
## Override: use rand v0.6.5 instead.
...
...
cli/Cargo.toml
浏览文件 @
e939ec0f
...
...
@@ -25,7 +25,7 @@ dirs = "2.0.2"
futures
=
"0.1.28"
http
=
"0.1.18"
hyper
=
"0.12.33"
hyper-rustls
=
"0.1
6
.1"
hyper-rustls
=
"0.1
7
.1"
indexmap
=
"1.1.0"
integer-atomics
=
"1.0.2"
lazy_static
=
"1.3.0"
...
...
@@ -34,7 +34,7 @@ log = "0.4.8"
rand
=
"0.6.5"
regex
=
"1.2.1"
remove_dir_all
=
"0.5.2"
ring
=
"
~0.14.6
"
ring
=
"
0.16.8
"
rustyline
=
"5.0.2"
serde
=
{
version
=
"1.0.99"
,
features
=
["derive"]
}
serde_derive
=
"1.0.99"
...
...
@@ -47,7 +47,7 @@ tokio-executor = "0.1.8"
tokio-fs
=
"0.1.6"
tokio-io
=
"0.1.12"
tokio-process
=
"0.2.4"
tokio-rustls
=
"0.
9.3
"
tokio-rustls
=
"0.
10.0
"
tokio-threadpool
=
"0.1.15"
url
=
"1.7.2"
utime
=
"0.2.1"
...
...
cli/compilers/ts.rs
浏览文件 @
e939ec0f
...
...
@@ -165,7 +165,7 @@ fn req(
}
fn
gen_hash
(
v
:
Vec
<&
[
u8
]
>
)
->
String
{
let
mut
ctx
=
ring
::
digest
::
Context
::
new
(
&
ring
::
digest
::
SHA
1
);
let
mut
ctx
=
ring
::
digest
::
Context
::
new
(
&
ring
::
digest
::
SHA
256
);
for
src
in
v
.iter
()
{
ctx
.update
(
src
);
}
...
...
@@ -178,7 +178,7 @@ fn gen_hash(v: Vec<&[u8]>) -> String {
out
}
/// Emit a SHA
1
hash based on source code, deno version and TS config.
/// Emit a SHA
256
hash based on source code, deno version and TS config.
/// Used to check if a recompilation for source code is needed.
pub
fn
source_code_version_hash
(
source_code
:
&
[
u8
],
...
...
@@ -707,22 +707,22 @@ mod tests {
#[test]
fn
test_source_code_version_hash
()
{
assert_eq!
(
"0
8574f9cdeb94fd3fb9cdc7a20d086daeeb42bca
"
,
"0
185b42de0686b4c93c314daaa8dee159f768a9e9a336c2a5e3d5b8ca6c4208c
"
,
source_code_version_hash
(
b
"1+2"
,
"0.4.0"
,
b
"{}"
)
);
// Different source_code should result in different hash.
assert_eq!
(
"
d8abe2ead44c3ff8650a2855bf1b18e559addd06
"
,
"
e58631f1b6b6ce2b300b133ec2ad16a8a5ba6b7ecf812a8c06e59056638571ac
"
,
source_code_version_hash
(
b
"1"
,
"0.4.0"
,
b
"{}"
)
);
// Different version should result in different hash.
assert_eq!
(
"
d6feffc5024d765d22c94977b4fe5975b59d6367
"
,
"
307e6200347a88dbbada453102deb91c12939c65494e987d2d8978f6609b5633
"
,
source_code_version_hash
(
b
"1"
,
"0.1.0"
,
b
"{}"
)
);
// Different config should result in different hash.
assert_eq!
(
"
3b35db249b26a27decd68686f073a58266b2aec2
"
,
"
195eaf104a591d1d7f69fc169c60a41959c2b7a21373cd23a8f675f877ec385f
"
,
source_code_version_hash
(
b
"1"
,
"0.4.0"
,
b
"{
\"
compilerOptions
\"
: {}}"
)
);
}
...
...
third_party
@
3f2b7db6
比较
8312d337
...
3f2b7db6
Subproject commit
8312d337bb5e2b044ad19953fcd8437289f1bdef
Subproject commit
3f2b7db6576bcf33651b781b47b397e6c1532af1
tools/hyper_hello/Cargo.toml
浏览文件 @
e939ec0f
...
...
@@ -4,7 +4,7 @@ version = "0.0.1"
[dependencies]
hyper
=
"0.12.33"
ring
=
"0.1
4.6
"
ring
=
"0.1
6.8
"
[[bin]]
name
=
"hyper_hello"
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录