Skip to content

Commit 9552048

Browse files
mairawmairaw
authored
Merge branch 'master' into mdoc-dev-test4
2 parents 5acaa23 + c366ec9 commit 9552048

File tree

50 files changed

+1938
-1034
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+1938
-1034
lines changed

‎xml/Microsoft.Build.Tasks.Deployment.ManifestUtilities/BaseReference.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@
148148
<Docs>
149149
<summary>Gets or sets the SHA1 hash of the file.</summary>
150150
<value>A string indicating the SHA1 hash of the file.</value>
151-
<remarks>To be added.</remarks>
151+
<remarks>Due to collision problems with SHA1, Microsoft recommends a security model based on SHA256 or better.</remarks>
152152
</Docs>
153153
</Member>
154154
<Member MemberName="IsOptional">

‎xml/Mono.Security.Interface/HashAlgorithmType.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
<MemberValue>1</MemberValue>
3636
<Docs>
3737
<summary>To be added.</summary>
38+
<remarks>Due to collision problems with SHA1, Microsoft recommends SHA256 or better.</remarks>
3839
</Docs>
3940
</Member>
4041
<Member MemberName="Md5Sha1">
@@ -55,6 +56,7 @@
5556
<MemberValue>254</MemberValue>
5657
<Docs>
5758
<summary>To be added.</summary>
59+
<remarks>Due to collision problems with SHA1, Microsoft recommends SHA256 or better.</remarks>
5860
</Docs>
5961
</Member>
6062
<Member MemberName="None">
@@ -95,6 +97,7 @@
9597
<MemberValue>2</MemberValue>
9698
<Docs>
9799
<summary>To be added.</summary>
100+
<remarks>Due to collision problems with SHA1, Microsoft recommends SHA256 or better.</remarks>
98101
</Docs>
99102
</Member>
100103
<Member MemberName="Sha224">

0 commit comments

Comments
 (0)