diff options
| author | Howard P. Logsdon <howard@hplogsdon.com> | 2014-03-07 12:14:15 -0700 |
|---|---|---|
| committer | Howard P. Logsdon <howard@hplogsdon.com> | 2014-03-07 12:14:15 -0700 |
| commit | 9c6fab1780fc35a0e5fba231ed552034fcbe7471 (patch) | |
| tree | 86741d1b1111a4d30bc1b9e63bb6416f20df30ca /Source/SPConnectionController.m | |
| parent | dfa060854cd456593a5ff0c4926d9c6775fabbfc (diff) | |
| download | sequelpro-9c6fab1780fc35a0e5fba231ed552034fcbe7471.tar.gz sequelpro-9c6fab1780fc35a0e5fba231ed552034fcbe7471.tar.bz2 sequelpro-9c6fab1780fc35a0e5fba231ed552034fcbe7471.zip | |
Enable SSL over SSH connection configuration.
This appears to work, as I’m able to connect to mysql instances through an ssh tunnel, with ssl configuration, but I probably should wireshark the connection to determine actual network traffic.
Diffstat (limited to 'Source/SPConnectionController.m')
| -rw-r--r-- | Source/SPConnectionController.m | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/Source/SPConnectionController.m b/Source/SPConnectionController.m index ea34ad16..adccee65 100644 --- a/Source/SPConnectionController.m +++ b/Source/SPConnectionController.m @@ -399,7 +399,7 @@ static NSComparisonResult _compareFavoritesUsingKey(id favorite1, id favorite2, [keySelectionPanel setAccessoryView:sshKeyLocationHelp]; } // SSL key file location: - else if (sender == standardSSLKeyFileButton || sender == socketSSLKeyFileButton) { + else if (sender == standardSSLKeyFileButton || sender == socketSSLKeyFileButton || sender == sslOverSSHKeyFileButton) { if ([sender state] == NSOffState) { [self setSslKeyFileLocation:nil]; return; @@ -408,7 +408,7 @@ static NSComparisonResult _compareFavoritesUsingKey(id favorite1, id favorite2, [keySelectionPanel setAccessoryView:sslKeyFileLocationHelp]; } // SSL certificate file location: - else if (sender == standardSSLCertificateButton || sender == socketSSLCertificateButton) { + else if (sender == standardSSLCertificateButton || sender == socketSSLCertificateButton || sender == sslOverSSHCertificateButton) { if ([sender state] == NSOffState) { [self setSslCertificateFileLocation:nil]; return; @@ -417,7 +417,7 @@ static NSComparisonResult _compareFavoritesUsingKey(id favorite1, id favorite2, [keySelectionPanel setAccessoryView:sslCertificateLocationHelp]; } // SSL CA certificate file location: - else if (sender == standardSSLCACertButton || sender == socketSSLCACertButton) { + else if (sender == standardSSLCACertButton || sender == socketSSLCACertButton || sender == sslOverSSHCACertButton) { if ([sender state] == NSOffState) { [self setSslCACertFileLocation:nil]; return; @@ -440,7 +440,7 @@ static NSComparisonResult _compareFavoritesUsingKey(id favorite1, id favorite2, [self setSshKeyLocation:abbreviatedFileName]; } // SSL key file selection - else if (sender == standardSSLKeyFileButton || sender == socketSSLKeyFileButton) { + else if (sender == standardSSLKeyFileButton || sender == socketSSLKeyFileButton || sender == sslOverSSHKeyFileButton) { if (returnCode == NSCancelButton) { [self setSslKeyFileLocationEnabled:NSOffState]; [self setSslKeyFileLocation:nil]; @@ -450,7 +450,7 @@ static NSComparisonResult _compareFavoritesUsingKey(id favorite1, id favorite2, [self setSslKeyFileLocation:abbreviatedFileName]; } // SSL certificate file selection - else if (sender == standardSSLCertificateButton || sender == socketSSLCertificateButton) { + else if (sender == standardSSLCertificateButton || sender == socketSSLCertificateButton || sender == sslOverSSHCertificateButton) { if (returnCode == NSCancelButton) { [self setSslCertificateFileLocationEnabled:NSOffState]; [self setSslCertificateFileLocation:nil]; @@ -460,7 +460,7 @@ static NSComparisonResult _compareFavoritesUsingKey(id favorite1, id favorite2, [self setSslCertificateFileLocation:abbreviatedFileName]; } // SSL CA certificate file selection - else if (sender == standardSSLCACertButton || sender == socketSSLCACertButton) { + else if (sender == standardSSLCACertButton || sender == socketSSLCACertButton || sender == sslOverSSHCACertButton) { if (returnCode == NSCancelButton) { [self setSslCACertFileLocationEnabled:NSOffState]; [self setSslCACertFileLocation:nil]; @@ -546,6 +546,7 @@ static NSComparisonResult _compareFavoritesUsingKey(id favorite1, id favorite2, break; case SPSSHTunnelConnection: targetResizeRect = [sshConnectionFormContainer frame]; + if ([self useSSL]) additionalFormHeight += [sshConnectionSSLDetailsContainer frame].size.height; break; } |