分离libssh2

Author: sshterm

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2024 sshterm
+Copyright (c) 2024 ssh2.app
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -6,12 +6,14 @@ SSH Term APP [ssh2.app](https://ssh2.app/) 的 SSH2连接核心
 # 使用 OpenSSL 版
 
 ```
+pod 'CSSH/OpenSSL', :git => 'https://github.com/sshterm/cssh.git'
 pod 'SSH/OpenSSL', :git => 'https://github.com/sshterm/ssh.git'
 ```
 
 # 使用 wolfSSL 版
 
 ```
+pod 'CSSH/wolfSSL', :git => 'https://github.com/sshterm/cssh.git'
 pod 'SSH/wolfSSL', :git => 'https://github.com/sshterm/ssh.git'
 ```
 

SSH.podspec

@@ -12,15 +12,15 @@ Pod::Spec.new do |s|
   s.osx.deployment_target = '13.0'
   s.default_subspecs = :none
   s.subspec 'OpenSSL' do |cs|
-    cs.source_files = 'src/**/*.{swift,c,h}'
-    cs.pod_target_xcconfig = { 'OTHER_SWIFT_FLAGS' => '$(inherited) -DOPEN_SSL -DV010b01' }
-    cs.vendored_frameworks = ["xcframework/CSSH-OpenSSL.xcframework"]
+    cs.dependency 'CSSH'
+    cs.source_files = 'src/**/*.{swift}'
+    cs.pod_target_xcconfig = { 'OTHER_SWIFT_FLAGS' => '-DOPEN_SSL -DV010b01' }
     cs.libraries = 'z'
   end
   s.subspec 'wolfSSL' do |cs|
+    cs.dependency 'CSSH'
     cs.source_files = 'src/**/*.{swift}'
-    cs.pod_target_xcconfig = { 'OTHER_SWIFT_FLAGS' => '$(inherited) -DWOLF_SSL' }
-    cs.vendored_frameworks = ["xcframework/CSSH-wolfSSL.xcframework"]
+    cs.pod_target_xcconfig = { 'OTHER_SWIFT_FLAGS' => '-DWOLF_SSL -DV010b01' }
     cs.libraries = 'z'
   end
 end

src/Crypto/Algorithm.swift

@@ -2,7 +2,11 @@
 // Copyright (c) 2024 ssh2.app
 // Created by [email protected] 2024/8/19.
 
-import CSSH
+#if OPEN_SSL
+    import OpenSSL
+#else
+    import wolfSSL
+#endif
 import Foundation
 
 public enum ShaAlgorithm: String, CaseIterable {

src/Crypto/Crypto.swift

@@ -2,7 +2,11 @@
 // Copyright (c) 2024 ssh2.app
 // Created by [email protected] 2024/8/18.
 
-import CSSH
+#if OPEN_SSL
+    import OpenSSL
+#else
+    import wolfSSL
+#endif
 import Foundation
 
 /// Crypto类提供了一个单例实例，用于表示当前使用的加密库。

src/Crypto/HMAC.swift

@@ -2,7 +2,11 @@
 // Copyright (c) 2024 ssh2.app
 // Created by [email protected] 2024/8/18.
 
-import CSSH
+#if OPEN_SSL
+    import OpenSSL
+#else
+    import wolfSSL
+#endif
 import Foundation
 
 // 提供HMAC加密功能

src/Crypto/Sha.swift

@@ -2,9 +2,12 @@
 // Copyright (c) 2024 ssh2.app
 // Created by [email protected] 2024/8/18.
 
-import CSSH
 import Foundation
-
+#if OPEN_SSL
+    import OpenSSL
+#else
+    import wolfSSL
+#endif
 public extension Crypto {
     /// 使用指定的算法对字符串进行SHA哈希计算
     /// - Parameters:

src/Crypto/sshkey.c

@@ -99,7 +99,6 @@ public extension SSH {
         libssh2_session_flag(rawSession, LIBSSH2_FLAG_QUOTE_PATHS, 1)
 
         libssh2_session_set_timeout(rawSession, timeout * 1000)
-        // libssh2_session_set_timeout(self.rawSession, self.timeout)
 
         libssh2_session_banner_set(rawSession, banner.isEmpty ? "SSH-2.0-libssh2_SSH2.app" : banner)
         #if V010b01