Skip to content

add toggle to use fips #806

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

add toggle to use fips #806

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,4 @@ project.lock.json

# Build outputs
build/target/
/.vs
43 changes: 37 additions & 6 deletions src/Renci.SshNet/Abstractions/CryptoAbstraction.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,12 @@ public static System.Security.Cryptography.RandomNumberGenerator CreateRandomNum
#endif // FEATURE_RNG_CREATE || FEATURE_RNG_CSP

#if FEATURE_HASH_MD5
public static System.Security.Cryptography.MD5 CreateMD5()
public static System.Security.Cryptography.HashAlgorithm CreateMD5()
{
return System.Security.Cryptography.MD5.Create();
if (SftpClient.UseFIPS)
return new System.Security.Cryptography.SHA1CryptoServiceProvider();
else
return System.Security.Cryptography.MD5.Create();
}
#else
public static global::SshNet.Security.Cryptography.MD5 CreateMD5()
Expand All @@ -70,11 +73,18 @@ public static System.Security.Cryptography.MD5 CreateMD5()
#if FEATURE_HASH_SHA1_CREATE || FEATURE_HASH_SHA1_MANAGED
public static System.Security.Cryptography.SHA1 CreateSHA1()
{
if (SftpClient.UseFIPS)
{
return new System.Security.Cryptography.SHA1CryptoServiceProvider();
}
else
{
#if FEATURE_HASH_SHA1_CREATE
return System.Security.Cryptography.SHA1.Create();
return System.Security.Cryptography.SHA1.Create();
#elif FEATURE_HASH_SHA1_MANAGED
return new System.Security.Cryptography.SHA1Managed();
#endif
}
}
#else
public static global::SshNet.Security.Cryptography.SHA1 CreateSHA1()
Expand All @@ -86,11 +96,18 @@ public static System.Security.Cryptography.SHA1 CreateSHA1()
#if FEATURE_HASH_SHA256_CREATE || FEATURE_HASH_SHA256_MANAGED
public static System.Security.Cryptography.SHA256 CreateSHA256()
{
if (SftpClient.UseFIPS)
{
return new System.Security.Cryptography.SHA256CryptoServiceProvider();
}
else
{
#if FEATURE_HASH_SHA256_CREATE
return System.Security.Cryptography.SHA256.Create();
return System.Security.Cryptography.SHA256.Create();
#elif FEATURE_HASH_SHA256_MANAGED
return new System.Security.Cryptography.SHA256Managed();
#endif
}
}
#else
public static global::SshNet.Security.Cryptography.SHA256 CreateSHA256()
Expand All @@ -102,11 +119,18 @@ public static System.Security.Cryptography.SHA256 CreateSHA256()
#if FEATURE_HASH_SHA384_CREATE || FEATURE_HASH_SHA384_MANAGED
public static System.Security.Cryptography.SHA384 CreateSHA384()
{
if (SftpClient.UseFIPS)
{
return new System.Security.Cryptography.SHA384CryptoServiceProvider();
}
else
{
#if FEATURE_HASH_SHA384_CREATE
return System.Security.Cryptography.SHA384.Create();
return System.Security.Cryptography.SHA384.Create();
#elif FEATURE_HASH_SHA384_MANAGED
return new System.Security.Cryptography.SHA384Managed();
#endif
}
}
#else
public static global::SshNet.Security.Cryptography.SHA384 CreateSHA384()
Expand All @@ -118,11 +142,18 @@ public static System.Security.Cryptography.SHA384 CreateSHA384()
#if FEATURE_HASH_SHA512_CREATE || FEATURE_HASH_SHA512_MANAGED
public static System.Security.Cryptography.SHA512 CreateSHA512()
{
if (SftpClient.UseFIPS)
{
return new System.Security.Cryptography.SHA512CryptoServiceProvider();
}
else
{
#if FEATURE_HASH_SHA512_CREATE
return System.Security.Cryptography.SHA512.Create();
return System.Security.Cryptography.SHA512.Create();
#elif FEATURE_HASH_SHA512_MANAGED
return new System.Security.Cryptography.SHA512Managed();
#endif
}
}
#else
public static global::SshNet.Security.Cryptography.SHA512 CreateSHA512()
Expand Down
9 changes: 8 additions & 1 deletion src/Renci.SshNet/BaseClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ public abstract class BaseClient : IDisposable
/// </summary>
private readonly bool _ownsConnectionInfo;



private static bool _useFips = false;
private readonly IServiceFactory _serviceFactory;
private readonly object _keepAliveLock = new object();
private TimeSpan _keepAliveInterval;
Expand All @@ -31,6 +34,11 @@ public abstract class BaseClient : IDisposable
/// </value>
internal ISession Session { get; private set; }

