Skip to content
This repository was archived by the owner on Jan 26, 2026. It is now read-only.

Commit aabdd57

Browse files
SibrasSibras
committed
project: Update for 0.8.0 merge.
1 parent ad84455 commit aabdd57

4 files changed

Lines changed: 102 additions & 107 deletions

File tree

‎SMP/config.h‎

Lines changed: 53 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
/* Define to 1 if you have the <aprpa/inet.h> header file. */
88
/* #undef HAVE_ARPA_INET_H */
99

10-
/* Define to 1 if you have the <byteswap.h> header file. */
11-
/* #undef HAVE_BYTESWAP_H */
10+
/* Define to 1 if you have the <glob.h> header file. */
11+
/* #undef HAVE_GLOB_H */
1212

1313
/* Define to 1 if you have the <pty.h> header file. */
1414
/* #undef HAVE_PTY_H */
@@ -25,11 +25,20 @@
2525
/* Define to 1 if you have the <sys/time.h> header file. */
2626
/* #undef HAVE_SYS_TIME_H */
2727

28+
/* Define to 1 if you have the <sys/utime.h> header file. */
29+
/* #undef HAVE_SYS_UTIME_H */
30+
31+
/* Define to 1 if you have the <io.h> header file. */
32+
#define HAVE_IO_H 1
33+
2834
/* Define to 1 if you have the <termios.h> header file. */
2935
/* #undef HAVE_TERMIOS_H */
3036

3137
/* Define to 1 if you have the <unistd.h> header file. */
32-
#define HAVE_UNISTD_H 1
38+
/* #undef HAVE_UNISTD_H */
39+
40+
/* Define to 1 if you have the <stdint.h> header file. */
41+
#define HAVE_STDINT_H 1
3342

3443
/* Define to 1 if you have the <openssl/aes.h> header file. */
3544
/* #undef HAVE_OPENSSL_AES_H */
@@ -62,10 +71,28 @@
6271
#define HAVE_GCRYPT_ECC 1
6372

6473
/* Define to 1 if you have eliptic curve cryptography */
65-
/* #undef HAVE_ECC */
74+
#define HAVE_ECC 1
75+
76+
/* Define to 1 if you have DSA */
77+
#define HAVE_DSA 1
6678

6779
/*************************** FUNCTIONS ***************************/
6880

81+
/* Define to 1 if you have the `EVP_aes128_ctr' function. */
82+
/* #undef HAVE_OPENSSL_EVP_AES_CTR */
83+
84+
/* Define to 1 if you have the `EVP_aes128_cbc' function. */
85+
/* #undef HAVE_OPENSSL_EVP_AES_CBC */
86+
87+
/* Define to 1 if you have the `CRYPTO_THREADID_set_callback' function. */
88+
/* #undef HAVE_OPENSSL_CRYPTO_THREADID_SET_CALLBACK */
89+
90+
/* Define to 1 if you have the `CRYPTO_ctr128_encrypt' function. */
91+
/* #undef HAVE_OPENSSL_CRYPTO_CTR128_ENCRYPT */
92+
93+
/* Define to 1 if you have the `EVP_CIPHER_CTX_new' function. */
94+
/* #undef HAVE_OPENSSL_EVP_CIPHER_CTX_NEW */
95+
6996
/* Define to 1 if you have the `snprintf' function. */
7097
/* #undef HAVE_SNPRINTF */
7198

@@ -124,6 +151,18 @@
124151
/* Define to 1 if you have the `_strtoui64' function. */
125152
#define HAVE__STRTOUI64 1
126153

154+
/* Define to 1 if you have the `glob' function. */
155+
/* #undef HAVE_GLOB */
156+
157+
/* Define to 1 if you have the `explicit_bzero' function. */
158+
/* #undef HAVE_EXPLICIT_BZERO */
159+
160+
/* Define to 1 if you have the `memset_s' function. */
161+
/* #undef HAVE_MEMSET_S */
162+
163+
/* Define to 1 if you have the `SecureZeroMemory' function. */
164+
#define HAVE_SECURE_ZERO_MEMORY 1
165+
127166
/*************************** LIBRARIES ***************************/
128167

129168
/* Define to 1 if you have the `crypto' library (-lcrypto). */
@@ -132,6 +171,9 @@
132171
/* Define to 1 if you have the `gcrypt' library (-lgcrypt). */
133172
#define HAVE_LIBGCRYPT 1
134173

