Skip to content

Commit b367b1b

Browse files
darinkesdarinkes
committed
Enable Build of Elliptic-Curves for other Projects
1 parent 2b51cf9 commit b367b1b

File tree

11 files changed

+1786
-31
lines changed

11 files changed

+1786
-31
lines changed

‎src/Renci.SshNet.NET35/Renci.SshNet.NET35.csproj

Lines changed: 429 additions & 0 deletions
Large diffs are not rendered by default.

‎src/Renci.SshNet.NETCore/Renci.SshNet.NETCore.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@
2929
<PackageReference Include="SshNet.Security.Cryptography" Version="[1.3.0]" />
3030
</ItemGroup>
3131
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
32-
<DefineConstants>FEATURE_ENCODING_ASCII;FEATURE_DIAGNOSTICS_TRACESOURCE;FEATURE_DIRECTORYINFO_ENUMERATEFILES;FEATURE_MEMORYSTREAM_TRYGETBUFFER;FEATURE_REFLECTION_TYPEINFO;FEATURE_RNG_CREATE;FEATURE_SOCKET_TAP;FEATURE_SOCKET_EAP;FEATURE_SOCKET_SYNC;FEATURE_SOCKET_SETSOCKETOPTION;FEATURE_SOCKET_SELECT;FEATURE_SOCKET_POLL;FEATURE_SOCKET_DISPOSE;FEATURE_DNS_TAP;FEATURE_STREAM_TAP;FEATURE_THREAD_COUNTDOWNEVENT;FEATURE_THREAD_TAP;FEATURE_THREAD_THREADPOOL;FEATURE_THREAD_SLEEP;FEATURE_WAITHANDLE_DISPOSE;FEATURE_HASH_MD5;FEATURE_HASH_SHA1_CREATE;FEATURE_HASH_SHA256_CREATE;FEATURE_HASH_SHA384_CREATE;FEATURE_HASH_SHA512_CREATE;FEATURE_HMAC_MD5;FEATURE_HMAC_SHA1;FEATURE_HMAC_SHA256;FEATURE_HMAC_SHA384;FEATURE_HMAC_SHA512</DefineConstants>
32+
<DefineConstants>FEATURE_ENCODING_ASCII;FEATURE_DIAGNOSTICS_TRACESOURCE;FEATURE_DIRECTORYINFO_ENUMERATEFILES;FEATURE_MEMORYSTREAM_TRYGETBUFFER;FEATURE_REFLECTION_TYPEINFO;FEATURE_RNG_CREATE;FEATURE_SOCKET_TAP;FEATURE_SOCKET_EAP;FEATURE_SOCKET_SYNC;FEATURE_SOCKET_SETSOCKETOPTION;FEATURE_SOCKET_SELECT;FEATURE_SOCKET_POLL;FEATURE_SOCKET_DISPOSE;FEATURE_DNS_TAP;FEATURE_STREAM_TAP;FEATURE_THREAD_COUNTDOWNEVENT;FEATURE_THREAD_TAP;FEATURE_THREAD_THREADPOOL;FEATURE_THREAD_SLEEP;FEATURE_WAITHANDLE_DISPOSE;FEATURE_HASH_MD5;FEATURE_HASH_SHA1_CREATE;FEATURE_HASH_SHA256_CREATE;FEATURE_HASH_SHA384_CREATE;FEATURE_HASH_SHA512_CREATE;FEATURE_HMAC_MD5;FEATURE_HMAC_SHA1;FEATURE_HMAC_SHA256;FEATURE_HMAC_SHA384;FEATURE_HMAC_SHA512;PORTABLE</DefineConstants>
3333
</PropertyGroup>
3434
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
35-
<DefineConstants>FEATURE_ENCODING_ASCII;FEATURE_DIAGNOSTICS_TRACESOURCE;FEATURE_DIRECTORYINFO_ENUMERATEFILES;FEATURE_MEMORYSTREAM_GETBUFFER;FEATURE_MEMORYSTREAM_TRYGETBUFFER;FEATURE_RNG_CREATE;FEATURE_SOCKET_TAP;FEATURE_SOCKET_APM;FEATURE_SOCKET_EAP;FEATURE_SOCKET_SYNC;FEATURE_SOCKET_SETSOCKETOPTION;FEATURE_SOCKET_SELECT;FEATURE_SOCKET_POLL;FEATURE_SOCKET_DISPOSE;FEATURE_DNS_SYNC;FEATURE_DNS_APM;FEATURE_DNS_TAP;FEATURE_STREAM_APM;FEATURE_STREAM_TAP;FEATURE_THREAD_COUNTDOWNEVENT;FEATURE_THREAD_TAP;FEATURE_THREAD_THREADPOOL;FEATURE_THREAD_SLEEP;FEATURE_WAITHANDLE_DISPOSE;FEATURE_HASH_MD5;FEATURE_HASH_SHA1_CREATE;FEATURE_HASH_SHA256_CREATE;FEATURE_HASH_SHA384_CREATE;FEATURE_HASH_SHA512_CREATE;FEATURE_HMAC_MD5;FEATURE_HMAC_SHA1;FEATURE_HMAC_SHA256;FEATURE_HMAC_SHA384;FEATURE_HMAC_SHA512</DefineConstants>
35+
<DefineConstants>FEATURE_ENCODING_ASCII;FEATURE_DIAGNOSTICS_TRACESOURCE;FEATURE_DIRECTORYINFO_ENUMERATEFILES;FEATURE_MEMORYSTREAM_GETBUFFER;FEATURE_MEMORYSTREAM_TRYGETBUFFER;FEATURE_RNG_CREATE;FEATURE_SOCKET_TAP;FEATURE_SOCKET_APM;FEATURE_SOCKET_EAP;FEATURE_SOCKET_SYNC;FEATURE_SOCKET_SETSOCKETOPTION;FEATURE_SOCKET_SELECT;FEATURE_SOCKET_POLL;FEATURE_SOCKET_DISPOSE;FEATURE_DNS_SYNC;FEATURE_DNS_APM;FEATURE_DNS_TAP;FEATURE_STREAM_APM;FEATURE_STREAM_TAP;FEATURE_THREAD_COUNTDOWNEVENT;FEATURE_THREAD_TAP;FEATURE_THREAD_THREADPOOL;FEATURE_THREAD_SLEEP;FEATURE_WAITHANDLE_DISPOSE;FEATURE_HASH_MD5;FEATURE_HASH_SHA1_CREATE;FEATURE_HASH_SHA256_CREATE;FEATURE_HASH_SHA384_CREATE;FEATURE_HASH_SHA512_CREATE;FEATURE_HMAC_MD5;FEATURE_HMAC_SHA1;FEATURE_HMAC_SHA256;FEATURE_HMAC_SHA384;FEATURE_HMAC_SHA512;PORTABLE</DefineConstants>
3636
</PropertyGroup>
37-
</Project>
37+
</Project>