/// <summary>
/// Requests FIPS Compliance on the SFTP client
/// </summary>
public static bool UseFIPS { get { return _useFips; } set { _useFips = value; } }

/// <summary>
/// Gets the factory for creating new services.
/// </summary>
Expand Down Expand Up @@ -74,7 +82,6 @@ public bool IsConnected
get
{
CheckDisposed();

return IsSessionConnected();
}
}
Expand Down
73 changes: 69 additions & 4 deletions src/Renci.SshNet/ConnectionInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,9 @@ public ConnectionInfo(string host, int port, string username, ProxyTypes proxyTy
MaxSessions = 10;
Encoding = Encoding.UTF8;

KeyExchangeAlgorithms = new Dictionary<string, Type>
if (SftpClient.UseFIPS)
{
KeyExchangeAlgorithms = new Dictionary<string, Type>
{
{"curve25519-sha256", typeof(KeyExchangeECCurve25519)},
{"curve25519-sha256@libssh.org", typeof(KeyExchangeECCurve25519)},
Expand All @@ -338,7 +340,68 @@ public ConnectionInfo(string host, int port, string username, ProxyTypes proxyTy
{"diffie-hellman-group1-sha1", typeof (KeyExchangeDiffieHellmanGroup1Sha1)},
};

Encryptions = new Dictionary<string, CipherInfo>
Encryptions = new Dictionary<string, CipherInfo>
{
{"aes256-ctr", new CipherInfo(256, (key, iv) => new AesCipher(key, new CtrCipherMode(iv), null))},
{"3des-cbc", new CipherInfo(192, (key, iv) => new TripleDesCipher(key, new CbcCipherMode(iv), null))},
{"aes128-cbc", new CipherInfo(128, (key, iv) => new AesCipher(key, new CbcCipherMode(iv), null))},
{"aes192-cbc", new CipherInfo(192, (key, iv) => new AesCipher(key, new CbcCipherMode(iv), null))},
{"aes256-cbc", new CipherInfo(256, (key, iv) => new AesCipher(key, new CbcCipherMode(iv), null))},
{"blowfish-cbc", new CipherInfo(128, (key, iv) => new BlowfishCipher(key, new CbcCipherMode(iv), null))},
{"twofish-cbc", new CipherInfo(256, (key, iv) => new TwofishCipher(key, new CbcCipherMode(iv), null))},
{"twofish192-cbc", new CipherInfo(192, (key, iv) => new TwofishCipher(key, new CbcCipherMode(iv), null))},
{"twofish128-cbc", new CipherInfo(128, (key, iv) => new TwofishCipher(key, new CbcCipherMode(iv), null))},
{"twofish256-cbc", new CipherInfo(256, (key, iv) => new TwofishCipher(key, new CbcCipherMode(iv), null))},
{"arcfour", new CipherInfo(128, (key, iv) => new Arc4Cipher(key, false))},
{"arcfour128", new CipherInfo(128, (key, iv) => new Arc4Cipher(key, true))},
{"arcfour256", new CipherInfo(256, (key, iv) => new Arc4Cipher(key, true))},
{"cast128-cbc", new CipherInfo(128, (key, iv) => new CastCipher(key, new CbcCipherMode(iv), null))},
{"aes128-ctr", new CipherInfo(128, (key, iv) => new AesCipher(key, new CtrCipherMode(iv), null))},
{"aes192-ctr", new CipherInfo(192, (key, iv) => new AesCipher(key, new CtrCipherMode(iv), null))},
};

HmacAlgorithms = new Dictionary<string, HashInfo>
{
{"hmac-sha1", new HashInfo(20*8, CryptoAbstraction.CreateHMACSHA1)},
{"hmac-sha1-96", new HashInfo(20*8, key => CryptoAbstraction.CreateHMACSHA1(key, 96))},
{"hmac-sha2-256", new HashInfo(32*8, CryptoAbstraction.CreateHMACSHA256)},
{"hmac-sha2-256-96", new HashInfo(32*8, key => CryptoAbstraction.CreateHMACSHA256(key, 96))},
{"hmac-sha2-512", new HashInfo(64 * 8, CryptoAbstraction.CreateHMACSHA512)},
{"hmac-sha2-512-96", new HashInfo(64 * 8, key => CryptoAbstraction.CreateHMACSHA512(key, 96))},
{"hmac-ripemd160", new HashInfo(160, CryptoAbstraction.CreateHMACRIPEMD160)},
{"hmac-ripemd160@openssh.com", new HashInfo(160, CryptoAbstraction.CreateHMACRIPEMD160)},
};

HostKeyAlgorithms = new Dictionary<string, Func<byte[], KeyHostAlgorithm>>
{
{"ssh-ed25519", data => new KeyHostAlgorithm("ssh-ed25519", new ED25519Key(), data)},
#if FEATURE_ECDSA
{"ecdsa-sha2-nistp256", data => new KeyHostAlgorithm("ecdsa-sha2-nistp256", new EcdsaKey(), data)},
{"ecdsa-sha2-nistp384", data => new KeyHostAlgorithm("ecdsa-sha2-nistp384", new EcdsaKey(), data)},
{"ecdsa-sha2-nistp521", data => new KeyHostAlgorithm("ecdsa-sha2-nistp521", new EcdsaKey(), data)},
#endif
{"ssh-rsa", data => new KeyHostAlgorithm("ssh-rsa", new RsaKey(), data)},
{"ssh-dss", data => new KeyHostAlgorithm("ssh-dss", new DsaKey(), data)},
};
}
else
{
KeyExchangeAlgorithms = new Dictionary<string, Type>
{
{"curve25519-sha256", typeof(KeyExchangeECCurve25519)},
{"curve25519-sha256@libssh.org", typeof(KeyExchangeECCurve25519)},
{"ecdh-sha2-nistp256", typeof(KeyExchangeECDH256)},
{"ecdh-sha2-nistp384", typeof(KeyExchangeECDH384)},
{"ecdh-sha2-nistp521", typeof(KeyExchangeECDH521)},
{"diffie-hellman-group-exchange-sha256", typeof (KeyExchangeDiffieHellmanGroupExchangeSha256)},
{"diffie-hellman-group-exchange-sha1", typeof (KeyExchangeDiffieHellmanGroupExchangeSha1)},
{"diffie-hellman-group16-sha512", typeof(KeyExchangeDiffieHellmanGroup16Sha512)},
{"diffie-hellman-group14-sha256", typeof (KeyExchangeDiffieHellmanGroup14Sha256)},
{"diffie-hellman-group14-sha1", typeof (KeyExchangeDiffieHellmanGroup14Sha1)},
{"diffie-hellman-group1-sha1", typeof (KeyExchangeDiffieHellmanGroup1Sha1)},
};

Encryptions = new Dictionary<string, CipherInfo>
{
{"aes256-ctr", new CipherInfo(256, (key, iv) => new AesCipher(key, new CtrCipherMode(iv), null))},
{"3des-cbc", new CipherInfo(192, (key, iv) => new TripleDesCipher(key, new CbcCipherMode(iv), null))},
Expand All @@ -363,7 +426,7 @@ public ConnectionInfo(string host, int port, string username, ProxyTypes proxyTy
{"aes192-ctr", new CipherInfo(192, (key, iv) => new AesCipher(key, new CtrCipherMode(iv), null))},
};

HmacAlgorithms = new Dictionary<string, HashInfo>
HmacAlgorithms = new Dictionary<string, HashInfo>
{
{"hmac-md5", new HashInfo(16*8, CryptoAbstraction.CreateHMACMD5)},
{"hmac-md5-96", new HashInfo(16*8, key => CryptoAbstraction.CreateHMACMD5(key, 96))},
Expand All @@ -379,7 +442,7 @@ public ConnectionInfo(string host, int port, string username, ProxyTypes proxyTy
//{"none", typeof(...)},
};

HostKeyAlgorithms = new Dictionary<string, Func<byte[], KeyHostAlgorithm>>
HostKeyAlgorithms = new Dictionary<string, Func<byte[], KeyHostAlgorithm>>
{
{"ssh-ed25519", data => new KeyHostAlgorithm("ssh-ed25519", new ED25519Key(), data)},
#if FEATURE_ECDSA
Expand All @@ -396,6 +459,8 @@ public ConnectionInfo(string host, int port, string username, ProxyTypes proxyTy
//{"pgp-sign-rsa", () => { ... },
//{"pgp-sign-dss", () => { ... },
};
}


CompressionAlgorithms = new Dictionary<string, Type>
{
Expand Down
2 changes: 1 addition & 1 deletion src/Renci.SshNet/Renci.SshNet.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<AssemblyOriginatorKeyFile>../Renci.SshNet.snk</AssemblyOriginatorKeyFile>
<LangVersion>5</LangVersion>
<SignAssembly>true</SignAssembly>
<TargetFrameworks>net35;net40;netstandard1.3;netstandard2.0</TargetFrameworks>
<TargetFrameworks>net35;net40;netstandard2.0</TargetFrameworks>
</PropertyGroup>

<!--
Expand Down