diff options
| -rw-r--r-- | Source/KeyChain.m | 2 | ||||
| -rw-r--r-- | Source/SPSSHTunnel.m | 4 | ||||
| -rw-r--r-- | Source/SequelProTunnelAssistant.m (renamed from Source/TunnelPassphraseRequester.m) | 2 | ||||
| -rw-r--r-- | sequel-pro.xcodeproj/project.pbxproj | 36 |
4 files changed, 23 insertions, 21 deletions
diff --git a/Source/KeyChain.m b/Source/KeyChain.m index 58dc2451..483eeceb 100644 --- a/Source/KeyChain.m +++ b/Source/KeyChain.m @@ -53,7 +53,7 @@ if (![self passwordExistsForName:name account:account]) { // Create a trusted access list with two items - ourselves and the SSH pass app. - NSString *helperPath = [[[NSBundle mainBundle] resourcePath] stringByAppendingPathComponent:@"TunnelPassphraseRequester"]; + NSString *helperPath = [[[NSBundle mainBundle] resourcePath] stringByAppendingPathComponent:@"SequelProTunnelAssistant"]; if ((SecTrustedApplicationCreateFromPath(NULL, &sequelProRef) == noErr) && (SecTrustedApplicationCreateFromPath([helperPath UTF8String], &sequelProHelperRef) == noErr)) { diff --git a/Source/SPSSHTunnel.m b/Source/SPSSHTunnel.m index 5b765525..60260f8d 100644 --- a/Source/SPSSHTunnel.m +++ b/Source/SPSSHTunnel.m @@ -274,7 +274,7 @@ [task setArguments:taskArguments]; // Set up the environment for the task - authenticationAppPath = [[[NSBundle mainBundle] resourcePath] stringByAppendingPathComponent:@"TunnelPassphraseRequester"]; + authenticationAppPath = [[[NSBundle mainBundle] resourcePath] stringByAppendingPathComponent:@"SequelProTunnelAssistant"]; taskEnvironment = [[NSMutableDictionary alloc] initWithDictionary:[[NSProcessInfo processInfo] environment]]; [taskEnvironment removeObjectForKey: @"SSH_AGENT_PID"]; [taskEnvironment removeObjectForKey: @"SSH_AUTH_SOCK"]; @@ -433,7 +433,7 @@ } /* - * Method to request the password for the current connection, as used by TunnelPassphraseRequester; + * Method to request the password for the current connection, as used by SequelProTunnelAssistant; * called with a verification hash to check against the stored hash, to provide basic security. Note * that this is easily bypassed, but if bypassed the password can already easily be retrieved in the same way. */ diff --git a/Source/TunnelPassphraseRequester.m b/Source/SequelProTunnelAssistant.m index 11665449..7859eaf7 100644 --- a/Source/TunnelPassphraseRequester.m +++ b/Source/SequelProTunnelAssistant.m @@ -1,5 +1,5 @@ // -// TunnelPassphraseRequester.m +// SequelProTunnelAssistant.m // sequel-pro // // Created by Rowan Beentje on May 4, 2009. diff --git a/sequel-pro.xcodeproj/project.pbxproj b/sequel-pro.xcodeproj/project.pbxproj index 729133f9..1d3928a4 100644 --- a/sequel-pro.xcodeproj/project.pbxproj +++ b/sequel-pro.xcodeproj/project.pbxproj @@ -128,6 +128,7 @@ 4DECC48F0EC2B436008D359E /* Sparkle.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 4DECC3320EC2A170008D359E /* Sparkle.framework */; }; 4DECC4910EC2B436008D359E /* Growl.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 4DECC3340EC2A170008D359E /* Growl.framework */; }; 581068B61015411B0068C6E2 /* link-arrow-highlighted.png in Resources */ = {isa = PBXBuildFile; fileRef = 581068B51015411B0068C6E2 /* link-arrow-highlighted.png */; }; + 581069B410167EC10068C6E2 /* SequelProTunnelAssistant in Resources */ = {isa = PBXBuildFile; fileRef = 58CDB3360FCE13C900F8ACA3 /* SequelProTunnelAssistant */; }; 58186D210F4CB38900851FE9 /* ConnectionErrorDialog.xib in Resources */ = {isa = PBXBuildFile; fileRef = 58186D1F0F4CB38900851FE9 /* ConnectionErrorDialog.xib */; }; 5822C9B51000DB2400DCC3D6 /* SPConnectionController.m in Sources */ = {isa = PBXBuildFile; fileRef = 5822C9B41000DB2400DCC3D6 /* SPConnectionController.m */; }; 5822CAE110011C8000DCC3D6 /* ConnectionView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5822CADF10011C8000DCC3D6 /* ConnectionView.xib */; }; @@ -143,7 +144,7 @@ 58CB20ED0F79A75D005EA204 /* button_edit_mode_selected.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 58CB20EC0F79A75D005EA204 /* button_edit_mode_selected.tiff */; }; 58CDB3300FCE138D00F8ACA3 /* SPSSHTunnel.m in Sources */ = {isa = PBXBuildFile; fileRef = 58CDB32F0FCE138D00F8ACA3 /* SPSSHTunnel.m */; }; 58CDB3400FCE13EF00F8ACA3 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B5EAC0FC0EC87FF900CC579C /* Security.framework */; }; - 58CDB3410FCE141900F8ACA3 /* TunnelPassphraseRequester.m in Sources */ = {isa = PBXBuildFile; fileRef = 58CDB3310FCE139C00F8ACA3 /* TunnelPassphraseRequester.m */; }; + 58CDB3410FCE141900F8ACA3 /* SequelProTunnelAssistant.m in Sources */ = {isa = PBXBuildFile; fileRef = 58CDB3310FCE139C00F8ACA3 /* SequelProTunnelAssistant.m */; }; 58CDB3420FCE142500F8ACA3 /* KeyChain.m in Sources */ = {isa = PBXBuildFile; fileRef = 17E641740EF01F80001BC333 /* KeyChain.m */; }; 58D2E229101222670063EF1D /* SPTextAndLinkCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 58D2E227101222670063EF1D /* SPTextAndLinkCell.m */; }; 58D2E22E101222870063EF1D /* link-arrow-clicked.png in Resources */ = {isa = PBXBuildFile; fileRef = 58D2E22B101222870063EF1D /* link-arrow-clicked.png */; }; @@ -491,8 +492,8 @@ 58CB20EC0F79A75D005EA204 /* button_edit_mode_selected.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = button_edit_mode_selected.tiff; sourceTree = "<group>"; }; 58CDB32E0FCE138D00F8ACA3 /* SPSSHTunnel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPSSHTunnel.h; sourceTree = "<group>"; }; 58CDB32F0FCE138D00F8ACA3 /* SPSSHTunnel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPSSHTunnel.m; sourceTree = "<group>"; }; - 58CDB3310FCE139C00F8ACA3 /* TunnelPassphraseRequester.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TunnelPassphraseRequester.m; sourceTree = "<group>"; }; - 58CDB3360FCE13C900F8ACA3 /* TunnelPassphraseRequester */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = TunnelPassphraseRequester; sourceTree = BUILT_PRODUCTS_DIR; }; + 58CDB3310FCE139C00F8ACA3 /* SequelProTunnelAssistant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SequelProTunnelAssistant.m; sourceTree = "<group>"; }; + 58CDB3360FCE13C900F8ACA3 /* SequelProTunnelAssistant */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = SequelProTunnelAssistant; sourceTree = BUILT_PRODUCTS_DIR; }; 58D2E227101222670063EF1D /* SPTextAndLinkCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPTextAndLinkCell.m; sourceTree = "<group>"; }; 58D2E228101222670063EF1D /* SPTextAndLinkCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPTextAndLinkCell.h; sourceTree = "<group>"; }; 58D2E22B101222870063EF1D /* link-arrow-clicked.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "link-arrow-clicked.png"; sourceTree = "<group>"; }; @@ -980,7 +981,7 @@ children = ( 58CDB32E0FCE138D00F8ACA3 /* SPSSHTunnel.h */, 58CDB32F0FCE138D00F8ACA3 /* SPSSHTunnel.m */, - 58CDB3310FCE139C00F8ACA3 /* TunnelPassphraseRequester.m */, + 58CDB3310FCE139C00F8ACA3 /* SequelProTunnelAssistant.m */, ); name = SSHTunnel; sourceTree = "<group>"; @@ -1083,7 +1084,7 @@ children = ( 8D15AC370486D014006FF6A4 /* Sequel Pro.app */, 380F4ED90FC0B50500B0BFD7 /* Unit Tests.octest */, - 58CDB3360FCE13C900F8ACA3 /* TunnelPassphraseRequester */, + 58CDB3360FCE13C900F8ACA3 /* SequelProTunnelAssistant */, 17B7B5621016012700F057DE /* MCPKit.framework */, ); name = Products; @@ -1263,9 +1264,9 @@ productReference = 380F4ED90FC0B50500B0BFD7 /* Unit Tests.octest */; productType = "com.apple.product-type.bundle"; }; - 58CDB3350FCE13C900F8ACA3 /* TunnelPassphraseRequester */ = { + 58CDB3350FCE13C900F8ACA3 /* SequelProTunnelAssistant */ = { isa = PBXNativeTarget; - buildConfigurationList = 58CDB33F0FCE13E300F8ACA3 /* Build configuration list for PBXNativeTarget "TunnelPassphraseRequester" */; + buildConfigurationList = 58CDB33F0FCE13E300F8ACA3 /* Build configuration list for PBXNativeTarget "SequelProTunnelAssistant" */; buildPhases = ( 58CDB3330FCE13C900F8ACA3 /* Sources */, 58CDB3340FCE13C900F8ACA3 /* Frameworks */, @@ -1274,9 +1275,9 @@ ); dependencies = ( ); - name = TunnelPassphraseRequester; + name = SequelProTunnelAssistant; productName = TunnelPassphraseRequester; - productReference = 58CDB3360FCE13C900F8ACA3 /* TunnelPassphraseRequester */; + productReference = 58CDB3360FCE13C900F8ACA3 /* SequelProTunnelAssistant */; productType = "com.apple.product-type.tool"; }; 8D15AC270486D014006FF6A4 /* Sequel Pro */ = { @@ -1323,7 +1324,7 @@ targets = ( 8D15AC270486D014006FF6A4 /* Sequel Pro */, 380F4ED80FC0B50500B0BFD7 /* Unit Tests */, - 58CDB3350FCE13C900F8ACA3 /* TunnelPassphraseRequester */, + 58CDB3350FCE13C900F8ACA3 /* SequelProTunnelAssistant */, 17B7B5611016012700F057DE /* MCPKit */, ); }; @@ -1447,6 +1448,7 @@ 58D2E230101222870063EF1D /* link-arrow.png in Resources */, BC688D811012462600D35128 /* borderlessbackground.png in Resources */, 581068B61015411B0068C6E2 /* link-arrow-highlighted.png in Resources */, + 581069B410167EC10068C6E2 /* SequelProTunnelAssistant in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1465,7 +1467,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "# Add build/bundle version\n\"${SRCROOT}/Scripts/build-version.pl\"\n\n# Copy the TunnelPassphraseRequester into the resources dir\ncp -f \"${BUILT_PRODUCTS_DIR}/TunnelPassphraseRequester\" \"${BUILT_PRODUCTS_DIR}/${TARGET_NAME}${WRAPPER_SUFFIX}/Contents/Resources\"\n\n# Trim application if release or dist build\nif test \"$CONFIGURATION\" == 'Release' || test \"$CONFIGURATION\" == 'Distribution'\nthen\n\t\"${SRCROOT}/Scripts/trim-application.sh\" -p \"${BUILT_PRODUCTS_DIR}/${TARGET_NAME}${WRAPPER_SUFFIX}\" -a\nfi\n\n# Perform distribution tasks on a dist build\nif [ \"$CONFIGURATION\" == 'Distribution' ]\nthen\n\t\"${SRCROOT}/Scripts/package-application.sh\" -p \"${BUILT_PRODUCTS_DIR}/${TARGET_NAME}${WRAPPER_SUFFIX}\"\nfi"; + shellScript = "# Add build/bundle version\n\"${SRCROOT}/Scripts/build-version.pl\"\n\n# Trim application if release or dist build\nif test \"$CONFIGURATION\" == 'Release' || test \"$CONFIGURATION\" == 'Distribution'\nthen\n\t\"${SRCROOT}/Scripts/trim-application.sh\" -p \"${BUILT_PRODUCTS_DIR}/${TARGET_NAME}${WRAPPER_SUFFIX}\" -a\nfi\n\n# Perform distribution tasks on a dist build\nif [ \"$CONFIGURATION\" == 'Distribution' ]\nthen\n\t\"${SRCROOT}/Scripts/package-application.sh\" -p \"${BUILT_PRODUCTS_DIR}/${TARGET_NAME}${WRAPPER_SUFFIX}\"\nfi"; }; 380F4ED70FC0B50500B0BFD7 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; @@ -1519,7 +1521,7 @@ buildActionMask = 2147483647; files = ( 586F457B0FDB269E00B428D7 /* RegexKitLite.m in Sources */, - 58CDB3410FCE141900F8ACA3 /* TunnelPassphraseRequester.m in Sources */, + 58CDB3410FCE141900F8ACA3 /* SequelProTunnelAssistant.m in Sources */, 58CDB3420FCE142500F8ACA3 /* KeyChain.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -1597,7 +1599,7 @@ }; 58CDB34B0FCE144000F8ACA3 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 58CDB3350FCE13C900F8ACA3 /* TunnelPassphraseRequester */; + target = 58CDB3350FCE13C900F8ACA3 /* SequelProTunnelAssistant */; targetProxy = 58CDB34A0FCE144000F8ACA3 /* PBXContainerItemProxy */; }; B5538E7C0FF27A2200219803 /* PBXTargetDependency */ = { @@ -1954,7 +1956,7 @@ AppKit, ); PREBINDING = NO; - PRODUCT_NAME = TunnelPassphraseRequester; + PRODUCT_NAME = SequelProTunnelAssistant; }; name = Debug; }; @@ -1976,7 +1978,7 @@ AppKit, ); PREBINDING = NO; - PRODUCT_NAME = TunnelPassphraseRequester; + PRODUCT_NAME = SequelProTunnelAssistant; ZERO_LINK = NO; }; name = Release; @@ -1997,7 +1999,7 @@ AppKit, ); PREBINDING = NO; - PRODUCT_NAME = TunnelPassphraseRequester; + PRODUCT_NAME = SequelProTunnelAssistant; }; name = Distribution; }; @@ -2104,7 +2106,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 58CDB33F0FCE13E300F8ACA3 /* Build configuration list for PBXNativeTarget "TunnelPassphraseRequester" */ = { + 58CDB33F0FCE13E300F8ACA3 /* Build configuration list for PBXNativeTarget "SequelProTunnelAssistant" */ = { isa = XCConfigurationList; buildConfigurations = ( 58CDB3380FCE13CB00F8ACA3 /* Debug */, |