Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
dotNET Platform
runtime
提交
4aa29f43
R
runtime
项目概览
dotNET Platform
/
runtime
12 个月 前同步成功
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
runtime
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
4aa29f43
编写于
6月 12, 2021
作者:
T
Tomas Weinfurt
提交者:
GitHub
6月 12, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix ConnectWithCertificateChain quic test (#54026)
上级
cc6d3147
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
27 addition
and
19 deletion
+27
-19
src/libraries/System.Net.Quic/src/System/Net/Quic/Implementations/MsQuic/MsQuicConnection.cs
...ystem/Net/Quic/Implementations/MsQuic/MsQuicConnection.cs
+5
-17
src/libraries/System.Net.Quic/tests/FunctionalTests/MsQuicTests.cs
...ries/System.Net.Quic/tests/FunctionalTests/MsQuicTests.cs
+22
-2
未找到文件。
src/libraries/System.Net.Quic/src/System/Net/Quic/Implementations/MsQuic/MsQuicConnection.cs
浏览文件 @
4aa29f43
...
...
@@ -345,27 +345,18 @@ private static uint HandleEventPeerCertificateReceived(State state, ref Connecti
{
unsafe
{
ReadOnlySpan
<
QuicBuffer
>
quicBuffer
;
ReadOnlySpan
<
QuicBuffer
>
quicBuffer
=
new
ReadOnlySpan
<
QuicBuffer
>((
void
*)
connectionEvent
.
Data
.
PeerCertificateReceived
.
PlatformCertificateHandle
,
sizeof
(
QuicBuffer
));
certificate
=
new
X509Certificate2
(
new
ReadOnlySpan
<
byte
>(
quicBuffer
[
0
].
Buffer
,
(
int
)
quicBuffer
[
0
].
Length
));
if
(
connectionEvent
.
Data
.
PeerCertificateReceived
.
PlatformCertificateChainHandle
!=
IntPtr
.
Zero
)
{
quicBuffer
=
new
ReadOnlySpan
<
QuicBuffer
>((
void
*)
connectionEvent
.
Data
.
PeerCertificateReceived
.
PlatformCertificateChainHandle
,
sizeof
(
QuicBuffer
));
if
(
quicBuffer
[
0
].
Length
!=
0
&&
quicBuffer
[
0
].
Buffer
!=
null
)
{
ReadOnlySpan
<
byte
>
asn1
=
new
ReadOnlySpan
<
byte
>(
quicBuffer
[
0
].
Buffer
,
(
int
)
quicBuffer
[
0
].
Length
);
additionalCertificates
=
new
X509Certificate2Collection
();
additionalCertificates
.
Import
(
asn1
);
if
(
additionalCertificates
.
Count
>
0
)
{
certificate
=
additionalCertificates
[
additionalCertificates
.
Count
-
1
];
}
additionalCertificates
.
Import
(
new
ReadOnlySpan
<
byte
>(
quicBuffer
[
0
].
Buffer
,
(
int
)
quicBuffer
[
0
].
Length
));
}
}
else
{
quicBuffer
=
new
ReadOnlySpan
<
QuicBuffer
>((
void
*)
connectionEvent
.
Data
.
PeerCertificateReceived
.
PlatformCertificateHandle
,
sizeof
(
QuicBuffer
));
ReadOnlySpan
<
byte
>
asn1
=
new
ReadOnlySpan
<
byte
>(
quicBuffer
[
0
].
Buffer
,
(
int
)
quicBuffer
[
0
].
Length
);
certificate
=
new
X509Certificate2
(
asn1
);
}
}
}
}
...
...
@@ -384,10 +375,7 @@ private static uint HandleEventPeerCertificateReceived(State state, ref Connecti
if
(
additionalCertificates
!=
null
&&
additionalCertificates
.
Count
>
1
)
{
for
(
int
i
=
0
;
i
<
additionalCertificates
.
Count
-
1
;
i
++)
{
chain
.
ChainPolicy
.
ExtraStore
.
Add
(
additionalCertificates
[
i
]);
}
chain
.
ChainPolicy
.
ExtraStore
.
AddRange
(
additionalCertificates
);
}
if
(!
chain
.
Build
(
certificate
))
...
...
src/libraries/System.Net.Quic/tests/FunctionalTests/MsQuicTests.cs
浏览文件 @
4aa29f43
...
...
@@ -10,14 +10,21 @@
using
System.Text
;
using
System.Threading.Tasks
;
using
Xunit
;
using
Xunit.Abstractions
;
namespace
System.Net.Quic.Tests
{
[
ConditionalClass
(
typeof
(
QuicTestBase
<
MsQuicProviderFactory
>),
nameof
(
IsSupported
))]
public
class
MsQuicTests
:
QuicTestBase
<
MsQuicProviderFactory
>
{
readonly
ITestOutputHelper
_output
;
private
static
ReadOnlyMemory
<
byte
>
s_data
=
Encoding
.
UTF8
.
GetBytes
(
"Hello world!"
);
public
MsQuicTests
(
ITestOutputHelper
output
)
{
_output
=
output
;
}
[
Fact
]
public
async
Task
UnidirectionalAndBidirectionalStreamCountsWork
()
{
...
...
@@ -83,9 +90,22 @@ public async Task ConnectWithCertificateChain()
// With trusted root, we should be able to build chain.
chain
.
ChainPolicy
.
CustomTrustStore
.
Add
(
rootCA
);
chain
.
ChainPolicy
.
TrustMode
=
X509ChainTrustMode
.
CustomRootTrust
;
Assert
.
True
(
chain
.
Build
(
certificate
));
bool
ret
=
chain
.
Build
(
certificate
);
if
(!
ret
)
{
_output
.
WriteLine
(
"Chain build failed with {0} elements"
,
chain
.
ChainElements
);
foreach
(
X509ChainElement
element
in
chain
.
ChainElements
)
{
_output
.
WriteLine
(
"Element subject {0} and issuer {1}"
,
element
.
Certificate
.
Subject
,
element
.
Certificate
.
Issuer
);
_output
.
WriteLine
(
"Element status len {0}"
,
element
.
ChainElementStatus
.
Length
);
foreach
(
X509ChainStatus
status
in
element
.
ChainElementStatus
)
{
_output
.
WriteLine
(
$"Status:
{
status
.
Status
}
:
{
status
.
StatusInformation
}
"
);
}
}
}
return
true
;
return
ret
;
};
using
QuicConnection
clientConnection
=
new
QuicConnection
(
QuicImplementationProviders
.
MsQuic
,
options
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录