Imported Upstream version 5.10.0.160
Former-commit-id: c53882cc1707d973c4b74b4c6c7d98622ea24677
This commit is contained in:
parent
80d55115d1
commit
efb22d3209
@ -1 +1 @@
|
|||||||
9c81b9f04caa0bb1c6e0d19fa99af4490df7e488
|
3dfddaef886efdcb16b0fb7a9666e20ecfc37c62
|
@ -1 +1 @@
|
|||||||
4e1a808c6491658d344c14fb02474b5c9a1da24e
|
db18931c9022bc8170fe1397e334f168716084cb
|
@ -34,7 +34,7 @@ static class Consts
|
|||||||
// Use these assembly version constants to make code more maintainable.
|
// Use these assembly version constants to make code more maintainable.
|
||||||
//
|
//
|
||||||
|
|
||||||
public const string MonoVersion = "5.10.0.157";
|
public const string MonoVersion = "5.10.0.160";
|
||||||
public const string MonoCompany = "Mono development team";
|
public const string MonoCompany = "Mono development team";
|
||||||
public const string MonoProduct = "Mono Common Language Infrastructure";
|
public const string MonoProduct = "Mono Common Language Infrastructure";
|
||||||
public const string MonoCopyright = "(c) Various Mono authors";
|
public const string MonoCopyright = "(c) Various Mono authors";
|
||||||
|
@ -46,7 +46,7 @@ namespace System.Security.Cryptography.Pkcs {
|
|||||||
// only accessible from SignedPkcs7.SignerInfos
|
// only accessible from SignedPkcs7.SignerInfos
|
||||||
internal SignerInfo (string hashName, X509Certificate2 certificate, SubjectIdentifierType type, object o, int version)
|
internal SignerInfo (string hashName, X509Certificate2 certificate, SubjectIdentifierType type, object o, int version)
|
||||||
{
|
{
|
||||||
_digest = new Oid (CryptoConfig.MapNameToOID (hashName));
|
_digest = new Oid (CryptoConfig.MapNameToOID (hashName) ?? hashName);
|
||||||
_certificate = certificate;
|
_certificate = certificate;
|
||||||
_counter = new SignerInfoCollection ();
|
_counter = new SignerInfoCollection ();
|
||||||
_signed = new CryptographicAttributeObjectCollection ();
|
_signed = new CryptographicAttributeObjectCollection ();
|
||||||
|
File diff suppressed because one or more lines are too long
@ -186,6 +186,10 @@ public class TimeZoneTest {
|
|||||||
TST (t1);
|
TST (t1);
|
||||||
break;
|
break;
|
||||||
case "GMT":
|
case "GMT":
|
||||||
|
#if MONOTOUCH
|
||||||
|
if (string.IsNullOrEmpty (t1.DaylightName))
|
||||||
|
Assert.Ignore ("This test may fail due to: http://www.openradar.me/38174449");
|
||||||
|
#endif
|
||||||
GMT (t1);
|
GMT (t1);
|
||||||
break;
|
break;
|
||||||
case "NZST":
|
case "NZST":
|
||||||
|
@ -1 +1 @@
|
|||||||
73df7d82e053ed0b2bb95f37d05314c3dc574b2e
|
e3648ec762ca2ee3c7d8eb8dd47db4fbc37ab604
|
@ -1 +1 @@
|
|||||||
bfa592c6582db64678b2762985cc310dee889a64
|
efd89075bd285db5211e08ed43d8a1f277983c2a
|
@ -1 +1 @@
|
|||||||
cbae3744d9f81c02d8e8e3ca99a7f8751a0d47de
|
398a8f3785344006fc2a18c537335f051152c742
|
@ -1 +1 @@
|
|||||||
57c85538844cc1c710f5ca81c01fd896e3625fb2
|
e67714b89e0fd4da4a82040c8532f7d87780dcce
|
@ -1 +1 @@
|
|||||||
f4727ecfcca9c1346a21bc90ef342bffa91d16f2
|
d229e5822be263f7985dd2fe47457be78943cd31
|
@ -1 +1 @@
|
|||||||
e1586b43c970b328631e213dc085796094ca13ed
|
911ec1eda3f29662b7de938f41e2a56815290873
|
@ -1 +1 @@
|
|||||||
1339072a75cebc3935463cbe44bc85915b7cb897
|
fe3eb98c4140e84f03eaf1395a30988958a8d221
|
@ -1 +1 @@
|
|||||||
73df7d82e053ed0b2bb95f37d05314c3dc574b2e
|
e3648ec762ca2ee3c7d8eb8dd47db4fbc37ab604
|
@ -1 +1 @@
|
|||||||
bfa592c6582db64678b2762985cc310dee889a64
|
efd89075bd285db5211e08ed43d8a1f277983c2a
|
@ -1 +1 @@
|
|||||||
cbae3744d9f81c02d8e8e3ca99a7f8751a0d47de
|
398a8f3785344006fc2a18c537335f051152c742
|
@ -1 +1 @@
|
|||||||
57c85538844cc1c710f5ca81c01fd896e3625fb2
|
e67714b89e0fd4da4a82040c8532f7d87780dcce
|
@ -1 +1 @@
|
|||||||
f4727ecfcca9c1346a21bc90ef342bffa91d16f2
|
d229e5822be263f7985dd2fe47457be78943cd31
|
@ -1 +1 @@
|
|||||||
e1586b43c970b328631e213dc085796094ca13ed
|
911ec1eda3f29662b7de938f41e2a56815290873
|
@ -1 +1 @@
|
|||||||
1339072a75cebc3935463cbe44bc85915b7cb897
|
fe3eb98c4140e84f03eaf1395a30988958a8d221
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user