174+
/* Define to 1 if you have the 'mbedTLS' library (-lmbedtls). */
175+
/* #undef HAVE_LIBMBEDCRYPTO */
176+
135177
/* Define to 1 if you have the `pthread' library (-lpthread). */
136178
/* #undef HAVE_PTHREAD */
137179

@@ -140,12 +182,16 @@
140182
/* #undef HAVE_GCC_THREAD_LOCAL_STORAGE */
141183
#define HAVE_MSC_THREAD_LOCAL_STORAGE 1
142184

185+
/* #undef HAVE_FALLTHROUGH_ATTRIBUTE */
186+
143187
/* #undef HAVE_GCC_VOLATILE_MEMORY_PROTECTION */
144188
#define HAVE_GCC_NARG_MACRO 1
145189

146190
/* #undef HAVE_COMPILER__FUNC__ */
147191
#define HAVE_COMPILER__FUNCTION__ 1
148192

193+
/* #undef HAVE_GCC_BOUNDED_ATTRIBUTE */
194+
149195
/* Define to 1 if you want to enable GSSAPI */
150196
/* #undef WITH_GSSAPI */
151197

@@ -155,15 +201,15 @@
155201
/* Define to 1 if you want to enable SFTP */
156202
#define WITH_SFTP 1
157203

158-
/* Define to 1 if you want to enable SSH1 */
159-
#define WITH_SSH1 1
160-
161204
/* Define to 1 if you want to enable server support */
162205
#define WITH_SERVER 1
163206

164207
/* Define to 1 if you want to enable debug output for crypto functions */
165208
/* #undef DEBUG_CRYPTO */
166209

210+
/* Define to 1 if you want to enable debug output for packet functions */
211+
/* #undef DEBUG_PACKET */
212+
167213
/* Define to 1 if you want to enable pcap output support (experimental) */
168214
#define WITH_PCAP 1
169215

