Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
dotNET Platform
runtime
提交
5fc5c68d
R
runtime
项目概览
dotNET Platform
/
runtime
大约 1 年 前同步成功
通知
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,发现更多精彩内容 >>
未验证
提交
5fc5c68d
编写于
6月 17, 2022
作者:
K
Kevin Jones
提交者:
GitHub
6月 17, 2022
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Use hash/hmac one shots in NTLM (#70857)
Co-authored-by:
N
Stephen Toub
<
stoub@microsoft.com
>
上级
1b87ff9e
变更
1
显示空白变更内容
内联
并排
Showing
1 changed file
with
10 addition
and
21 deletion
+10
-21
src/libraries/Common/src/System/Net/NTAuthentication.Managed.cs
...braries/Common/src/System/Net/NTAuthentication.Managed.cs
+10
-21
未找到文件。
src/libraries/Common/src/System/Net/NTAuthentication.Managed.cs
浏览文件 @
5fc5c68d
...
@@ -444,14 +444,10 @@ private static void makeNtlm2Hash(string domain, string userName, ReadOnlySpan<c
...
@@ -444,14 +444,10 @@ private static void makeNtlm2Hash(string domain, string userName, ReadOnlySpan<c
{
{
Encoding
.
Unicode
.
GetBytes
(
password
,
pwBytes
);
Encoding
.
Unicode
.
GetBytes
(
password
,
pwBytes
);
MD4
.
HashData
(
pwBytes
,
pwHash
);
MD4
.
HashData
(
pwBytes
,
pwHash
);
using
(
var
hmac
=
IncrementalHash
.
CreateHMAC
(
HashAlgorithmName
.
MD5
,
pwHash
))
{
// strangely, user is upper case, domain is not.
// strangely, user is upper case, domain is not.
byte
[]
blob
=
Encoding
.
Unicode
.
GetBytes
(
string
.
Concat
(
userName
.
ToUpperInvariant
(),
domain
));
byte
[]
blob
=
Encoding
.
Unicode
.
GetBytes
(
string
.
Concat
(
userName
.
ToUpperInvariant
(),
domain
));
hmac
.
AppendData
(
blob
);
int
written
=
HMACMD5
.
HashData
(
pwHash
,
blob
,
hash
);
hmac
.
GetHashAndReset
(
hash
);
Debug
.
Assert
(
written
==
HMACMD5
.
HashSizeInBytes
);
}
}
}
finally
finally
{
{
...
@@ -502,16 +498,12 @@ private unsafe void WriteChannelBindingHash(Span<byte> hashBuffer)
...
@@ -502,16 +498,12 @@ private unsafe void WriteChannelBindingHash(Span<byte> hashBuffer)
{
{
IntPtr
cbtData
=
_channelBinding
.
DangerousGetHandle
();
IntPtr
cbtData
=
_channelBinding
.
DangerousGetHandle
();
int
cbtDataSize
=
_channelBinding
.
Size
;
int
cbtDataSize
=
_channelBinding
.
Size
;
int
written
=
MD5
.
HashData
(
new
Span
<
byte
>((
void
*)
cbtData
,
cbtDataSize
),
hashBuffer
);
using
(
var
md5
=
IncrementalHash
.
CreateHash
(
HashAlgorithmName
.
MD5
))
Debug
.
Assert
(
written
==
MD5
.
HashSizeInBytes
);
{
md5
.
AppendData
(
new
Span
<
byte
>((
void
*)
cbtData
,
cbtDataSize
));
md5
.
GetHashAndReset
(
hashBuffer
);
}
}
}
else
else
{
{
hashBuffer
.
Fill
(
0
);
hashBuffer
.
Clear
(
);
}
}
}
}
...
@@ -716,12 +708,9 @@ private static byte[] DeriveKey(ReadOnlySpan<byte> exportedSessionKey, ReadOnlyS
...
@@ -716,12 +708,9 @@ private static byte[] DeriveKey(ReadOnlySpan<byte> exportedSessionKey, ReadOnlyS
Debug
.
Assert
(
flags
.
HasFlag
(
Flags
.
NegotiateSign
)
&&
flags
.
HasFlag
(
Flags
.
NegotiateKeyExchange
));
Debug
.
Assert
(
flags
.
HasFlag
(
Flags
.
NegotiateSign
)
&&
flags
.
HasFlag
(
Flags
.
NegotiateKeyExchange
));
// Derive session base key
// Derive session base key
Span
<
byte
>
sessionBaseKey
=
stackalloc
byte
[
16
];
Span
<
byte
>
sessionBaseKey
=
stackalloc
byte
[
HMACMD5
.
HashSizeInBytes
];
using
(
var
hmacSessionKey
=
IncrementalHash
.
CreateHMAC
(
HashAlgorithmName
.
MD5
,
ntlm2hash
))
int
sessionKeyWritten
=
HMACMD5
.
HashData
(
ntlm2hash
,
responseAsSpan
.
Slice
(
response
.
NtChallengeResponse
.
PayloadOffset
,
16
),
sessionBaseKey
);
{
Debug
.
Assert
(
sessionKeyWritten
==
HMACMD5
.
HashSizeInBytes
);
hmacSessionKey
.
AppendData
(
responseAsSpan
.
Slice
(
response
.
NtChallengeResponse
.
PayloadOffset
,
16
));
hmacSessionKey
.
GetHashAndReset
(
sessionBaseKey
);
}
// Encrypt exportedSessionKey with sessionBaseKey
// Encrypt exportedSessionKey with sessionBaseKey
using
(
RC4
rc4
=
new
RC4
(
sessionBaseKey
))
using
(
RC4
rc4
=
new
RC4
(
sessionBaseKey
))
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录