diff --git a/src/Renci.SshNet.NET35/Renci.SshNet.NET35.csproj b/src/Renci.SshNet.NET35/Renci.SshNet.NET35.csproj
index 0d83005e2..ffd2bce5b 100644
--- a/src/Renci.SshNet.NET35/Renci.SshNet.NET35.csproj
+++ b/src/Renci.SshNet.NET35/Renci.SshNet.NET35.csproj
@@ -821,6 +821,189 @@
Security\CertificateHostAlgorithm.cs
+
+ Security\Cryptography\Chaos.NaCl\CryptoBytes.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Ed25519.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Array16.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Array8.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\ByteIntegerConverter.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\base.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\base2.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\d.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\d2.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\fe_0.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\fe_1.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\fe_add.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\fe_cmov.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\fe_cswap.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\fe_frombytes.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\fe_invert.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\fe_isnegative.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\fe_isnonzero.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\fe_mul.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\fe_mul121666.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\fe_neg.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\fe_pow22523.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\fe_sq.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\fe_sq2.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\fe_sub.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\fe_tobytes.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\FieldElement.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\ge_add.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\ge_double_scalarmult.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\ge_frombytes.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\ge_madd.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\ge_msub.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\ge_p1p1_to_p2.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\ge_p1p1_to_p3.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\ge_p2_0.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\ge_p2_dbl.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\ge_p3_0.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\ge_p3_dbl.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\ge_p3_tobytes.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\ge_p3_to_cached.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\ge_p3_to_p2.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\ge_precomp_0.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\ge_scalarmult_base.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\ge_sub.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\ge_tobytes.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\GroupElement.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\keypair.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\open.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\scalarmult.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\sc_clamp.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\sc_mul_add.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\sc_reduce.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\sign.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\sqrtm1.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\InternalAssert.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Poly1305Donna.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Salsa\Salsa20.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Salsa\SalsaCore.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Sha512Internal.cs
+
+
+ Security\Cryptography\Chaos.NaCl\MontgomeryCurve25519.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Sha512.cs
+
Security\Cryptography\AsymmetricCipher.cs
@@ -896,6 +1079,12 @@
Security\Cryptography\DsaKey.cs
+
+ Security\Cryptography\ED25519DigitalSignature.cs
+
+
+ Security\Cryptography\ED25519Key.cs
+
Security\Cryptography\HMACMD5.cs
@@ -965,6 +1154,24 @@
Security\KeyExchangeDiffieHellmanGroupSha1.cs
+
+ Security\KeyExchangeEC.cs
+
+
+ Security\KeyExchangeECCurve25519.cs
+
+
+ Security\KeyExchangeECDH.cs
+
+
+ Security\KeyExchangeECDH256.cs
+
+
+ Security\KeyExchangeECDH384.cs
+
+
+ Security\KeyExchangeECDH521.cs
+
Security\KeyHostAlgorithm.cs
diff --git a/src/Renci.SshNet.Silverlight5/Renci.SshNet.Silverlight5.csproj b/src/Renci.SshNet.Silverlight5/Renci.SshNet.Silverlight5.csproj
index e66276007..2523a02f3 100644
--- a/src/Renci.SshNet.Silverlight5/Renci.SshNet.Silverlight5.csproj
+++ b/src/Renci.SshNet.Silverlight5/Renci.SshNet.Silverlight5.csproj
@@ -821,9 +821,195 @@
Security\CertificateHostAlgorithm.cs
+
+ Security\Cryptography\Chaos.NaCl\CryptoBytes.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Ed25519.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Array16.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Array8.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\ByteIntegerConverter.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\base.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\base2.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\d.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\d2.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\fe_0.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\fe_1.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\fe_add.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\fe_cmov.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\fe_cswap.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\fe_frombytes.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\fe_invert.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\fe_isnegative.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\fe_isnonzero.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\fe_mul.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\fe_mul121666.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\fe_neg.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\fe_pow22523.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\fe_sq.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\fe_sq2.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\fe_sub.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\fe_tobytes.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\FieldElement.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\ge_add.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\ge_double_scalarmult.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\ge_frombytes.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\ge_madd.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\ge_msub.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\ge_p1p1_to_p2.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\ge_p1p1_to_p3.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\ge_p2_0.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\ge_p2_dbl.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\ge_p3_0.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\ge_p3_dbl.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\ge_p3_tobytes.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\ge_p3_to_cached.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\ge_p3_to_p2.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\ge_precomp_0.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\ge_scalarmult_base.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\ge_sub.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\ge_tobytes.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\GroupElement.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\keypair.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\open.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\scalarmult.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\sc_clamp.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\sc_mul_add.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\sc_reduce.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\sign.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\sqrtm1.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\InternalAssert.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Poly1305Donna.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Salsa\Salsa20.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Salsa\SalsaCore.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Sha512Internal.cs
+
+
+ Security\Cryptography\Chaos.NaCl\MontgomeryCurve25519.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Sha512.cs
+
Security\Cryptography\AsymmetricCipher.cs
+
+ Security\Cryptography\Bcrypt.cs
+
Security\Cryptography\BlockCipher.cs
@@ -893,6 +1079,12 @@
Security\Cryptography\DsaKey.cs
+
+ Security\Cryptography\ED25519DigitalSignature.cs
+
+
+ Security\Cryptography\ED25519Key.cs
+
Security\Cryptography\HMACMD5.cs
@@ -956,6 +1148,24 @@
Security\KeyExchangeDiffieHellmanGroupSha1.cs
+
+ Security\KeyExchangeEC.cs
+
+
+ Security\KeyExchangeECCurve25519.cs
+
+
+ Security\KeyExchangeECDH.cs
+
+
+ Security\KeyExchangeECDH256.cs
+
+
+ Security\KeyExchangeECDH384.cs
+
+
+ Security\KeyExchangeECDH521.cs
+
Security\KeyHostAlgorithm.cs
diff --git a/src/Renci.SshNet.Tests.NET35/Renci.SshNet.Tests.NET35.csproj b/src/Renci.SshNet.Tests.NET35/Renci.SshNet.Tests.NET35.csproj
index ec5feb95e..abeeb691f 100644
--- a/src/Renci.SshNet.Tests.NET35/Renci.SshNet.Tests.NET35.csproj
+++ b/src/Renci.SshNet.Tests.NET35/Renci.SshNet.Tests.NET35.csproj
@@ -1762,6 +1762,12 @@
Data\Key.ECDSA521.Encrypted.txt
+
+ Data\Key.OPENSSH.ED25519.Encrypted.txt
+
+
+ Data\Key.OPENSSH.ED25519.txt
+
diff --git a/src/Renci.SshNet.UAP10/Renci.SshNet.UAP10.csproj b/src/Renci.SshNet.UAP10/Renci.SshNet.UAP10.csproj
index 369c3da7d..d1b874f42 100644
--- a/src/Renci.SshNet.UAP10/Renci.SshNet.UAP10.csproj
+++ b/src/Renci.SshNet.UAP10/Renci.SshNet.UAP10.csproj
@@ -885,9 +885,195 @@
Security\CertificateHostAlgorithm.cs
+
+ Security\Cryptography\Chaos.NaCl\CryptoBytes.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Ed25519.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Array16.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Array8.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\ByteIntegerConverter.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\base.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\base2.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\d.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\d2.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\fe_0.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\fe_1.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\fe_add.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\fe_cmov.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\fe_cswap.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\fe_frombytes.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\fe_invert.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\fe_isnegative.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\fe_isnonzero.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\fe_mul.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\fe_mul121666.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\fe_neg.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\fe_pow22523.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\fe_sq.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\fe_sq2.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\fe_sub.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\fe_tobytes.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\FieldElement.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\ge_add.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\ge_double_scalarmult.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\ge_frombytes.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\ge_madd.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\ge_msub.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\ge_p1p1_to_p2.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\ge_p1p1_to_p3.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\ge_p2_0.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\ge_p2_dbl.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\ge_p3_0.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\ge_p3_dbl.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\ge_p3_tobytes.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\ge_p3_to_cached.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\ge_p3_to_p2.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\ge_precomp_0.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\ge_scalarmult_base.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\ge_sub.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\ge_tobytes.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\GroupElement.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\keypair.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\open.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\scalarmult.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\sc_clamp.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\sc_mul_add.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\sc_reduce.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\sign.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\sqrtm1.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\InternalAssert.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Poly1305Donna.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Salsa\Salsa20.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Salsa\SalsaCore.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Sha512Internal.cs
+
+
+ Security\Cryptography\Chaos.NaCl\MontgomeryCurve25519.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Sha512.cs
+
Security\Cryptography\AsymmetricCipher.cs
+
+ Security\Cryptography\Bcrypt.cs
+
Security\Cryptography\BlockCipher.cs
@@ -957,6 +1143,12 @@
Security\Cryptography\DsaKey.cs
+
+ Security\Cryptography\ED25519DigitalSignature.cs
+
+
+ Security\Cryptography\ED25519Key.cs
+
Security\Cryptography\HMACMD5.cs
@@ -975,6 +1167,12 @@
Security\Cryptography\Key.cs
+
+ Security\Cryptography\EcdsaDigitalSignature.cs
+
+
+ Security\Cryptography\EcdsaKey.cs
+
Security\Cryptography\RsaDigitalSignature.cs
@@ -1020,6 +1218,24 @@
Security\KeyExchangeDiffieHellmanGroupSha1.cs
+
+ Security\KeyExchangeEC.cs
+
+
+ Security\KeyExchangeECCurve25519.cs
+
+
+ Security\KeyExchangeECDH.cs
+
+
+ Security\KeyExchangeECDH256.cs
+
+
+ Security\KeyExchangeECDH384.cs
+
+
+ Security\KeyExchangeECDH521.cs
+
Security\KeyHostAlgorithm.cs
diff --git a/src/Renci.SshNet.WindowsPhone8/Renci.SshNet.WindowsPhone8.csproj b/src/Renci.SshNet.WindowsPhone8/Renci.SshNet.WindowsPhone8.csproj
index 9300a9b41..7a915c18b 100644
--- a/src/Renci.SshNet.WindowsPhone8/Renci.SshNet.WindowsPhone8.csproj
+++ b/src/Renci.SshNet.WindowsPhone8/Renci.SshNet.WindowsPhone8.csproj
@@ -850,9 +850,195 @@
Security\CertificateHostAlgorithm.cs
+
+ Security\Cryptography\Chaos.NaCl\CryptoBytes.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Ed25519.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Array16.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Array8.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\ByteIntegerConverter.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\base.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\base2.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\d.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\d2.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\fe_0.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\fe_1.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\fe_add.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\fe_cmov.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\fe_cswap.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\fe_frombytes.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\fe_invert.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\fe_isnegative.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\fe_isnonzero.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\fe_mul.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\fe_mul121666.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\fe_neg.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\fe_pow22523.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\fe_sq.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\fe_sq2.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\fe_sub.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\fe_tobytes.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\FieldElement.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\ge_add.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\ge_double_scalarmult.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\ge_frombytes.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\ge_madd.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\ge_msub.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\ge_p1p1_to_p2.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\ge_p1p1_to_p3.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\ge_p2_0.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\ge_p2_dbl.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\ge_p3_0.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\ge_p3_dbl.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\ge_p3_tobytes.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\ge_p3_to_cached.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\ge_p3_to_p2.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\ge_precomp_0.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\ge_scalarmult_base.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\ge_sub.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\ge_tobytes.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\GroupElement.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\keypair.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\open.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\scalarmult.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\sc_clamp.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\sc_mul_add.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\sc_reduce.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\sign.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Ed25519Ref10\sqrtm1.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\InternalAssert.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Poly1305Donna.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Salsa\Salsa20.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Salsa\SalsaCore.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Internal\Sha512Internal.cs
+
+
+ Security\Cryptography\Chaos.NaCl\MontgomeryCurve25519.cs
+
+
+ Security\Cryptography\Chaos.NaCl\Sha512.cs
+
Security\Cryptography\AsymmetricCipher.cs
+
+ Security\Cryptography\Bcrypt.cs
+
Security\Cryptography\BlockCipher.cs
@@ -919,6 +1105,12 @@
Security\Cryptography\DsaKey.cs
+
+ Security\Cryptography\ED25519DigitalSignature.cs
+
+
+ Security\Cryptography\ED25519Key.cs
+
Security\Cryptography\HMACMD5.cs
@@ -937,6 +1129,12 @@
Security\Cryptography\Key.cs
+
+ Security\Cryptography\EcdsaDigitalSignature.cs
+
+
+ Security\Cryptography\EcdsaKey.cs
+
Security\Cryptography\RsaDigitalSignature.cs
@@ -982,6 +1180,24 @@
Security\KeyExchangeDiffieHellmanGroupSha1.cs
+
+ Security\KeyExchangeEC.cs
+
+
+ Security\KeyExchangeECCurve25519.cs
+
+
+ Security\KeyExchangeECDH.cs
+
+
+ Security\KeyExchangeECDH256.cs
+
+
+ Security\KeyExchangeECDH384.cs
+
+
+ Security\KeyExchangeECDH521.cs
+
Security\KeyHostAlgorithm.cs
diff --git a/src/Renci.SshNet/Security/BouncyCastle/crypto/prng/CryptoApiRandomGenerator.cs b/src/Renci.SshNet/Security/BouncyCastle/crypto/prng/CryptoApiRandomGenerator.cs
index b0c40cb4c..5dd468b04 100644
--- a/src/Renci.SshNet/Security/BouncyCastle/crypto/prng/CryptoApiRandomGenerator.cs
+++ b/src/Renci.SshNet/Security/BouncyCastle/crypto/prng/CryptoApiRandomGenerator.cs
@@ -1,5 +1,3 @@
-#if !(NETCF_1_0 || PORTABLE)
-
using System;
using System.Security.Cryptography;
@@ -69,5 +67,3 @@ public virtual void NextBytes(byte[] bytes, int start, int len)
#endregion
}
}
-
-#endif
diff --git a/src/Renci.SshNet/Security/BouncyCastle/math/BigInteger.cs b/src/Renci.SshNet/Security/BouncyCastle/math/BigInteger.cs
index b618501a8..635a25409 100644
--- a/src/Renci.SshNet/Security/BouncyCastle/math/BigInteger.cs
+++ b/src/Renci.SshNet/Security/BouncyCastle/math/BigInteger.cs
@@ -10,7 +10,7 @@
namespace Renci.SshNet.Security.Org.BouncyCastle.Math
{
-#if !(NETCF_1_0 || NETCF_2_0 || SILVERLIGHT || PORTABLE)
+#if FEATURE_BINARY_SERIALIZATION
[Serializable]
#endif
internal class BigInteger
diff --git a/src/Renci.SshNet/Security/BouncyCastle/security/SecurityUtilityException.cs b/src/Renci.SshNet/Security/BouncyCastle/security/SecurityUtilityException.cs
index d71893840..25a442e48 100644
--- a/src/Renci.SshNet/Security/BouncyCastle/security/SecurityUtilityException.cs
+++ b/src/Renci.SshNet/Security/BouncyCastle/security/SecurityUtilityException.cs
@@ -2,7 +2,7 @@
namespace Renci.SshNet.Security.Org.BouncyCastle.Security
{
-#if !(NETCF_1_0 || NETCF_2_0 || SILVERLIGHT || PORTABLE)
+#if FEATURE_BINARY_SERIALIZATION
[Serializable]
#endif
internal class SecurityUtilityException