‎SMP/libssh.vcxproj‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -61,46 +61,46 @@
6161
<ItemGroup>
6262
<ClCompile Include="..\src\agent.c" />
6363
<ClCompile Include="..\src\auth.c" />
64-
<ClCompile Include="..\src\auth1.c" />
6564
<ClCompile Include="..\src\base64.c" />
6665
<ClCompile Include="..\src\bignum.c" />
6766
<ClCompile Include="..\src\bind.c" />
6867
<ClCompile Include="..\src\buffer.c" />
6968
<ClCompile Include="..\src\callbacks.c" />
69+
<ClCompile Include="..\src\chachapoly.c" />
7070
<ClCompile Include="..\src\channels.c" />
71-
<ClCompile Include="..\src\channels1.c" />
7271
<ClCompile Include="..\src\client.c" />
7372
<ClCompile Include="..\src\config.c" />
7473
<ClCompile Include="..\src\connect.c" />
75-
<ClCompile Include="..\src\crc32.c" />
74+
<ClCompile Include="..\src\connector.c" />
7675
<ClCompile Include="..\src\curve25519.c" />
7776
<ClCompile Include="..\src\dh.c" />
7877
<ClCompile Include="..\src\ecdh.c" />
78+
<ClCompile Include="..\src\ecdh_gcrypt.c" />
7979
<ClCompile Include="..\src\error.c" />
8080
<ClCompile Include="..\src\external\bcrypt_pbkdf.c" />
8181
<ClCompile Include="..\src\external\blowfish.c" />
82+
<ClCompile Include="..\src\external\chacha.c" />
8283
<ClCompile Include="..\src\external\curve25519_ref.c" />
8384
<ClCompile Include="..\src\external\ed25519.c" />
8485
<ClCompile Include="..\src\external\fe25519.c" />
8586
<ClCompile Include="..\src\external\ge25519.c" />
87+
<ClCompile Include="..\src\external\poly1305.c" />
8688
<ClCompile Include="..\src\external\sc25519.c" />
8789
<ClCompile Include="..\src\gcrypt_missing.c" />
8890
<ClCompile Include="..\src\getpass.c" />
8991
<ClCompile Include="..\src\gzip.c" />
9092
<ClCompile Include="..\src\init.c" />
9193
<ClCompile Include="..\src\kex.c" />
92-
<ClCompile Include="..\src\kex1.c" />
94+
<ClCompile Include="..\src\knownhosts.c" />
9395
<ClCompile Include="..\src\known_hosts.c" />
9496
<ClCompile Include="..\src\legacy.c" />
95-
<ClCompile Include="..\src\libcrypto.c" />
9697
<ClCompile Include="..\src\libgcrypt.c" />
9798
<ClCompile Include="..\src\log.c" />
9899
<ClCompile Include="..\src\match.c" />
99100
<ClCompile Include="..\src\messages.c" />
100101
<ClCompile Include="..\src\misc.c" />
101102
<ClCompile Include="..\src\options.c" />
102103
<ClCompile Include="..\src\packet.c" />
103-
<ClCompile Include="..\src\packet1.c" />
104104
<ClCompile Include="..\src\packet_cb.c" />
105105
<ClCompile Include="..\src\packet_crypt.c" />
106106
<ClCompile Include="..\src\pcap.c" />
@@ -117,6 +117,11 @@
117117
<ClCompile Include="..\src\socket.c" />
118118
<ClCompile Include="..\src\string.c" />
119119
<ClCompile Include="..\src\threads.c" />
120+
<ClCompile Include="..\src\threads\libgcrypt.c">
121+
<ObjectFileName>$(IntDir)\threads_%(Filename).obj</ObjectFileName>
122+
</ClCompile>
123+
<ClCompile Include="..\src\threads\noop.c" />
124+
<ClCompile Include="..\src\threads\winlocks.c" />
120125
<ClCompile Include="..\src\wrapper.c" />
121126
</ItemGroup>
122127
<ItemGroup>
@@ -127,6 +132,7 @@
127132
<ClInclude Include="..\include\libssh\blf.h" />
128133
<ClInclude Include="..\include\libssh\buffer.h" />
129134
<ClInclude Include="..\include\libssh\callbacks.h" />
135+
<ClInclude Include="..\include\libssh\chacha.h" />
130136
<ClInclude Include="..\include\libssh\channels.h" />
131137
<ClInclude Include="..\include\libssh\crc32.h" />
132138
<ClInclude Include="..\include\libssh\crypto.h" />
@@ -149,14 +155,14 @@
149155
<ClInclude Include="..\include\libssh\pki.h" />
150156
<ClInclude Include="..\include\libssh\pki_priv.h" />
151157
<ClInclude Include="..\include\libssh\poll.h" />
158+
<ClInclude Include="..\include\libssh\poly1305.h" />
152159
<ClInclude Include="..\include\libssh\priv.h" />
153160
<ClInclude Include="..\include\libssh\sc25519.h" />
154161
<ClInclude Include="..\include\libssh\scp.h" />
155162
<ClInclude Include="..\include\libssh\server.h" />
156163
<ClInclude Include="..\include\libssh\session.h" />
157164
<ClInclude Include="..\include\libssh\sftp.h" />
158165
<ClInclude Include="..\include\libssh\socket.h" />
159-
<ClInclude Include="..\include\libssh\ssh1.h" />
160166
<ClInclude Include="..\include\libssh\ssh2.h" />
161167
<ClInclude Include="..\include\libssh\string.h" />
162168
<ClInclude Include="..\include\libssh\threads.h" />

‎SMP/libssh.vcxproj.filters‎