‎src/Renci.SshNet.Silverlight5/Renci.SshNet.Silverlight5.csproj

Lines changed: 435 additions & 3 deletions
Large diffs are not rendered by default.

‎src/Renci.SshNet.Tests.NET35/Renci.SshNet.Tests.NET35.csproj

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1762,6 +1762,12 @@
17621762
<EmbeddedResource Include="..\Renci.SshNet.Tests\Data\Key.ECDSA521.Encrypted.txt">
17631763
<Link>Data\Key.ECDSA521.Encrypted.txt</Link>
17641764
</EmbeddedResource>
1765+
<EmbeddedResource Include="..\Renci.SshNet.Tests\Data\Key.OPENSSH.ED25519.Encrypted.txt">
1766+
<Link>Data\Key.OPENSSH.ED25519.Encrypted.txt</Link>
1767+
</EmbeddedResource>
1768+
<EmbeddedResource Include="..\Renci.SshNet.Tests\Data\Key.OPENSSH.ED25519.txt">
1769+
<Link>Data\Key.OPENSSH.ED25519.txt</Link>
1770+
</EmbeddedResource>
17651771
</ItemGroup>
17661772
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
17671773
<ProjectExtensions>

‎src/Renci.SshNet.UAP10/Renci.SshNet.UAP10.csproj

