Skip to content

Commit c5cb1ca

Browse files
driesengdrieseng
committed
Merge branch 'develop' of https://github.com/sshnet/SSH.NET into develop
2 parents 4906b64 + e449130 commit c5cb1ca

File tree

6 files changed

+97
-11
lines changed

6 files changed

+97
-11
lines changed

‎src/Renci.SshNet.Silverlight/Renci.SshNet.Silverlight.csproj

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1121,6 +1121,12 @@
11211121
<Compile Include="..\Renci.SshNet\Security\KeyExchangeDiffieHellmanGroup14Sha1.cs">
11221122
<Link>Security\KeyExchangeDiffieHellmanGroup14Sha1.cs</Link>
11231123
</Compile>
1124+
<Compile Include="..\Renci.SshNet\Security\KeyExchangeDiffieHellmanGroup14Sha256.cs">
1125+
<Link>Security\KeyExchangeDiffieHellmanGroup14Sha256.cs</Link>
1126+
</Compile>
1127+
<Compile Include="..\Renci.SshNet\Security\KeyExchangeDiffieHellmanGroup16Sha512.cs">
1128+
<Link>Security\KeyExchangeDiffieHellmanGroup16Sha512.cs</Link>
1129+
</Compile>
11241130
<Compile Include="..\Renci.SshNet\Security\KeyExchangeDiffieHellmanGroup1Sha1.cs">
11251131
<Link>Security\KeyExchangeDiffieHellmanGroup1Sha1.cs</Link>
11261132
</Compile>
@@ -1136,6 +1142,15 @@
11361142
<Compile Include="..\Renci.SshNet\Security\KeyExchangeDiffieHellmanGroupSha1.cs">
11371143
<Link>Security\KeyExchangeDiffieHellmanGroupSha1.cs</Link>
11381144
</Compile>
1145+
<Compile Include="..\Renci.SshNet\Security\KeyExchangeDiffieHellmanGroupSha256.cs">
1146+
<Link>Security\KeyExchangeDiffieHellmanGroupSha256.cs</Link>
1147+
</Compile>
1148+
<Compile Include="..\Renci.SshNet\Security\KeyExchangeDiffieHellmanGroupSha512.cs">
1149+
<Link>Security\KeyExchangeDiffieHellmanGroupSha512.cs</Link>
1150+
</Compile>
1151+
<Compile Include="..\Renci.SshNet\Security\KeyExchangeDiffieHellmanGroupShaBase.cs">
1152+
<Link>Security\KeyExchangeDiffieHellmanGroupShaBase.cs</Link>
1153+
</Compile>
11391154
<Compile Include="..\Renci.SshNet\Security\KeyExchangeEC.cs">
11401155
<Link>Security\KeyExchangeEC.cs</Link>
11411156
</Compile>
@@ -1154,6 +1169,9 @@
11541169
<Compile Include="..\Renci.SshNet\Security\KeyExchangeECDH521.cs">
11551170
<Link>Security\KeyExchangeECDH521.cs</Link>
11561171
</Compile>
1172+
<Compile Include="..\Renci.SshNet\Security\KeyExchangeHash.cs">
1173+
<Link>Security\KeyExchangeHash.cs</Link>
1174+
</Compile>
11571175
<Compile Include="..\Renci.SshNet\Security\KeyHostAlgorithm.cs">
11581176
<Link>Security\KeyHostAlgorithm.cs</Link>
11591177
</Compile>

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

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1127,6 +1127,12 @@
11271127
<Compile Include="..\Renci.SshNet\Security\KeyExchangeDiffieHellmanGroup14Sha1.cs">
11281128
<Link>Security\KeyExchangeDiffieHellmanGroup14Sha1.cs</Link>
11291129
</Compile>
1130+
<Compile Include="..\Renci.SshNet\Security\KeyExchangeDiffieHellmanGroup14Sha256.cs">
1131+
<Link>Security\KeyExchangeDiffieHellmanGroup14Sha256.cs</Link>
1132+
</Compile>
1133+
<Compile Include="..\Renci.SshNet\Security\KeyExchangeDiffieHellmanGroup16Sha512.cs">
1134+
<Link>Security\KeyExchangeDiffieHellmanGroup16Sha512.cs</Link>
1135+
</Compile>
11301136
<Compile Include="..\Renci.SshNet\Security\KeyExchangeDiffieHellmanGroup1Sha1.cs">
11311137
<Link>Security\KeyExchangeDiffieHellmanGroup1Sha1.cs</Link>
11321138
</Compile>
@@ -1142,6 +1148,15 @@
11421148
<Compile Include="..\Renci.SshNet\Security\KeyExchangeDiffieHellmanGroupSha1.cs">
11431149
<Link>Security\KeyExchangeDiffieHellmanGroupSha1.cs</Link>
11441150
</Compile>
1151+
<Compile Include="..\Renci.SshNet\Security\KeyExchangeDiffieHellmanGroupSha256.cs">
1152+
<Link>Security\KeyExchangeDiffieHellmanGroupSha256.cs</Link>
1153+
</Compile>
1154+
<Compile Include="..\Renci.SshNet\Security\KeyExchangeDiffieHellmanGroupSha512.cs">
1155+
<Link>Security\KeyExchangeDiffieHellmanGroupSha512.cs</Link>
1156+
</Compile>
1157+
<Compile Include="..\Renci.SshNet\Security\KeyExchangeDiffieHellmanGroupShaBase.cs">
1158+
<Link>Security\KeyExchangeDiffieHellmanGroupShaBase.cs</Link>
1159+
</Compile>
11451160
<Compile Include="..\Renci.SshNet\Security\KeyExchangeEC.cs">
11461161
<Link>Security\KeyExchangeEC.cs</Link>
11471162
</Compile>
@@ -1160,6 +1175,9 @@
11601175
<Compile Include="..\Renci.SshNet\Security\KeyExchangeECDH521.cs">
11611176
<Link>Security\KeyExchangeECDH521.cs</Link>
11621177
</Compile>
1178+
<Compile Include="..\Renci.SshNet\Security\KeyExchangeHash.cs">
1179+
<Link>Security\KeyExchangeHash.cs</Link>
1180+
</Compile>
11631181
<Compile Include="..\Renci.SshNet\Security\KeyHostAlgorithm.cs">
11641182
<Link>Security\KeyHostAlgorithm.cs</Link>
11651183
</Compile>
@@ -1390,7 +1408,7 @@
13901408
<FlavorProperties GUID="{A1591282-1198-4647-A2B1-27E5FF5F6F3B}">
13911409
<SilverlightProjectProperties />
13921410
</FlavorProperties>
1393-
<UserProperties ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" ProjectLinkReference="2f5f8c90-0bd1-424f-997c-7bc6280919d1" />
1411+
<UserProperties ProjectLinkReference="2f5f8c90-0bd1-424f-997c-7bc6280919d1" ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" />
13941412
</VisualStudio>
13951413
</ProjectExtensions>
13961414
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.

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

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -867,9 +867,6 @@
867867
<Compile Include="..\Renci.SshNet\Security\BouncyCastle\util\encoders\HexEncoder.cs">
868868
<Link>Security\Cryptography\BouncyCastle\util\encoders\HexEncoder.cs</Link>
869869
</Compile>
870-
<Compile Include="..\Renci.SshNet\Security\BouncyCastle\util\Enums.cs">
871-
<Link>Security\Cryptography\BouncyCastle\util\Enums.cs</Link>
872-
</Compile>
873870
<Compile Include="..\Renci.SshNet\Security\BouncyCastle\util\IMemoable.cs">
874871
<Link>Security\Cryptography\BouncyCastle\util\IMemoable.cs</Link>
875872
</Compile>
@@ -1203,6 +1200,12 @@
12031200
<Compile Include="..\Renci.SshNet\Security\KeyExchangeDiffieHellmanGroup14Sha1.cs">
12041201
<Link>Security\KeyExchangeDiffieHellmanGroup14Sha1.cs</Link>
12051202
</Compile>
1203+
<Compile Include="..\Renci.SshNet\Security\KeyExchangeDiffieHellmanGroup14Sha256.cs">
1204+
<Link>Security\KeyExchangeDiffieHellmanGroup14Sha256.cs</Link>
1205+
</Compile>
1206+
<Compile Include="..\Renci.SshNet\Security\KeyExchangeDiffieHellmanGroup16Sha512.cs">
1207+
<Link>Security\KeyExchangeDiffieHellmanGroup16Sha512.cs</Link>
1208+
</Compile>
12061209
<Compile Include="..\Renci.SshNet\Security\KeyExchangeDiffieHellmanGroup1Sha1.cs">
12071210
<Link>Security\KeyExchangeDiffieHellmanGroup1Sha1.cs</Link>
12081211
</Compile>
@@ -1218,6 +1221,15 @@
12181221
<Compile Include="..\Renci.SshNet\Security\KeyExchangeDiffieHellmanGroupSha1.cs">
12191222
<Link>Security\KeyExchangeDiffieHellmanGroupSha1.cs</Link>
12201223
</Compile>
1224+
<Compile Include="..\Renci.SshNet\Security\KeyExchangeDiffieHellmanGroupSha256.cs">
1225+
<Link>Security\KeyExchangeDiffieHellmanGroupSha256.cs</Link>
1226+
</Compile>
1227+
<Compile Include="..\Renci.SshNet\Security\KeyExchangeDiffieHellmanGroupSha512.cs">
1228+
<Link>Security\KeyExchangeDiffieHellmanGroupSha512.cs</Link>
1229+
</Compile>
1230+
<Compile Include="..\Renci.SshNet\Security\KeyExchangeDiffieHellmanGroupShaBase.cs">
1231+
<Link>Security\KeyExchangeDiffieHellmanGroupShaBase.cs</Link>
1232+
</Compile>
12211233
<Compile Include="..\Renci.SshNet\Security\KeyExchangeEC.cs">
12221234
<Link>Security\KeyExchangeEC.cs</Link>
12231235
</Compile>
@@ -1236,6 +1248,9 @@
12361248
<Compile Include="..\Renci.SshNet\Security\KeyExchangeECDH521.cs">
12371249
<Link>Security\KeyExchangeECDH521.cs</Link>
12381250
</Compile>
1251+
<Compile Include="..\Renci.SshNet\Security\KeyExchangeHash.cs">
1252+
<Link>Security\KeyExchangeHash.cs</Link>
1253+
</Compile>
12391254
<Compile Include="..\Renci.SshNet\Security\KeyHostAlgorithm.cs">
12401255
<Link>Security\KeyHostAlgorithm.cs</Link>
12411256
</Compile>