Lines changed: 36 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@
1616
<Filter Include="Source Files\external">
1717
<UniqueIdentifier>{1ac7443e-89b4-4171-b791-b6dae493a625}</UniqueIdentifier>
1818
</Filter>
19+
<Filter Include="Source Files\threads">
20+
<UniqueIdentifier>{c96b86d0-62be-4a12-a8a6-e1dcdf853d65}</UniqueIdentifier>
21+
</Filter>
1922
</ItemGroup>
2023
<ItemGroup>
2124
<ClCompile Include="..\src\callbacks.c">
@@ -24,9 +27,6 @@
2427
<ClCompile Include="..\src\channels.c">
2528
<Filter>Source Files</Filter>
2629
</ClCompile>
27-
<ClCompile Include="..\src\channels1.c">
28-
<Filter>Source Files</Filter>
29-
</ClCompile>
3030
<ClCompile Include="..\src\client.c">
3131
<Filter>Source Files</Filter>
3232
</ClCompile>
@@ -36,9 +36,6 @@
3636
<ClCompile Include="..\src\connect.c">
3737
<Filter>Source Files</Filter>
3838
</ClCompile>
39-
<ClCompile Include="..\src\crc32.c">
40-
<Filter>Source Files</Filter>
41-
</ClCompile>
4239
<ClCompile Include="..\src\dh.c">
4340
<Filter>Source Files</Filter>
4441
</ClCompile>
@@ -81,9 +78,6 @@
8178
<ClCompile Include="..\src\packet.c">
8279
<Filter>Source Files</Filter>
8380
</ClCompile>
84-
<ClCompile Include="..\src\packet1.c">
85-
<Filter>Source Files</Filter>
86-
</ClCompile>
8781
<ClCompile Include="..\src\pcap.c">
8882
<Filter>Source Files</Filter>
8983
</ClCompile>
@@ -126,9 +120,6 @@
126120
<ClCompile Include="..\src\auth.c">
127121
<Filter>Source Files</Filter>
128122
</ClCompile>
129-
<ClCompile Include="..\src\auth1.c">
130-
<Filter>Source Files</Filter>
131-
</ClCompile>
132123
<ClCompile Include="..\src\base64.c">
133124
<Filter>Source Files</Filter>
134125
</ClCompile>
@@ -141,9 +132,6 @@
141132
<ClCompile Include="..\src\ecdh.c">
142133
<Filter>Source Files</Filter>
143134
</ClCompile>
144-
<ClCompile Include="..\src\kex1.c">
145-
<Filter>Source Files</Filter>
146-
</ClCompile>
147135
<ClCompile Include="..\src\curve25519.c">
148136
<Filter>Source Files</Filter>
149137
</ClCompile>
@@ -162,9 +150,6 @@
162150
<ClCompile Include="..\src\gcrypt_missing.c">
163151
<Filter>Source Files</Filter>
164152
</ClCompile>
165-
<ClCompile Include="..\src\libcrypto.c">
166-
<Filter>Source Files</Filter>
167-
</ClCompile>
168153
<ClCompile Include="..\src\bignum.c">
169154
<Filter>Source Files</Filter>
170155
</ClCompile>
@@ -195,6 +180,33 @@
195180
<ClCompile Include="..\src\external\fe25519.c">
196181
<Filter>Source Files\external</Filter>
197182
</ClCompile>
183+
<ClCompile Include="..\src\connector.c">
184+
<Filter>Source Files</Filter>
185+
</ClCompile>
186+
<ClCompile Include="..\src\knownhosts.c">
187+
<Filter>Source Files</Filter>
188+
</ClCompile>
189+
<ClCompile Include="..\src\external\chacha.c">
190+
<Filter>Source Files\external</Filter>
191+
</ClCompile>
192+
<ClCompile Include="..\src\external\poly1305.c">
193+
<Filter>Source Files\external</Filter>
194+
</ClCompile>
195+
<ClCompile Include="..\src\chachapoly.c">
196+
<Filter>Source Files</Filter>
197+
</ClCompile>
198+
<ClCompile Include="..\src\ecdh_gcrypt.c">
199+
<Filter>Source Files</Filter>
200+
</ClCompile>
201+
<ClCompile Include="..\src\threads\noop.c">
202+
<Filter>Source Files\threads</Filter>
203+
</ClCompile>
204+
<ClCompile Include="..\src\threads\winlocks.c">
205+
<Filter>Source Files\threads</Filter>
206+
</ClCompile>
207+
<ClCompile Include="..\src\threads\libgcrypt.c">
208+
<Filter>Source Files\external</Filter>
209+
</ClCompile>
198210
</ItemGroup>
199211
<ItemGroup>
200212
<ClInclude Include="..\include\libssh\agent.h">
@@ -287,9 +299,6 @@
287299
<ClInclude Include="..\include\libssh\socket.h">
288300
<Filter>Header Files\libssh</Filter>
289301
</ClInclude>
290-
<ClInclude Include="..\include\libssh\ssh1.h">
291-
<Filter>Header Files\libssh</Filter>
292-
</ClInclude>
293302
<ClInclude Include="..\include\libssh\ssh2.h">
294303
<Filter>Header Files\libssh</Filter>
295304
</ClInclude>
@@ -323,5 +332,11 @@
323332
<ClInclude Include="..\include\libssh\blf.h">
324333
<Filter>Header Files\libssh</Filter>
325334
</ClInclude>
335+
<ClInclude Include="..\include\libssh\chacha.h">
336+
<Filter>Header Files\libssh</Filter>
337+
</ClInclude>
338+
<ClInclude Include="..\include\libssh\poly1305.h">
339+
<Filter>Header Files\libssh</Filter>
340+
</ClInclude>
326341
</ItemGroup>
327342
</Project>

0 commit comments

Comments
 (0)