• R/O
  • SSH
  • HTTPS

ttssh2: Commit


Commit MetaInfo

Revision9266 (tree)
Time2021-05-20 23:56:29
Authorzmatsuo

Log Message

cmakeビルドできるよう修正 (PPK3対応)

- PPK3 = PuTTY private key format version 3
- r9258 を cmake でビルドできるよう調整

Change Summary

Incremental Difference

--- trunk/ttssh2/CMakeLists.txt (revision 9265)
+++ trunk/ttssh2/CMakeLists.txt (revision 9266)
@@ -14,3 +14,6 @@
1414 add_subdirectory(putty)
1515 set_target_properties(libputty PROPERTIES FOLDER ttssh2)
1616
17+add_subdirectory(argon2)
18+set_target_properties(argon2 PROPERTIES FOLDER ttssh2)
19+
--- trunk/ttssh2/argon2/CMakeLists.txt (nonexistent)
+++ trunk/ttssh2/argon2/CMakeLists.txt (revision 9266)
@@ -0,0 +1,50 @@
1+set(PACKAGE_NAME "argon2")
2+
3+project(${PACKAGE_NAME})
4+
5+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/")
6+
7+add_library(
8+ ${PACKAGE_NAME}
9+ argon2.h
10+ ../../libs/argon2/src/argon2.c
11+ ../../libs/argon2/src/blake2/blake2-impl.h
12+ ../../libs/argon2/src/blake2/blake2.h
13+ ../../libs/argon2/src/blake2/blake2b.c
14+ ../../libs/argon2/src/blake2/blamka-round-opt.h
15+ ../../libs/argon2/src/blake2/blamka-round-ref.h
16+ ../../libs/argon2/src/core.c
17+ ../../libs/argon2/src/core.h
18+ ../../libs/argon2/src/encoding.c
19+ ../../libs/argon2/src/encoding.h
20+ ../../libs/argon2/src/ref.c
21+ ../../libs/argon2/src/thread.c
22+ ../../libs/argon2/src/thread.h
23+ )
24+
25+if(${CMAKE_GENERATOR} MATCHES "Visual Studio 8 2005")
26+ target_sources(
27+ ${PACKAGE_NAME}
28+ PRIVATE
29+ compat/stdint.h
30+ )
31+ target_include_directories(
32+ ${PACKAGE_NAME}
33+ PUBLIC
34+ ${CMAKE_CURRENT_LIST_DIR}/compat
35+ )
36+endif()
37+
38+source_group(
39+ "libs_argon2"
40+ REGULAR_EXPRESSION
41+ "libs/argon2/")
42+
43+target_include_directories(
44+ ${PACKAGE_NAME}
45+ PUBLIC
46+ ${CMAKE_CURRENT_LIST_DIR}/
47+ PRIVATE
48+ ${CMAKE_CURRENT_LIST_DIR}/../../libs/argon2/src
49+ )
50+
--- trunk/ttssh2/ttxssh/CMakeLists.txt (revision 9265)
+++ trunk/ttssh2/ttxssh/CMakeLists.txt (revision 9266)
@@ -69,6 +69,8 @@
6969 key.h
7070 keyfiles.c
7171 keyfiles.h
72+ keyfiles-putty.c
73+ keyfiles-putty.h
7274 mac.c
7375 mac.h
7476 pkt.c
@@ -179,6 +181,7 @@
179181 common_static
180182 libputty
181183 ttpcmn
184+ argon2
182185 ${ZLIB_LIB}
183186 ${OPENSSL_LIB}
184187 #
Show on old repository browser