diff options
| author | rowanbeentje <rowan@beent.je> | 2010-09-13 22:26:54 +0000 |
|---|---|---|
| committer | rowanbeentje <rowan@beent.je> | 2010-09-13 22:26:54 +0000 |
| commit | 92e7b9a652b0d1806d732079574aea7270b8a2c0 (patch) | |
| tree | 4a05b6ecbbe2573fc53b8ac4c7de448282aaaea0 /Source/SPConnectionController.h | |
| parent | 0661135713d5c9b3a4e3e39e184ac3eb35926ac4 (diff) | |
| download | sequelpro-92e7b9a652b0d1806d732079574aea7270b8a2c0.tar.gz sequelpro-92e7b9a652b0d1806d732079574aea7270b8a2c0.tar.bz2 sequelpro-92e7b9a652b0d1806d732079574aea7270b8a2c0.zip | |
- Implement support for MySQL over SSL for both TCP/IP and Socket connection modes.
- Upgrade the MySQL binaries to version 5.1.50 (was 5.1.46)
- Enable SSL support in the MySQL libraries (this leads to a large increase in library size, unfortunately)
- Enable more optimisations in the MySQL libraries (especially --enable-assembler for faster in-library string processing and --with-mysqld-ldflags=-all-static)
This completes support for Issue #27.
Diffstat (limited to 'Source/SPConnectionController.h')
| -rw-r--r-- | Source/SPConnectionController.h | 28 |
1 files changed, 27 insertions, 1 deletions
diff --git a/Source/SPConnectionController.h b/Source/SPConnectionController.h index 3aac3054..73622f40 100644 --- a/Source/SPConnectionController.h +++ b/Source/SPConnectionController.h @@ -77,6 +77,13 @@ NSString *database; NSString *socket; NSString *port; + int useSSL; + int sslKeyFileLocationEnabled; + NSString *sslKeyFileLocation; + int sslCertificateFileLocationEnabled; + NSString *sslCertificateFileLocation; + int sslCACertFileLocationEnabled; + NSString *sslCACertFileLocation; NSString *sshHost; NSString *sshUser; NSString *sshPassword; @@ -103,9 +110,14 @@ IBOutlet NSView *connectionResizeContainer; IBOutlet NSView *standardConnectionFormContainer; + IBOutlet NSView *standardConnectionSSLDetailsContainer; IBOutlet NSView *socketConnectionFormContainer; + IBOutlet NSView *socketConnectionSSLDetailsContainer; IBOutlet NSView *sshConnectionFormContainer; IBOutlet NSView *sshKeyLocationHelp; + IBOutlet NSView *sslKeyFileLocationHelp; + IBOutlet NSView *sslCertificateLocationHelp; + IBOutlet NSView *sslCACertLocationHelp; IBOutlet NSTextField *standardSQLHostField; IBOutlet NSTextField *sshSQLHostField; @@ -114,6 +126,12 @@ IBOutlet NSSecureTextField *sshPasswordField; IBOutlet NSSecureTextField *sshSSHPasswordField; IBOutlet NSButton *sshSSHKeyButton; + IBOutlet NSButton *standardSSLKeyFileButton; + IBOutlet NSButton *standardSSLCertificateButton; + IBOutlet NSButton *standardSSLCACertButton; + IBOutlet NSButton *socketSSLKeyFileButton; + IBOutlet NSButton *socketSSLCertificateButton; + IBOutlet NSButton *socketSSLCACertButton; IBOutlet NSButton *addToFavoritesButton; IBOutlet NSButton *connectButton; @@ -137,6 +155,13 @@ @property (readwrite, retain) NSString *database; @property (readwrite, retain) NSString *socket; @property (readwrite, retain) NSString *port; +@property (readwrite, assign) int useSSL; +@property (readwrite, assign) int sslKeyFileLocationEnabled; +@property (readwrite, retain) NSString *sslKeyFileLocation; +@property (readwrite, assign) int sslCertificateFileLocationEnabled; +@property (readwrite, retain) NSString *sslCertificateFileLocation; +@property (readwrite, assign) int sslCACertFileLocationEnabled; +@property (readwrite, retain) NSString *sslCACertFileLocation; @property (readwrite, retain) NSString *sshHost; @property (readwrite, retain) NSString *sshUser; @property (readwrite, retain) NSString *sshPassword; @@ -165,9 +190,10 @@ - (void)addConnectionToDocument; // Interface interaction -- (IBAction)chooseSSHKey:(id)sender; +- (IBAction)chooseKeyLocation:(id)sender; - (IBAction)editFavorites:(id)sender; - (IBAction)showHelp:(id)sender; +- (IBAction)updateSSLInterface:(id)sender; - (void)resizeTabViewToConnectionType:(NSUInteger)theType animating:(BOOL)animate; - (IBAction)sortFavorites:(id)sender; - (IBAction)reverseSortFavorites:(id)sender; |