‎src/Renci.SshNet.WindowsPhone/Renci.SshNet.WindowsPhone.csproj

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1106,6 +1106,12 @@
11061106
<Compile Include="..\Renci.SshNet\Security\KeyExchangeDiffieHellmanGroup14Sha1.cs">
11071107
<Link>Security\KeyExchangeDiffieHellmanGroup14Sha1.cs</Link>
11081108
</Compile>
1109+
<Compile Include="..\Renci.SshNet\Security\KeyExchangeDiffieHellmanGroup14Sha256.cs">
1110+
<Link>Security\KeyExchangeDiffieHellmanGroup14Sha256.cs</Link>
1111+
</Compile>
1112+
<Compile Include="..\Renci.SshNet\Security\KeyExchangeDiffieHellmanGroup16Sha512.cs">
1113+
<Link>Security\KeyExchangeDiffieHellmanGroup16Sha512.cs</Link>
1114+
</Compile>
11091115
<Compile Include="..\Renci.SshNet\Security\KeyExchangeDiffieHellmanGroup1Sha1.cs">
11101116
<Link>Security\KeyExchangeDiffieHellmanGroup1Sha1.cs</Link>
11111117
</Compile>
@@ -1121,6 +1127,15 @@
11211127
<Compile Include="..\Renci.SshNet\Security\KeyExchangeDiffieHellmanGroupSha1.cs">
11221128
<Link>Security\KeyExchangeDiffieHellmanGroupSha1.cs</Link>
11231129
</Compile>
1130+
<Compile Include="..\Renci.SshNet\Security\KeyExchangeDiffieHellmanGroupSha256.cs">
1131+
<Link>Security\KeyExchangeDiffieHellmanGroupSha256.cs</Link>
1132+
</Compile>
1133+
<Compile Include="..\Renci.SshNet\Security\KeyExchangeDiffieHellmanGroupSha512.cs">
1134+
<Link>Security\KeyExchangeDiffieHellmanGroupSha512.cs</Link>
1135+
</Compile>
1136+
<Compile Include="..\Renci.SshNet\Security\KeyExchangeDiffieHellmanGroupShaBase.cs">
1137+
<Link>Security\KeyExchangeDiffieHellmanGroupShaBase.cs</Link>
1138+
</Compile>
11241139
<Compile Include="..\Renci.SshNet\Security\KeyExchangeEC.cs">
11251140
<Link>Security\KeyExchangeEC.cs</Link>
11261141
</Compile>
@@ -1139,6 +1154,9 @@
11391154
<Compile Include="..\Renci.SshNet\Security\KeyExchangeECDH521.cs">
11401155
<Link>Security\KeyExchangeECDH521.cs</Link>
11411156
</Compile>
1157+
<Compile Include="..\Renci.SshNet\Security\KeyExchangeHash.cs">
1158+
<Link>Security\KeyExchangeHash.cs</Link>
1159+
</Compile>
11421160
<Compile Include="..\Renci.SshNet\Security\KeyHostAlgorithm.cs">
11431161
<Link>Security\KeyHostAlgorithm.cs</Link>
11441162
</Compile>

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

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1159,6 +1159,12 @@
11591159
<Compile Include="..\Renci.SshNet\Security\KeyExchangeDiffieHellmanGroup14Sha1.cs">
11601160
<Link>Security\KeyExchangeDiffieHellmanGroup14Sha1.cs</Link>
11611161
</Compile>
1162+
<Compile Include="..\Renci.SshNet\Security\KeyExchangeDiffieHellmanGroup14Sha256.cs">
1163+
<Link>Security\KeyExchangeDiffieHellmanGroup14Sha256.cs</Link>
1164+
</Compile>
1165+
<Compile Include="..\Renci.SshNet\Security\KeyExchangeDiffieHellmanGroup16Sha512.cs">
1166+
<Link>Security\KeyExchangeDiffieHellmanGroup16Sha512.cs</Link>
1167+
</Compile>
11621168
<Compile Include="..\Renci.SshNet\Security\KeyExchangeDiffieHellmanGroup1Sha1.cs">
11631169
<Link>Security\KeyExchangeDiffieHellmanGroup1Sha1.cs</Link>
11641170
</Compile>
@@ -1174,6 +1180,15 @@
11741180
<Compile Include="..\Renci.SshNet\Security\KeyExchangeDiffieHellmanGroupSha1.cs">
11751181
<Link>Security\KeyExchangeDiffieHellmanGroupSha1.cs</Link>
11761182
</Compile>
1183+
<Compile Include="..\Renci.SshNet\Security\KeyExchangeDiffieHellmanGroupSha256.cs">
1184+
<Link>Security\KeyExchangeDiffieHellmanGroupSha256.cs</Link>
1185+
</Compile>
1186+
<Compile Include="..\Renci.SshNet\Security\KeyExchangeDiffieHellmanGroupSha512.cs">
1187+
<Link>Security\KeyExchangeDiffieHellmanGroupSha512.cs</Link>
1188+
</Compile>
1189+
<Compile Include="..\Renci.SshNet\Security\KeyExchangeDiffieHellmanGroupShaBase.cs">
1190+
<Link>Security\KeyExchangeDiffieHellmanGroupShaBase.cs</Link>
1191+
</Compile>
11771192
<Compile Include="..\Renci.SshNet\Security\KeyExchangeEC.cs">
11781193
<Link>Security\KeyExchangeEC.cs</Link>
11791194
</Compile>
@@ -1192,6 +1207,9 @@
11921207
<Compile Include="..\Renci.SshNet\Security\KeyExchangeECDH521.cs">
11931208
<Link>Security\KeyExchangeECDH521.cs</Link>
11941209
</Compile>
1210+
<Compile Include="..\Renci.SshNet\Security\KeyExchangeHash.cs">
1211+
<Link>Security\KeyExchangeHash.cs</Link>
1212+
</Compile>
11951213
<Compile Include="..\Renci.SshNet\Security\KeyHostAlgorithm.cs">
11961214
<Link>Security\KeyHostAlgorithm.cs</Link>
11971215
</Compile>
@@ -1423,7 +1441,7 @@
14231441
<Import Project="$(MSBuildExtensionsPath)\Microsoft\$(TargetFrameworkIdentifier)\$(TargetFrameworkVersion)\Microsoft.$(TargetFrameworkIdentifier).CSharp.targets" />
14241442
<ProjectExtensions>
14251443
<VisualStudio>
1426-
<UserProperties ProjectLinkReference="2f5f8c90-0bd1-424f-997c-7bc6280919d1" ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" />
1444+
<UserProperties ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" ProjectLinkReference="2f5f8c90-0bd1-424f-997c-7bc6280919d1" />
14271445
</VisualStudio>
14281446
</ProjectExtensions>
14291447
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.