Lines changed: 447 additions & 9 deletions
Large diffs are not rendered by default.

‎src/Renci.SshNet.WindowsPhone8/Renci.SshNet.WindowsPhone8.csproj

Lines changed: 445 additions & 7 deletions
Large diffs are not rendered by default.

‎src/Renci.SshNet/Security/BouncyCastle/crypto/prng/CryptoApiRandomGenerator.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
#if !(NETCF_1_0 || PORTABLE)
2-
31
using System;
42
using System.Security.Cryptography;
53

@@ -11,7 +9,11 @@ internal class CryptoApiRandomGenerator
119
private readonly RandomNumberGenerator rndProv;
1210

1311
public CryptoApiRandomGenerator()
12+
#if SILVERLIGHT5 || WINDOWS_PHONE8
13+
: this(new RNGCryptoServiceProvider())
14+
#else
1415
: this(RandomNumberGenerator.Create())
16+
#endif
1517
{
1618
}
1719

@@ -20,7 +22,7 @@ public CryptoApiRandomGenerator(RandomNumberGenerator rng)
2022
this.rndProv = rng;
2123
}
2224

23-
#region IRandomGenerator Members
25+
#region IRandomGenerator Members
2426

2527
public virtual void AddSeedMaterial(byte[] seed)
2628
{
@@ -56,8 +58,6 @@ public virtual void NextBytes(byte[] bytes, int start, int len)
5658
}
5759
}
5860

59-
#endregion
61+
#endregion
6062
}
61-
}
62-
63-
#endif
63+
}

‎src/Renci.SshNet/Security/BouncyCastle/math/BigInteger.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
namespace Renci.SshNet.Security.Org.BouncyCastle.Math
1111
{
12-
#if !(NETCF_1_0 || NETCF_2_0 || SILVERLIGHT || PORTABLE)
12+
#if FEATURE_BINARY_SERIALIZATION
1313
[Serializable]
1414
#endif
1515
internal class BigInteger

‎src/Renci.SshNet/Security/BouncyCastle/security/SecurityUtilityException.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace Renci.SshNet.Security.Org.BouncyCastle.Security
44
{
5-
#if !(NETCF_1_0 || NETCF_2_0 || SILVERLIGHT || PORTABLE)
5+
#if FEATURE_BINARY_SERIALIZATION
66
[Serializable]
77
#endif
88
internal class SecurityUtilityException

‎src/Renci.SshNet/Security/BouncyCastle/util/Enums.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,11 @@ internal static Enum GetArbitraryValue(System.Type enumType)
3838

3939
internal static bool IsEnumType(System.Type t)
4040
{
41+
#if PORTABLE
42+
return true;
43+
#else
4144
return t.IsEnum;
45+
#endif
4246
}
4347
}
4448
}

‎src/Renci.SshNet/Security/Cryptography/Bcrypt.cs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -496,10 +496,18 @@ public static string HashPassword(string input, string salt)
496496
public static string GenerateSalt(int workFactor)
497497
{
498498
if (workFactor < 4 || workFactor > 31)
499+
#if SILVERLIGHT5
500+
throw new ArgumentOutOfRangeException("workFactor", "The work factor must be between 4 and 31 (inclusive)");
501+
#else
499502
throw new ArgumentOutOfRangeException("workFactor", workFactor, "The work factor must be between 4 and 31 (inclusive)");
503+
#endif
500504

501505
byte[] rnd = new byte[BCRYPT_SALT_LEN];
506+
#if SILVERLIGHT5 || WINDOWS_PHONE8
507+
RNGCryptoServiceProvider rng = new RNGCryptoServiceProvider();
508+
#else
502509
RandomNumberGenerator rng = RandomNumberGenerator.Create();
510+
#endif
503511
rng.GetBytes(rnd);
504512

505513
StringBuilder rs = new StringBuilder();

0 commit comments

Comments
 (0)