diff --git a/Notice.txt b/Notice.txt
index eef4a2d715c2..bcd777e7472c 100644
--- a/Notice.txt
+++ b/Notice.txt
@@ -10,29 +10,6 @@ purpose, commercial or non-commercial, and by any means.
----------------
-** Parsing PEM files from Bouncy Castle
-Copyright (c) 2000 - 2017 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-----------------
-
** Performing CRC32 checks from vbAccelerator.com
vbAccelerator Software License
diff --git a/buildtools/NoticeForZips.txt b/buildtools/NoticeForZips.txt
index 702dcf5d4f18..6c2072eb2b2a 100644
--- a/buildtools/NoticeForZips.txt
+++ b/buildtools/NoticeForZips.txt
@@ -10,34 +10,6 @@ purpose, commercial or non-commercial, and by any means.
----------------
-** Parsing PEM files from Bouncy Castle
-Copyright (c) 2000 - 2017 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org)
-** Microsoft.Bcl.AsyncInterfaces from Microsoft
-Copyright (c) .NET Foundation and Contributors
-** System.Runtime.CompilerServices.Unsafe from Microsoft
-Copyright (c) .NET Foundation and Contributors
-** System.Threading.Tasks.Extensions from Microsoft
-Copyright (c) .NET Foundation and Contributors
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-----------------
** Performing CRC32 checks from vbAccelerator.com
vbAccelerator Software License
diff --git a/buildtools/build.proj b/buildtools/build.proj
index 4248da74fdf2..14d43f121b97 100644
--- a/buildtools/build.proj
+++ b/buildtools/build.proj
@@ -587,6 +587,7 @@
+
diff --git a/extensions/src/AWSSDK.Extensions.CloudFront.Signers/AWSSDK.Extensions.CloudFront.Signers.NetFramework.csproj b/extensions/src/AWSSDK.Extensions.CloudFront.Signers/AWSSDK.Extensions.CloudFront.Signers.NetFramework.csproj
index 5cba9aaec3fa..3b83569b0721 100644
--- a/extensions/src/AWSSDK.Extensions.CloudFront.Signers/AWSSDK.Extensions.CloudFront.Signers.NetFramework.csproj
+++ b/extensions/src/AWSSDK.Extensions.CloudFront.Signers/AWSSDK.Extensions.CloudFront.Signers.NetFramework.csproj
@@ -1,45 +1,40 @@
-
- net472
- AWSSDK.Extensions.CloudFront.Signers
- AWSSDK.Extensions.CloudFront.Signers
- 4.0.0.0-preview
- AWSSDK.Extensions.Cloudfront.Signers
-
- This package contains extension methods for creating signed URLs for Amazon CloudFront distributions and
- for creating signed cookies for Amazon CloudFront distributions using canned or custom policies.
-
- false
- false
- false
- false
- false
- false
- false
- false
- true
-
-
-
-
-
-
-
- ..\..\..\sdk\awssdk.dll.snk
-
-
-
-
- $(AWSKeyFile)
-
-
-
-
-
-
-
-
-
-
-
+
+ net472
+ AWSSDK.Extensions.CloudFront.Signers
+ AWSSDK.Extensions.CloudFront.Signers
+ 4.0.0.0-preview
+ AWSSDK.Extensions.Cloudfront.Signers
+ false
+ false
+ false
+ false
+ false
+ false
+ false
+ false
+ true
+
+
+
+
+
+
+
+ ..\..\..\sdk\awssdk.dll.snk
+
+
+
+
+ $(AWSKeyFile)
+
+
+
+
+
+
+
+
+
+
diff --git a/extensions/src/AWSSDK.Extensions.CloudFront.Signers/AWSSDK.Extensions.CloudFront.Signers.NetStandard.csproj b/extensions/src/AWSSDK.Extensions.CloudFront.Signers/AWSSDK.Extensions.CloudFront.Signers.NetStandard.csproj
index e4b369bb2118..d70872d5b855 100644
--- a/extensions/src/AWSSDK.Extensions.CloudFront.Signers/AWSSDK.Extensions.CloudFront.Signers.NetStandard.csproj
+++ b/extensions/src/AWSSDK.Extensions.CloudFront.Signers/AWSSDK.Extensions.CloudFront.Signers.NetStandard.csproj
@@ -1,49 +1,41 @@
-
- netstandard2.0;netcoreapp3.1;net8.0
- AWSSDK.Extensions.CloudFront.Signers
- AWSSDK.Extensions.CloudFront.Signers
- 4.0.0.0-preview
- AWSSDK.Extensions.Cloudfront.Signers
-
- This package contains extension methods for creating signed URLs for Amazon CloudFront distributions and
- for creating signed cookies for Amazon CloudFront distributions using canned or custom policies.
-
- $(DefineConstants);NETSTANDARD;AWS_ASYNC_API
- $(DefineConstants);NETSTANDARD20;AWS_ASYNC_ENUMERABLES_API
- $(DefineConstants);AWS_ASYNC_ENUMERABLES_API
- $(DefineConstants);AWS_ASYNC_ENUMERABLES_API
- false
- false
- false
- false
- false
- false
- false
- false
- true
-
-
-
-
-
-
-
- ..\..\..\sdk\awssdk.dll.snk
-
-
-
-
- $(AWSKeyFile)
-
-
-
-
-
-
-
-
-
-
-
+
+ netstandard2.0;netcoreapp3.1;net8.0
+ AWSSDK.Extensions.CloudFront.Signers
+ AWSSDK.Extensions.CloudFront.Signers
+ 4.0.0.0-preview
+ AWSSDK.Extensions.Cloudfront.Signers
+ $(DefineConstants);NETSTANDARD;AWS_ASYNC_API
+ false
+ false
+ false
+ false
+ false
+ false
+ false
+ false
+ true
+
+
+
+
+
+
+
+ ..\..\..\sdk\awssdk.dll.snk
+
+
+
+
+ $(AWSKeyFile)
+
+
+
+
+
+
+
+
+
+
diff --git a/extensions/src/AWSSDK.Extensions.CloudFront.Signers/AWSSDK.Extensions.CloudFront.Signers.nuspec b/extensions/src/AWSSDK.Extensions.CloudFront.Signers/AWSSDK.Extensions.CloudFront.Signers.nuspec
index 590bce951f6c..100a246e8b84 100644
--- a/extensions/src/AWSSDK.Extensions.CloudFront.Signers/AWSSDK.Extensions.CloudFront.Signers.nuspec
+++ b/extensions/src/AWSSDK.Extensions.CloudFront.Signers/AWSSDK.Extensions.CloudFront.Signers.nuspec
@@ -18,10 +18,12 @@
+
+
diff --git a/extensions/src/AWSSDK.Extensions.CloudFront.Signers/AmazonCloudFrontUrlSigner.cs b/extensions/src/AWSSDK.Extensions.CloudFront.Signers/AmazonCloudFrontUrlSigner.cs
index ed1d82f23ee8..481a99b1b97a 100644
--- a/extensions/src/AWSSDK.Extensions.CloudFront.Signers/AmazonCloudFrontUrlSigner.cs
+++ b/extensions/src/AWSSDK.Extensions.CloudFront.Signers/AmazonCloudFrontUrlSigner.cs
@@ -521,10 +521,21 @@ internal static RSAParameters ConvertPEMToRSAParameters(TextReader privateKeyRea
try
{
var pemReader = new PemReader(privateKeyReader);
- var keyPair = pemReader.ReadObject() as AsymmetricCipherKeyPair;
- var privateKey = keyPair.Private as RsaPrivateCrtKeyParameters;
- rsaParams = DotNetUtilities.ToRSAParameters(privateKey);
-
+ var keyPair = pemReader.ReadObject();
+ if (keyPair is RsaPrivateCrtKeyParameters)
+ {
+ rsaParams = DotNetUtilities.ToRSAParameters((RsaPrivateCrtKeyParameters)keyPair);
+ }
+ else if (keyPair is AsymmetricCipherKeyPair)
+ {
+ var asymmetricKeyPair = keyPair as AsymmetricCipherKeyPair;
+ var privateKey = asymmetricKeyPair.Private as RsaPrivateCrtKeyParameters;
+ rsaParams = DotNetUtilities.ToRSAParameters(privateKey);
+ }
+ else
+ {
+ throw new AmazonClientException("Unknown key type");
+ }
}
catch (Exception e)
{
diff --git a/extensions/src/AWSSDK.Extensions.CrtIntegration/AWSSDK.Extensions.CrtIntegration.nuspec b/extensions/src/AWSSDK.Extensions.CrtIntegration/AWSSDK.Extensions.CrtIntegration.nuspec
index a1517088d68b..1bc0f3552e24 100644
--- a/extensions/src/AWSSDK.Extensions.CrtIntegration/AWSSDK.Extensions.CrtIntegration.nuspec
+++ b/extensions/src/AWSSDK.Extensions.CrtIntegration/AWSSDK.Extensions.CrtIntegration.nuspec
@@ -13,12 +13,14 @@
images\AWSLogo.png
-
-
+
+
+
-
-
+
+
+
diff --git a/extensions/src/AWSSDK.Extensions.EC2.DecryptPassword/AWSSDK.Extensions.EC2.DecryptPassword.NetFramework.csproj b/extensions/src/AWSSDK.Extensions.EC2.DecryptPassword/AWSSDK.Extensions.EC2.DecryptPassword.NetFramework.csproj
index e70462308649..e62db841cd6e 100644
--- a/extensions/src/AWSSDK.Extensions.EC2.DecryptPassword/AWSSDK.Extensions.EC2.DecryptPassword.NetFramework.csproj
+++ b/extensions/src/AWSSDK.Extensions.EC2.DecryptPassword/AWSSDK.Extensions.EC2.DecryptPassword.NetFramework.csproj
@@ -5,7 +5,6 @@
AWSSDK.Extensions.EC2.DecryptPassword
4.0.0.0-preview
AWSSDK.Extensions.EC2.DecryptPassword
- $(DefineConstants);BCL;AWS_ASYNC_API;CODE_ANALYSIS
false
false
false
diff --git a/extensions/src/AWSSDK.Extensions.EC2.DecryptPassword/AWSSDK.Extensions.EC2.DecryptPassword.NetStandard.csproj b/extensions/src/AWSSDK.Extensions.EC2.DecryptPassword/AWSSDK.Extensions.EC2.DecryptPassword.NetStandard.csproj
index bcbad3d011ab..939d7fb92ca6 100644
--- a/extensions/src/AWSSDK.Extensions.EC2.DecryptPassword/AWSSDK.Extensions.EC2.DecryptPassword.NetStandard.csproj
+++ b/extensions/src/AWSSDK.Extensions.EC2.DecryptPassword/AWSSDK.Extensions.EC2.DecryptPassword.NetStandard.csproj
@@ -5,10 +5,6 @@
AWSSDK.Extensions.EC2.DecryptPassword
4.0.0.0-preview
AWSSDK.Extensions.EC2.DecryptPassword
- $(DefineConstants);NETSTANDARD;AWS_ASYNC_API
- $(DefineConstants);NETSTANDARD20;AWS_ASYNC_ENUMERABLES_API
- $(DefineConstants);AWS_ASYNC_ENUMERABLES_API
- $(DefineConstants);AWS_ASYNC_ENUMERABLES_API
false
false
false
diff --git a/extensions/src/AWSSDK.Extensions.EC2.DecryptPassword/AWSSDK.Extensions.EC2.DecryptPassword.nuspec b/extensions/src/AWSSDK.Extensions.EC2.DecryptPassword/AWSSDK.Extensions.EC2.DecryptPassword.nuspec
index f04b9b8ab5d9..fdd17e0754b5 100644
--- a/extensions/src/AWSSDK.Extensions.EC2.DecryptPassword/AWSSDK.Extensions.EC2.DecryptPassword.nuspec
+++ b/extensions/src/AWSSDK.Extensions.EC2.DecryptPassword/AWSSDK.Extensions.EC2.DecryptPassword.nuspec
@@ -15,10 +15,12 @@
+
+
diff --git a/extensions/src/AWSSDK.Extensions.EC2.DecryptPassword/AWSSDK.Extensions.EC2.DecryptPassword.sln b/extensions/src/AWSSDK.Extensions.EC2.DecryptPassword/AWSSDK.Extensions.EC2.DecryptPassword.sln
deleted file mode 100644
index 2d818922ffa3..000000000000
--- a/extensions/src/AWSSDK.Extensions.EC2.DecryptPassword/AWSSDK.Extensions.EC2.DecryptPassword.sln
+++ /dev/null
@@ -1,37 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.5.002.0
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.Extensions.Ec2.DecryptPassword.NetStandard", "AWSSDK.Extensions.Ec2.DecryptPassword.NetStandard.csproj", "{79C3BD47-E485-48EE-9440-7C2E6F727147}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.Extensions.EC2.DecryptPassword.NetFramework", "AWSSDK.Extensions.EC2.DecryptPassword.NetFramework.csproj", "{71276C16-3287-4FEC-92F0-72EE7C3BE8DA}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EC2.DecryptPassword.NetFramework", "..\..\test\EC2.DecryptPasswordTests\EC2.DecryptPassword.NetFramework.csproj", "{4659595E-2C55-4EA7-9023-02C7A0786634}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Any CPU = Debug|Any CPU
- Release|Any CPU = Release|Any CPU
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {79C3BD47-E485-48EE-9440-7C2E6F727147}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {79C3BD47-E485-48EE-9440-7C2E6F727147}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {79C3BD47-E485-48EE-9440-7C2E6F727147}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {79C3BD47-E485-48EE-9440-7C2E6F727147}.Release|Any CPU.Build.0 = Release|Any CPU
- {71276C16-3287-4FEC-92F0-72EE7C3BE8DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {71276C16-3287-4FEC-92F0-72EE7C3BE8DA}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {71276C16-3287-4FEC-92F0-72EE7C3BE8DA}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {71276C16-3287-4FEC-92F0-72EE7C3BE8DA}.Release|Any CPU.Build.0 = Release|Any CPU
- {4659595E-2C55-4EA7-9023-02C7A0786634}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {4659595E-2C55-4EA7-9023-02C7A0786634}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {4659595E-2C55-4EA7-9023-02C7A0786634}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {4659595E-2C55-4EA7-9023-02C7A0786634}.Release|Any CPU.Build.0 = Release|Any CPU
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
- GlobalSection(ExtensibilityGlobals) = postSolution
- SolutionGuid = {4E922C0B-567A-4525-BA1F-89160EC54342}
- EndGlobalSection
-EndGlobal
diff --git a/extensions/src/AWSSDK.Extensions.EC2.DecryptPassword/GetPasswordDataResponseExtensions.cs b/extensions/src/AWSSDK.Extensions.EC2.DecryptPassword/GetPasswordDataResponseExtensions.cs
index 46f8aaf6ae43..7fd345fe7114 100644
--- a/extensions/src/AWSSDK.Extensions.EC2.DecryptPassword/GetPasswordDataResponseExtensions.cs
+++ b/extensions/src/AWSSDK.Extensions.EC2.DecryptPassword/GetPasswordDataResponseExtensions.cs
@@ -42,10 +42,22 @@ public static string GetDecryptedPassword(this GetPasswordDataResponse getPasswo
RSAParameters rsaParams;
try
{
- //rsaParams = new PemReader(new StringReader(rsaPrivateKey.Trim())).ReadPrivatekey();
- var keyPair = new Org.BouncyCastle.OpenSsl.PemReader(new StringReader(rsaPrivateKey.Trim())).ReadObject() as AsymmetricCipherKeyPair;
- var privateKey = keyPair.Private as RsaPrivateCrtKeyParameters;
- rsaParams = DotNetUtilities.ToRSAParameters(privateKey);
+ var pemReader = new PemReader(new StringReader(rsaPrivateKey.Trim()));
+ var keyPair = pemReader.ReadObject();
+ if (keyPair is RsaPrivateCrtKeyParameters)
+ {
+ rsaParams = DotNetUtilities.ToRSAParameters((RsaPrivateCrtKeyParameters)keyPair);
+ }
+ else if (keyPair is AsymmetricCipherKeyPair)
+ {
+ var asymmetricKeyPair = keyPair as AsymmetricCipherKeyPair;
+ var privateKey = asymmetricKeyPair.Private as RsaPrivateCrtKeyParameters;
+ rsaParams = DotNetUtilities.ToRSAParameters(privateKey);
+ }
+ else
+ {
+ throw new AmazonClientException("Unknown key type");
+ }
}
catch (Exception e)
{
diff --git a/extensions/test/CloudFront.SignersTests/CloudFront.Signers.Tests.NetFramework.csproj b/extensions/test/CloudFront.SignersTests/CloudFront.Signers.Tests.NetFramework.csproj
index e977e49fc517..f2cb6d3736dc 100644
--- a/extensions/test/CloudFront.SignersTests/CloudFront.Signers.Tests.NetFramework.csproj
+++ b/extensions/test/CloudFront.SignersTests/CloudFront.Signers.Tests.NetFramework.csproj
@@ -15,6 +15,8 @@
+
+
@@ -22,9 +24,7 @@
-
-
diff --git a/extensions/test/CloudFront.SignersTests/URLSignerTest.cs b/extensions/test/CloudFront.SignersTests/URLSignerTest.cs
index 71b75c4bd0dc..ad5c28ca50c9 100644
--- a/extensions/test/CloudFront.SignersTests/URLSignerTest.cs
+++ b/extensions/test/CloudFront.SignersTests/URLSignerTest.cs
@@ -124,5 +124,47 @@ public void PolicyStatementWithAddress()
var epochTime = condition["DateLessThan"]["AWS:EpochTime"];
Assert.Equal(1357034400, long.Parse(epochTime.ToString()));
}
+
+ ///
+ /// Tests that the issue mentioned in https://github.com/aws/aws-sdk-net/issues/3221 no longer throws an exception.
+ ///
+ [Fact]
+ [Trait("Category","CloudFront")]
+ public void TestGetCannedSignedUrlWithOpenSSL3()
+ {
+ var reader = new StringReader(@"
+ -----BEGIN PRIVATE KEY-----
+ MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCa5udYGtrIPUU5
+ EA0uTAGIc/gPFKqk9rnx6ubTkkEErA6ZiIbG/lj4bSRHendy06qd1X5zuJ4k73oi
+ SsXKzCOuJHAZA872+iIbFI5axdYH25E3LIzJZu7KHlL08QGsIl9ccx8usuSotsj2
+ pvb+uswg6kM3sy6Kiqw6e+5GlR4i0CNtt9pOTPb1+5ZQGehx0oeAypV4vGRZIQBm
+ aCYXo2sBMZI1nNhe6fW7jpNrtki+nh1CKpmxE2TEwfFNh8xCiZ4wCJ4Y8GE3Te9E
+ 8otXM4+15ksIdMzJi7WbtiPsrEc4bxkBD+Hor8bGgFxXAWRRM3ttzLsZrotgEgYO
+ fu7y0EtXAgMBAAECggEALqqhx8lPYEQVNru/PNNpItLNSL3RKyGpo1hBcjv9moq7
+ W0XmVM0LwMwgwegDVHSwUhyfm/1ip33+LZaZQB+AIFaZ7u9WytFQtRfcSzyO3o8n
+ kJe7UnHQPtQj6ecxucohMJj+K/N5L9rhcG2cu+FK3h+1YHJ68wIUIQp1Ho6OJa5W
+ 6/ad/aEPnSH5vd3LmUTSiD/jOtpoSge1axwVoCY4sdK8aTSAld/KexVHb7S5V2m2
+ IB1tZ+lE+5NyggKbop1ZtqsmJSbpNlHVDuboJMQppK8M/CENetykPe3L8BiIY3zU
+ J6jylM3dPA+bjlOvylZsWmtAe3ItajftzYSrGXKuAQKBgQDOubkIYSj+O8a5h4Hw
+ n/YequdduArKe/loKh2987mM2yqyU56XKoJ48GA6X3nZKPy5ZxcQD0maGUtf/6Bk
+ 0rQwq+Tyk2m5fShIhTNoCukjteLClfyw6F2I+3xqMJi7+o0l+t2XB2nFXjTJE8jS
+ zL9uyDG+w45Q8PBbYhrrnMK9iQKBgQC/0vArSNkdrYf2gpVbGW15rWcCtloDm85l
+ X1TFIRAh4dVQyonz5ZD5VVl3RYsm0VaH01q6G3pgY8gfVyxPTebm01MC2z5GQk1V
+ 1PWbeIbP4P1+wl1uFb4o9ksGGwhwUvm1JO/7PwmcClvdjvO3tv3rpotJAhJr2vBl
+ UAp87fBp3wKBgGamxKHLlU6BIlH4Xua8l7tsxAy+meUoIJW/7BrpzqaKIi6A5UxN
+ GJKzUiVKSbgy6SOrdEFORg8WJl6aEexe0Ikmoj5uQt6PrpQsSHWOjWxlIh/b2KmE
+ CQY/Uu1sCju106cbZjNbxAL0n6OFhoBemWSKVmFSu/WnXsMR+SosImt5AoGBALXf
+ UJkpi7low4WFEAj81eBM+WMH89aCDjHtLhltnLcTQMZGEoAtw8OzGY1NYX7fcjR7
+ vwS/cssbMC4O39MdIHTwHj+SEbxZtqtPq8LJhsBoKNDbhewPL2n1AvL6BIlDEsCe
+ Ee7cOMc6xxkNJaSlGqEoGd2R2ldqkQzt09PZYV1vAoGABLeRlh3Jw+T34o9xsCM3
+ N2hU89VWIgvy5Tnz2CekZ7Lw9oL4dACM0LnAs2XG258H1eaVICBkYM/HYPrrTDuf
+ CKahgTe2mWpYYIuX9FeuEde8/aCFjmx3Ex+QhApPRKh/Sjt/KDYklv/uM8yVwA0Z
+ i6bFYQM/GnNZd4VnbUZ28ro=
+ -----END PRIVATE KEY-----
+ ");
+
+ Assert.NotNull(AmazonCloudFrontUrlSigner.GetCannedSignedURL("http://example.com", reader, "keyPairId", DateTime.Now));
+
+ }
}
}
diff --git a/extensions/test/EC2.DecryptPasswordTests/EC2.DecryptPassword.NetFramework.csproj b/extensions/test/EC2.DecryptPasswordTests/EC2.DecryptPassword.NetFramework.csproj
index 26612243ae7a..49c6e12c574e 100644
--- a/extensions/test/EC2.DecryptPasswordTests/EC2.DecryptPassword.NetFramework.csproj
+++ b/extensions/test/EC2.DecryptPasswordTests/EC2.DecryptPassword.NetFramework.csproj
@@ -14,7 +14,9 @@
true
-
+
+
+
@@ -22,9 +24,7 @@
-
-
\ No newline at end of file