‎src/Renci.SshNet/Session.cs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1937,17 +1937,18 @@ private void MessageListener()
19371937
break;
19381938
}
19391939

1940+
#if FEATURE_SOCKET_POLL || FEATURE_SOCKET_SELECT
19401941
try
19411942
{
1942-
#if FEATURE_SOCKET_POLL
1943+
#if FEATURE_SOCKET_POLL
19431944
// Block until either data is available or the socket is closed
19441945
var connectionClosedOrDataAvailable = socket.Poll(-1, SelectMode.SelectRead);
19451946
if (connectionClosedOrDataAvailable && socket.Available == 0)
19461947
{
19471948
// connection with SSH server was closed or connection was reset
19481949
break;
19491950
}
1950-
#elif FEATURE_SOCKET_SELECT
1951+
#elif FEATURE_SOCKET_SELECT
19511952
var readSockets = new List<Socket> { socket };
19521953

19531954
// if the socket is already disposed when Select is invoked, then a SocketException
@@ -1983,10 +1984,7 @@ private void MessageListener()
19831984
// break out of the message loop
19841985
break;
19851986
}
1986-
#else
1987-
#error Blocking wait on either socket data to become available or connection to be
1988-
#error closed is not implemented.
1989-
#endif // FEATURE_SOCKET_SELECT
1987+
#endif // FEATURE_SOCKET_SELECT
19901988
}
19911989
catch (ObjectDisposedException)
19921990
{
@@ -1996,6 +1994,7 @@ private void MessageListener()
19961994
// * a SSH_MSG_DISCONNECT received from server
19971995
break;
19981996
}
1997+
#endif // FEATURE_SOCKET_POLL || FEATURE_SOCKET_SELECT
19991998

20001999
var message = ReceiveMessage(socket);
20012000
if (message == null)

0 commit comments

Comments
 (0)