Merge pull request #100 from FliegenKLATSCH/main

Use local encryption setting as default
johndbritton · Feb 1, 2022 · 9695ffa · 9695ffa
2 parents e03798c + e623eff
commit 9695ffa
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/TPConnectionsManager.m b/TPConnectionsManager.m
@@ -274,8 +274,9 @@ - (BOOL)tcpSecureSocketShouldEnableEncryption:(TPTCPSecureSocket*)tcpSocket
  NSString * remoteAddress = [tcpSocket remoteAddress];
  TPRemoteHost * remoteHost = [[TPHostsManager defaultManager] hostWithAddress:remoteAddress];
  if(remoteHost == nil) {
- NSLog(@"could not determine which host has IP %@, will use encrypted connection by default", remoteAddress);
- return YES; // encrypted by default
+ BOOL encryptionActive = [[TPPreferencesManager sharedPreferencesManager] boolForPref:ENABLED_ENCRYPTION];
+ NSLog(@"could not determine which host has IP %@, will%s use encryption as it is configured so locally", remoteAddress, encryptionActive ? "" : " NOT");
+ return encryptionActive; // encrypted by default, if encryption is enabled locally
  }
  else {
  return [[TPLocalHost localHost] pairWithHost:remoteHost hasCapability:TPHostEncryptionCapability];

diff --git a/teleport.xcodeproj/project.pbxproj b/teleport.xcodeproj/project.pbxproj
@@ -1139,7 +1139,7 @@
  CODE_SIGN_STYLE = Manual;
  COMBINE_HIDPI_IMAGES = YES;
  COPY_PHASE_STRIP = YES;
- CURRENT_PROJECT_VERSION = 1.3.3;
+ CURRENT_PROJECT_VERSION = 1.3.4;
  DEVELOPMENT_TEAM = "";
  ENABLE_HARDENED_RUNTIME = YES;
  EXCLUDED_ARCHS = "";
@@ -1167,7 +1167,7 @@
  CODE_SIGN_IDENTITY = "-";
  CODE_SIGN_STYLE = Manual;
  COMBINE_HIDPI_IMAGES = YES;
- CURRENT_PROJECT_VERSION = 1.3.3;
+ CURRENT_PROJECT_VERSION = 1.3.4;
  DEVELOPMENT_TEAM = "";
  ENABLE_HARDENED_RUNTIME = YES;
  EXCLUDED_ARCHS = "";
@@ -1280,7 +1280,7 @@
  CODE_SIGN_IDENTITY = "-";
  CODE_SIGN_STYLE = Manual;
  COMBINE_HIDPI_IMAGES = YES;
- CURRENT_PROJECT_VERSION = 1.3.3;
+ CURRENT_PROJECT_VERSION = 1.3.4;
  DEVELOPMENT_TEAM = "";
  ENABLE_HARDENED_RUNTIME = YES;
  EXCLUDED_ARCHS = "";