diff --git a/DNSCrypt-OSX-Installer/DNSCrypt-OSX-Installer.pkgproj b/DNSCrypt-OSX-Installer/DNSCrypt-OSX-Installer.pkgproj index 16b2b93..f382765 100755 --- a/DNSCrypt-OSX-Installer/DNSCrypt-OSX-Installer.pkgproj +++ b/DNSCrypt-OSX-Installer/DNSCrypt-OSX-Installer.pkgproj @@ -511,38 +511,6 @@ UID 0 - - CHILDREN - - GID - 0 - PATH - /usr/local/lib/dnscrypt-proxy/libdcplugin_example_ldns_forward_after_nxdomain.la - PATH_TYPE - 0 - PERMISSIONS - 493 - TYPE - 3 - UID - 0 - - - CHILDREN - - GID - 0 - PATH - /usr/local/lib/dnscrypt-proxy/libdcplugin_example_ldns_forward_after_nxdomain.so - PATH_TYPE - 0 - PERMISSIONS - 493 - TYPE - 3 - UID - 0 - CHILDREN @@ -671,6 +639,39 @@ CHILDREN + + CHILDREN + + + CHILDREN + + GID + 0 + PATH + /usr/local/share/dnscrypt-proxy/dnscrypt-resolvers.csv + PATH_TYPE + 0 + PERMISSIONS + 420 + TYPE + 3 + UID + 0 + + + GID + 0 + PATH + dnscrypt-proxy + PATH_TYPE + 0 + PERMISSIONS + 493 + TYPE + 2 + UID + 0 + CHILDREN @@ -828,7 +829,7 @@ USE_HFS+_COMPRESSION VERSION - 1.3.1 + 1.4.0 UUID 7F7D70AB-F7A2-4027-8304-3063C7B9532F @@ -1460,7 +1461,7 @@ GID 80 PATH - /Users/j/Library/Developer/Xcode/DerivedData/DNSCrypt-Menubar-fcseadxtcidaaddjtyicaarzthfd/Build/Products/Release/DNSCrypt-Menubar.app + /Users/j/Library/Developer/Xcode/DerivedData/DNSCrypt-Menubar-fcseadxtcidaaddjtyicaarzthfd/Build/Products/Release/DNSCrypt Menubar.app PATH_TYPE 0 PERMISSIONS diff --git a/DNSCrypt-OSX-Installer/com.opendns.osx.DNSCryptMenuBar.plist b/DNSCrypt-OSX-Installer/com.opendns.osx.DNSCryptMenuBar.plist index 22e54d8..e3e6438 100644 --- a/DNSCrypt-OSX-Installer/com.opendns.osx.DNSCryptMenuBar.plist +++ b/DNSCrypt-OSX-Installer/com.opendns.osx.DNSCryptMenuBar.plist @@ -10,7 +10,7 @@ ProgramArguments - /Applications/DNSCrypt-Menubar.app/Contents/MacOS/DNSCrypt-Menubar + /Applications/DNSCrypt Menubar.app/Contents/MacOS/DNSCrypt Menubar LimitLoadToSessionType Aqua diff --git a/DNSCrypt-OSX-Installer/sign.sh b/DNSCrypt-OSX-Installer/sign.sh index 37330b9..3f4cc2f 100755 --- a/DNSCrypt-OSX-Installer/sign.sh +++ b/DNSCrypt-OSX-Installer/sign.sh @@ -1,6 +1,6 @@ #! /bin/sh -VERSION='0.19' +VERSION='0.21' cd build || exit 1 [ -d DNSCrypt.mpkg ] || exit 1 diff --git a/DNSCrypt-Preference-Pane/DNSCrypt.xcodeproj/project.pbxproj b/DNSCrypt-Preference-Pane/DNSCrypt.xcodeproj/project.pbxproj index 5cc4732..95b3549 100644 --- a/DNSCrypt-Preference-Pane/DNSCrypt.xcodeproj/project.pbxproj +++ b/DNSCrypt-Preference-Pane/DNSCrypt.xcodeproj/project.pbxproj @@ -192,7 +192,7 @@ 0946B0B713F47F52008277C6 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0460; + LastUpgradeCheck = 0510; }; buildConfigurationList = 0946B0BA13F47F52008277C6 /* Build configuration list for PBXProject "DNSCrypt" */; compatibilityVersion = "Xcode 3.2"; @@ -328,14 +328,17 @@ 0946B0DF13F47F53008277C6 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - CLANG_ENABLE_OBJC_ARC = NO; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + CLANG_ENABLE_OBJC_ARC = YES; COMBINE_HIDPI_IMAGES = YES; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "\"$(SRCROOT)\"", ); + GCC_ENABLE_OBJC_GC = no; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "DNSCrypt/DNSCrypt-Prefix.pch"; + GCC_VERSION = ""; INFOPLIST_FILE = "DNSCrypt/DNSCrypt-Info.plist"; INSTALL_PATH = "$(HOME)/Library/PreferencePanes"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -346,14 +349,17 @@ 0946B0E013F47F53008277C6 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - CLANG_ENABLE_OBJC_ARC = NO; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + CLANG_ENABLE_OBJC_ARC = YES; COMBINE_HIDPI_IMAGES = YES; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "\"$(SRCROOT)\"", ); + GCC_ENABLE_OBJC_GC = no; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "DNSCrypt/DNSCrypt-Prefix.pch"; + GCC_VERSION = ""; INFOPLIST_FILE = "DNSCrypt/DNSCrypt-Info.plist"; INSTALL_PATH = "$(HOME)/Library/PreferencePanes"; PRODUCT_NAME = "$(TARGET_NAME)"; diff --git a/DNSCrypt-Preference-Pane/DNSCrypt/DNSCrypt.h b/DNSCrypt-Preference-Pane/DNSCrypt/DNSCrypt.h index a730269..c426c2f 100644 --- a/DNSCrypt-Preference-Pane/DNSCrypt/DNSCrypt.h +++ b/DNSCrypt-Preference-Pane/DNSCrypt/DNSCrypt.h @@ -52,7 +52,6 @@ typedef enum { NSTextField *_statusText; WebView *_previewNotesWebView; WebView *_releaseNotesWebView; - WebView *_feedbackWebView; WebView *_aboutWebView; NSTextFieldCell *_staticResolversTextField; NSTextField *_blacklistIPsTextField; @@ -62,29 +61,28 @@ typedef enum { NSButton *_viewLogButton; NSButton *_queryLoggingButton; } -@property (nonatomic, retain) IBOutlet NSTabView *tabView; -@property (nonatomic, retain) IBOutlet NSTabViewItem *aboutTabViewItem; -@property (nonatomic, retain) IBOutlet NSTabViewItem *releaseNotesTabViewItem; +@property (nonatomic, strong) IBOutlet NSTabView *tabView; +@property (nonatomic, strong) IBOutlet NSTabViewItem *aboutTabViewItem; +@property (nonatomic, strong) IBOutlet NSTabViewItem *releaseNotesTabViewItem; -@property (nonatomic, retain) IBOutlet NSButton *dnscryptButton; -@property (nonatomic, retain) IBOutlet NSButton *opendnsButton; -@property (nonatomic, retain) IBOutlet NSButton *familyShieldButton; -@property (nonatomic, retain) IBOutlet NSButton *fallbackButton; +@property (nonatomic, strong) IBOutlet NSButton *dnscryptButton; +@property (nonatomic, strong) IBOutlet NSButton *opendnsButton; +@property (nonatomic, strong) IBOutlet NSButton *familyShieldButton; +@property (nonatomic, strong) IBOutlet NSButton *fallbackButton; -@property (nonatomic, retain) IBOutlet NSTextField *currentResolverTextField; -@property (nonatomic, retain) IBOutlet NSImageView *statusImageView; -@property (nonatomic, retain) IBOutlet NSTextField *statusText; -@property (nonatomic, retain) IBOutlet WebView *previewNotesWebView; -@property (nonatomic, retain) IBOutlet WebView *releaseNotesWebView; -@property (nonatomic, retain) IBOutlet WebView *feedbackWebView; -@property (nonatomic, retain) IBOutlet WebView *aboutWebView; -@property (nonatomic, retain) IBOutlet NSTextFieldCell *staticResolversTextField; -@property (nonatomic, retain) IBOutlet NSTextField *blacklistIPsTextField; -@property (nonatomic, retain) IBOutlet NSTextField *blacklistDomainsTextField; -@property (nonatomic, retain) IBOutlet NSTextField *exceptionsTextField; -@property (nonatomic, retain) IBOutlet WebView *helpWebView; -@property (nonatomic, retain) IBOutlet NSButton *viewLogButton; -@property (nonatomic, retain) IBOutlet NSButton *queryLoggingButton; +@property (nonatomic, strong) IBOutlet NSTextField *currentResolverTextField; +@property (nonatomic, strong) IBOutlet NSImageView *statusImageView; +@property (nonatomic, strong) IBOutlet NSTextField *statusText; +@property (nonatomic, strong) IBOutlet WebView *previewNotesWebView; +@property (nonatomic, strong) IBOutlet WebView *releaseNotesWebView; +@property (nonatomic, strong) IBOutlet WebView *aboutWebView; +@property (nonatomic, strong) IBOutlet NSTextFieldCell *staticResolversTextField; +@property (nonatomic, strong) IBOutlet NSTextField *blacklistIPsTextField; +@property (nonatomic, strong) IBOutlet NSTextField *blacklistDomainsTextField; +@property (nonatomic, strong) IBOutlet NSTextField *exceptionsTextField; +@property (nonatomic, strong) IBOutlet WebView *helpWebView; +@property (nonatomic, strong) IBOutlet NSButton *viewLogButton; +@property (nonatomic, strong) IBOutlet NSButton *queryLoggingButton; - (void) mainViewDidLoad; diff --git a/DNSCrypt-Preference-Pane/DNSCrypt/DNSCrypt.m b/DNSCrypt-Preference-Pane/DNSCrypt/DNSCrypt.m index ea7f851..f893fff 100644 --- a/DNSCrypt-Preference-Pane/DNSCrypt/DNSCrypt.m +++ b/DNSCrypt-Preference-Pane/DNSCrypt/DNSCrypt.m @@ -14,7 +14,6 @@ @synthesize releaseNotesTabViewItem = _releaseNotesTabViewItem; @synthesize previewNotesWebView = _previewNotesWebView; @synthesize releaseNotesWebView = _releaseNotesWebView; -@synthesize feedbackWebView = _feedbackWebView; @synthesize aboutWebView = _aboutWebView; @synthesize staticResolversTextField = _staticResolversTextField; @synthesize blacklistIPsTextField = _blacklistIPsTextField; @@ -53,9 +52,7 @@ DNSConfigurationState currentState = kDNS_CONFIGURATION_UNKNOWN; [task launch]; data = [[pipe fileHandleForReading] readDataToEndOfFile]; [task waitUntilExit]; - [task release]; - [pipe release]; - result = [[[NSString alloc] initWithData: data encoding: NSUTF8StringEncoding] autorelease]; + result = [[NSString alloc] initWithData: data encoding: NSUTF8StringEncoding]; if ([result hasSuffix: @"\n"]) { result = [result substringToIndex: result.length - 1]; } @@ -114,19 +111,19 @@ DNSConfigurationState currentState = kDNS_CONFIGURATION_UNKNOWN; switch (currentState) { case kDNS_CONFIGURATION_UNKNOWN: _statusText.stringValue = NSLocalizedString(@"No network", @"Status"); - _statusImageView.image = [[[NSImage alloc] initWithContentsOfFile: [bundle pathForImageResource: @"shield_red.png"]] autorelease]; + _statusImageView.image = [[NSImage alloc] initWithContentsOfFile: [bundle pathForImageResource: @"shield_red.png"]]; break; case kDNS_CONFIGURATION_VANILLA: _statusText.stringValue = NSLocalizedString(@"Unprotected", @"Status"); - _statusImageView.image = [[[NSImage alloc] initWithContentsOfFile: [bundle pathForImageResource: @"shield_red.png"]] autorelease]; + _statusImageView.image = [[NSImage alloc] initWithContentsOfFile: [bundle pathForImageResource: @"shield_red.png"]]; break; case kDNS_CONFIGURATION_OPENDNS: _statusText.stringValue = NSLocalizedString(@"Unencrypted", @"Status"); - _statusImageView.image = [[[NSImage alloc] initWithContentsOfFile: [bundle pathForImageResource: @"shield_yellow.png"]] autorelease]; + _statusImageView.image = [[NSImage alloc] initWithContentsOfFile: [bundle pathForImageResource: @"shield_yellow.png"]]; break; case kDNS_CONFIGURATION_LOCALHOST: _statusText.stringValue = NSLocalizedString(@"Protected", @"Status"); - _statusImageView.image = [[[NSImage alloc] initWithContentsOfFile: [bundle pathForImageResource: @"shield_green.png"]] autorelease]; + _statusImageView.image = [[NSImage alloc] initWithContentsOfFile: [bundle pathForImageResource: @"shield_green.png"]]; break; default: return; @@ -175,7 +172,7 @@ DNSConfigurationState currentState = kDNS_CONFIGURATION_UNKNOWN; [self setCheckBoxesEnabled: FALSE]; _statusText.stringValue = NSLocalizedString(@"Updating", @"Updating network configuraiton"); - _statusImageView.image = [[[NSImage alloc] initWithContentsOfFile: [bundle pathForImageResource: @"ajax-loader.gif"]] autorelease]; + _statusImageView.image = [[NSImage alloc] initWithContentsOfFile: [bundle pathForImageResource: @"ajax-loader.gif"]]; _currentResolverTextField.stringValue = @""; [self fromCommand: @"/bin/csh" withArguments: [NSArray arrayWithObjects: @"-c", @"cd '" kDNSCRIPT_SCRIPTS_BASE_DIR @"' && exec ./gui-push-conf-change.sh menubar", nil]]; @@ -292,18 +289,6 @@ DNSConfigurationState currentState = kDNS_CONFIGURATION_UNKNOWN; [self performSelector: @selector(waitForUpdate) withObject: self afterDelay:kREFRESH_DELAY]; } -- (void) webView:(WebView *)sender didFinishLoadForFrame:(WebFrame *)frame { - if (sender != _feedbackWebView) { - return; - } - NSString *res; - res = [self fromCommand: @"/bin/csh" withArguments: [NSArray arrayWithObjects: @"-c", @"/usr/local/sbin/dnscrypt-proxy --version | head -n 1", nil]]; - NSCharacterSet *charset = [NSCharacterSet characterSetWithCharactersInString: @"\r\n<>'"]; - res = [[res componentsSeparatedByCharactersInSet: charset] componentsJoinedByString: @" "]; - NSString *script = [NSString stringWithFormat: @"document.querySelector('textarea[name=feedback]').value='\\n\\n\\n--\\nOpenDNS user interface for OSX " kDNSCRYPT_PACKAGE_VERSION "\\n%@'", res]; - [sender stringByEvaluatingJavaScriptFromString: script]; -} - - (void) mainViewDidLoad { currentState = kDNS_CONFIGURATION_UNKNOWN; @@ -314,7 +299,6 @@ DNSConfigurationState currentState = kDNS_CONFIGURATION_UNKNOWN; NSString *version = kDNSCRYPT_PACKAGE_VERSION; NSString *softwareBlurbFormat = NSLocalizedString(@"This software (v: %@) encrypts and authenticates DNS packets between your computer and OpenDNS. This prevents man-in-the-middle attacks and snooping of DNS traffic by ISPs or others.", @"Description of what the package does - %@ is replaced by the version number"); - NSString *provideFeedback = NSLocalizedString(@"Please help by providing feedback!", @"Ask for feedback"); NSString *describePorts = NSLocalizedString(@"DNSCrypt can use UDP and TCP ports 53 and 443.", @"Describe what ports DNSCrypt uses"); NSString *describeFallback = NSLocalizedString(@"If you prefer reliability over security, enable fallback to insecure DNS.", @"Describe what the 'fallback to insecure mode' checkbox does"); @@ -322,9 +306,6 @@ DNSConfigurationState currentState = kDNS_CONFIGURATION_UNKNOWN; [htmlString appendFormat: softwareBlurbFormat, version]; [htmlString appendString: @"

"]; - [htmlString appendString: @""]; - [htmlString appendString: provideFeedback]; - [htmlString appendString: @""]; [htmlString appendString: @"
    "]; [htmlString appendFormat: @"
  • %@
    • ", describePorts]; [htmlString appendFormat: @"
  • %@
    • ", describeFallback]; @@ -332,13 +313,6 @@ DNSConfigurationState currentState = kDNS_CONFIGURATION_UNKNOWN; [htmlString appendString: @""]; [[_previewNotesWebView mainFrame] loadHTMLString:htmlString baseURL:[NSURL URLWithString:@"file:///"]]; - [_feedbackWebView setDrawsBackground:false]; - [_feedbackWebView setShouldUpdateWhileOffscreen:true]; - [_feedbackWebView setUIDelegate:self]; - [_feedbackWebView setFrameLoadDelegate: self]; - NSString *feedbackURLText = @"http://dnscrypt.opendns.com/feedback.php"; - [[_feedbackWebView mainFrame] loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:feedbackURLText]]]; - SInt32 OSXversionMajor, OSXversionMinor; if (Gestalt(gestaltSystemVersionMajor, &OSXversionMajor) != noErr || Gestalt(gestaltSystemVersionMinor, &OSXversionMinor) != noErr || OSXversionMajor < 10 || OSXversionMinor < 6) { return; diff --git a/DNSCrypt-Preference-Pane/DNSCrypt/en.lproj/DNSCrypt.xib b/DNSCrypt-Preference-Pane/DNSCrypt/en.lproj/DNSCrypt.xib index ba107c7..e81155a 100644 --- a/DNSCrypt-Preference-Pane/DNSCrypt/en.lproj/DNSCrypt.xib +++ b/DNSCrypt-Preference-Pane/DNSCrypt/en.lproj/DNSCrypt.xib @@ -1,2333 +1,401 @@ - - - - 1070 - 12C60 - 2840 - 1187.34 - 625.00 - - 2840 - 1810 - - - NSBox - NSButton - NSButtonCell - NSCustomObject - NSImageCell - NSImageView - NSTabView - NSTabViewItem - NSTextField - NSTextFieldCell - NSView - NSWindowTemplate - WebView - - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.WebKitIBPlugin - - - PluginDependencyRecalculationVersion - - - - - DNSCrypt - - - FirstResponder - - - NSApplication - - - 7 - 2 - {{176, 715}, {589, 375}} - 1081606144 - << do not localize >> - NSWindow - - View - - - {224.66399999999999, 10} - - - 256 - - - - 274 - {{13, 10}, {563, 359}} - - - - _NS:461 - - - 1 - - - 256 - - - - 268 - {{15, 238}, {204, 22}} - - - - _NS:239 - YES - - 67108864 - 0 - Enable DNSCrypt - - LucidaGrande-Bold - 14 - 16 - - _NS:239 - - 1211912448 - 2 - - NSImage - NSSwitch - - - NSSwitch - - - - 200 - 25 - - NO - - - - 268 - {{15, 212}, {245, 24}} - - - - _NS:239 - YES - - 67108864 - 0 - Always use OpenDNS - - _NS:239 - - 1211912448 - 2 - - - - - 200 - 25 - - NO - - - - 268 - {{15, 157}, {244, 22}} - - - - _NS:239 - YES - - 67108864 - 0 - Always use Familyshield - - LucidaGrande - 14 - 16 - - _NS:239 - - 1211912448 - 2 - - - - - 200 - 25 - - NO - - - - 268 - {{15, 133}, {204, 22}} - - - - _NS:239 - YES - - 67108864 - 0 - Fallback to insecure DNS - - _NS:239 - - 1211912448 - 2 - - - - - 200 - 25 - - NO - - - - 268 - {{14, 96}, {173, 19}} - - - - _NS:3936 - YES - - 68157504 - 272630784 - Current DNS resolver: - - LucidaGrande - 16 - 16 - - _NS:3936 - - - 6 - System - controlColor - - 3 - MC42NjY2NjY2NjY3AA - - - - 6 - System - controlTextColor - - 3 - MAA - - - - NO - - - - 268 - {{54, 284}, {72, 19}} - - - - _NS:3936 - YES - - 68157504 - 272630784 - Status: - - LucidaGrande - 18 - 16 - - _NS:3936 - - - - - NO - - - - 268 - {{14, -3}, {240, 83}} - - - - _NS:3596 - YES - - 67108864 - 4194304 - ... - - Monaco - 14 - 16 - - - _NS:3596 - - YES - - - 3 - MC4yMDQ2MzcwOTY4AA - - - NO - - - - 268 - {{115, 283}, {125, 19}} - - - - _NS:3596 - YES - - 67108864 - 4194304 - ... - - Monaco - 16 - 16 - - - _NS:3596 - - YES - - - 3 - MC4yMDQ2MzcwOTY4AA - - - NO - - - - 256 - - Apple PDF pasteboard type - Apple PICT pasteboard type - Apple PNG pasteboard type - NSFilenamesPboardType - NeXT Encapsulated PostScript v1.2 pasteboard type - NeXT TIFF v4.0 pasteboard type - - {{302, 222}, {224, 88}} - - - - YES - - 134217728 - 33554432 - - NSImage - opendns_logo_300 - - 0 - 0 - 0 - NO - - NO - YES - - - - 256 - - Apple PDF pasteboard type - Apple PICT pasteboard type - Apple PNG pasteboard type - NSFilenamesPboardType - NeXT Encapsulated PostScript v1.2 pasteboard type - NeXT TIFF v4.0 pasteboard type - - {{17, 277}, {32.395949255088134, 32.395949255088134}} - - - - YES - - 134217728 - 33554432 - - NSImage - ajax-loader - - 2 - 0 - 0 - YES - - NO - YES - - - - 12 - {{269.5, 2}, {4, 300}} - - - - _NS:1557 - {0, 0} - - 67108864 - 0 - Box - - LucidaGrande - 13 - 1044 - - - 6 - System - textBackgroundColor - - 3 - MQA - - - - 3 - MCAwLjgwMDAwMDAxMTkAA - - - 3 - 2 - 0 - NO - - - - 268 - {{323, 190}, {183, 32}} - - - - _NS:2419 - YES - - 67108864 - 134217728 - http://www.opendns.com/ - - LucidaGrande - 12 - 16 - - _NS:2419 - - -2038022144 - 129 - - Browse the OpenDNS web site - - 400 - 75 - - NO - - - - 256 - - Apple HTML pasteboard type - Apple PDF pasteboard type - Apple PICT pasteboard type - Apple URL pasteboard type - Apple Web Archive pasteboard type - NSColor pasteboard type - NSFilenamesPboardType - NSStringPboardType - NeXT RTFD pasteboard type - NeXT Rich Text Format v1.0 pasteboard type - NeXT TIFF v4.0 pasteboard type - WebURLsWithTitlesPboardType - public.png - public.url - public.url-name - - {{302, 2}, {224, 192}} - - - - _NS:51 - - - - - - - - - - - - - - - - - - YES - YES - - - - 12 - {{17, 193}, {240, 5}} - - - - _NS:2411 - {0, 0} - - 67108864 - 0 - Box - - - - 3 - MCAwLjgwMDAwMDAxMTkAA - - - 3 - 2 - 0 - NO - - - {{10, 33}, {543, 313}} - - - - _NS:463 - - General - - - - - 2 - - - 256 - - - - 268 - {{5, 236}, {406, 17}} - - - _NS:1535 - YES - - 68157504 - 272630784 - When not using DNSCrypt, use the following static DNS servers: - - _NS:1535 - - - - - NO - - - - 268 - {{8, 206}, {526, 22}} - - - _NS:9 - YES - - -1804599231 - 272630848 - - - Courier - 13 - 16 - - Space-separated list of IP addresses or leave blank for DHCP - _NS:9 - - YES - - - 6 - System - textColor - - - - NSAllRomanInputSourcesLocaleIdentifier - - - NO - - - - 268 - - {{7, 281}, {126, 18}} - - - _NS:9 - YES - - 67108864 - 268435456 - Log DNS queries - - _NS:9 - - 1211912448 - 2 - - - - - 200 - 25 - - NO - - - - 268 - - {{161, 273}, {94, 32}} - - - _NS:9 - YES - - 67108864 - 134217728 - View log - - _NS:9 - - -2038284288 - 129 - - - 200 - 25 - - NO - - - - 268 - {{10, 7}, {169, 141}} - - - _NS:9 - {250, 750} - YES - - -1805647871 - 272629760 - - - Courier - 11 - 16 - - SVAgYWRkcmVzc2VzIChJUHY0L0lQdjYpIHRvIGJsb2NrLuKAqOKAqDIwOC42Ny4wLjI1NeKAqDE5Mi4w -LjQzLjEwCjo6MQ - _NS:9 - - YES - - - - NSAllRomanInputSourcesLocaleIdentifier - - - NO - - - - 268 - {{188, 7}, {169, 141}} - - - _NS:9 - {250, 750} - YES - - -1805647871 - 272629760 - - - RG9tYWluIG5hbWVzIHRvIGJsb2NrLgrigKgqc2V4KgphZHMuKgoqLmV4YW1wbGUuY29t4oCoc3VzcGlj -aW91cy5leGFtcGxlLm5ldA - _NS:9 - - YES - - - - NSAllRomanInputSourcesLocaleIdentifier - - - NO - - - - 268 - {{366, 7}, {169, 141}} - - - _NS:9 - {250, 750} - YES - - -1805647871 - 272629760 - - - Domain names to resolve through the default resolvers instead of OpenDNS.

localdomain
mycompany.example.net - _NS:9 - - YES - - - - NSAllRomanInputSourcesLocaleIdentifier - - - NO - - - - 268 - {{7, 156}, {175, 34}} - - - _NS:9 - {250, 750} - YES - - 67108864 - 272629760 - Block replies containing any of these IP addresses: - - LucidaGrande - 13 - 16 - - _NS:9 - - - - - NO - YES - - - - 268 - {{186, 156}, {175, 34}} - - - _NS:9 - {250, 750} - YES - - 67108864 - 272629760 - Block queries for the following domain names: - - _NS:9 - - - - - NO - YES - - - - 268 - {{363, 156}, {175, 34}} - - - _NS:9 - {250, 750} - YES - - 67108864 - 272629760 - Bypass OpenDNS in order to resolve these domains: - - _NS:9 - - - - - NO - YES - - - - 268 - - {{503, 277}, {25, 25}} - - - _NS:1598 - YES - - 67108864 - 134217728 - - - _NS:1598 - - -2038415360 - 161 - - - 200 - 25 - - NO - - - - 268 - {{467, 284}, {33, 17}} - - - _NS:1535 - YES - - 68157504 - 272630784 - Help - - _NS:1535 - - - - - NO - - - - 12 - - {{9, 265}, {526, 5}} - - - _NS:9 - {0, 0} - - 67108864 - 0 - Box - - - - 3 - MCAwLjgwMDAwMDAxMTkAA - - - 3 - 2 - 0 - NO - - - - -2147483392 - - Apple HTML pasteboard type - Apple PDF pasteboard type - Apple PICT pasteboard type - Apple URL pasteboard type - Apple Web Archive pasteboard type - NSColor pasteboard type - NSFilenamesPboardType - NSStringPboardType - NeXT RTFD pasteboard type - NeXT Rich Text Format v1.0 pasteboard type - NeXT TIFF v4.0 pasteboard type - WebURLsWithTitlesPboardType - public.png - public.url - public.url-name - - {{3, -3}, {536, 278}} - - - _NS:9 - - - - helpWebView - - - - - - - - - - - - - - NO - YES - - - {{10, 33}, {543, 313}} - - - Advanced - - - - - 3 - - - 256 - - - - 256 - - Apple HTML pasteboard type - Apple PDF pasteboard type - Apple PICT pasteboard type - Apple URL pasteboard type - Apple Web Archive pasteboard type - NSColor pasteboard type - NSFilenamesPboardType - NSStringPboardType - NeXT RTFD pasteboard type - NeXT Rich Text Format v1.0 pasteboard type - NeXT TIFF v4.0 pasteboard type - WebURLsWithTitlesPboardType - public.png - public.url - public.url-name - - {{17, 31}, {509, 279}} - - - _NS:51 - - - - NO - YES - - - - 268 - {{437, -5}, {95, 32}} - - - _NS:9 - YES - - 67108864 - 134217728 - Uninstall - - _NS:9 - - -2034876416 - 129 - - - - 200 - 25 - - NO - - - {{10, 33}, {543, 313}} - - _NS:620 - - About - - - - - 4 - - - 256 - - - - 256 - - Apple HTML pasteboard type - Apple PDF pasteboard type - Apple PICT pasteboard type - Apple URL pasteboard type - Apple Web Archive pasteboard type - NSColor pasteboard type - NSFilenamesPboardType - NSStringPboardType - NeXT RTFD pasteboard type - NeXT Rich Text Format v1.0 pasteboard type - NeXT TIFF v4.0 pasteboard type - WebURLsWithTitlesPboardType - public.png - public.url - public.url-name - - {{17, 17}, {509, 293}} - - - _NS:51 - - - - NO - YES - - - {{10, 33}, {543, 313}} - - _NS:620 - - Release Notes - - - - - 5 - - - 256 - - - - 256 - - Apple HTML pasteboard type - Apple PDF pasteboard type - Apple PICT pasteboard type - Apple URL pasteboard type - Apple Web Archive pasteboard type - NSColor pasteboard type - NSFilenamesPboardType - NSStringPboardType - NeXT RTFD pasteboard type - NeXT Rich Text Format v1.0 pasteboard type - NeXT TIFF v4.0 pasteboard type - WebURLsWithTitlesPboardType - public.png - public.url - public.url-name - - {{17, 17}, {509, 293}} - - - _NS:51 - - - - NO - YES - - - {{10, 33}, {543, 313}} - - _NS:610 - - Preview Feedback - - - - - - - 0 - YES - YES - - - - - - {589, 375} - - - - - {{0, 0}, {1366, 746}} - {224.66399999999999, 32} - {10000000000000, 10000000000000} - YES - - - NSObject - - - - - - - _window - - - - 26 - - - - statusText - - - - 304 - - - - currentResolverTextField - - - - 296 - - - - statusImageView - - - - 303 - - - - openDNSLinkPushed: - - - - 326 - - - - previewNotesWebView - - - - 346 - - - - feedbackWebView - - - - 353 - - - - releaseNotesWebView - - - - 355 - - - - aboutWebView - - - - 359 - - - - dnscryptButton - - - - 363 - - - - opendnsButton - - - - 364 - - - - fallbackButton - - - - 365 - - - - familyShieldButton - - - - 366 - - - - dnscryptButtonPressed: - - - - 368 - - - - opendnsButtonPressed: - - - - 369 - - - - familyShieldButtonPressed: - - - - 371 - - - - fallbackButtonPressed: - - - - 372 - - - - aboutTabViewItem - - - - 376 - - - - releaseNotesTabViewItem - - - - 383 - - - - tabView - - - - 384 - - - - uninstallPushed: - - - - 387 - - - - staticResolversTextFieldChanged: - - - - 432 - - - - staticResolversTextField - - - - 433 - - - - viewLogButtonPushed: - - - - 441 - - - - blacklistIPsTextField - - - - 444 - - - - blacklistIPsUpdated: - - - - 445 - - - - blacklistDomainsTextField - - - - 446 - - - - blacklistDomainsUpdated: - - - - 447 - - - - queryLoggingButtonPressed: - - - - 448 - - - - helpWebView - - - - 450 - - - - helpButtonPressed: - - - - 451 - - - - exceptionsTextField - - - - 452 - - - - exceptionsUpdated: - - - - 453 - - - - viewLogButton - - - - 457 - - - - queryLoggingButton - - - - 458 - - - - - - 0 - - - - - - -2 - - - File's Owner - - - -1 - - - First Responder - - - 12 - - - - - - PrefPane - - - 6 - - - - - - - - -3 - - - Application - - - 99 - - - - - - - - - - - - 263 - - - - - 100 - - - - - - - - 103 - - - - - - - - - - - - - - - - - - - - - 281 - - - - - - - - 282 - - - - - 305 - - - - - - - - 306 - - - - - 274 - - - - - - - - 275 - - - - - 179 - - - - - - - - 180 - - - - - 162 - - - - - - - - 163 - - - - - 174 - - - - - - - - 175 - - - - - 139 - - - - - - - - 140 - - - - - 276 - - - - - 216 - - - - - - - - 217 - - - - - 270 - - - - - - - - 271 - - - - - 268 - - - - - - - - 269 - - - - - 323 - - - - - - - - 324 - - - - - 343 - - - - - 345 - - - - - 348 - - - - - - - - 351 - - - - - - - - 349 - - - - - - - - 350 - - - - - - - - 352 - - - - - 354 - - - - - 356 - - - - - - - - 357 - - - - - - - - - 358 - - - - - 385 - - - - - - - - 386 - - - - - 388 - - - - - - - - 389 - - - - - - - - - - - - - - - - - - - - - 390 - - - - - - - - 391 - - - - - 392 - - - - - - - - 393 - - - - - 398 - - - - - - - - 399 - - - - - 400 - - - - - - - - 401 - - - - - 402 - - - - - - - - 403 - - - - - 404 - - - - - - - - 405 - - - - - 406 - - - - - - - - 407 - - - - - 408 - - - - - - - - 409 - - - - - 410 - - - - - - - - 411 - - - - - 412 - - - - - - - - 413 - - - - - 416 - - - - - - - - 417 - - - - - 423 - - - - - - - - 424 - - - - - 425 - - - - - 449 - - - - - - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - {{132, 373}, {668, 368}} - - - AccessibilityDescription - - Always enable OpenDNS - - - ToolTip - - Use OpenDNS even when DNSCrypt is not in use - - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - - AccessibilityDescription - - Enable DNSCrypt - - - ToolTip - - Use OpenDNS resolvers with the DNSCrypt protocol - - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - AccessibilityDescription - - AccessibilityDescription - - OpenDNS logo - - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - - AccessibilityDescription - - Fallback to insecure DNS - - - ToolTip - - Only check this box if you often have to connect to public WiFi hotspots and you don't want to manually disable DNSCrypt in order to pass a captive portal. - - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - - AccessibilityDescription - - Always use Familyshield - - - ToolTip - - Use FamilyShield even when DNSCrypt is not in use. - - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.WebKitIBPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.WebKitIBPlugin - com.apple.WebKitIBPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.WebKitIBPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - - AccessibilityDescription - - Static DNS servers - - - ToolTip - - Leave empty to use DHCP-provided servers - - - com.apple.InterfaceBuilder.CocoaPlugin - - AccessibilityDescription - - AccessibilityDescription - - Log DNS queries - - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - AccessibilityDescription - - AccessibilityDescription - - View the DNS query log - - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - AccessibilityDescription - - AccessibilityDescription - - Static DNS resolvers - - - com.apple.WebKitIBPlugin - - - - - com.apple.InterfaceBuilder.CocoaPlugin - - InitialTabViewItem - - InitialTabViewItem - - - - - com.apple.InterfaceBuilder.CocoaPlugin - - - - - - 458 - - - - - DNSCrypt - NSPreferencePane - - NSTextField - NSTextField - NSButton - NSTextField - NSButton - NSButton - NSButton - NSButton - NSButton - NSButtonCell - NSTextField - NSButton - NSButton - - - - blacklistDomainsUpdated: - NSTextField - - - blacklistIPsUpdated: - NSTextField - - - dnscryptButtonPressed: - NSButton - - - exceptionsUpdated: - NSTextField - - - fallbackButtonPressed: - NSButton - - - familyShieldButtonPressed: - NSButton - - - helpButtonPressed: - NSButton - - - openDNSLinkPushed: - NSButton - - - opendnsButtonPressed: - NSButton - - - queryLoggingButtonPressed: - NSButtonCell - - - staticResolversTextFieldChanged: - NSTextField - - - uninstallPushed: - NSButton - - - viewLogButtonPushed: - NSButton - - - - NSTabViewItem - WebView - NSTextField - NSTextField - NSTextField - NSButton - NSTextField - NSButton - NSButton - WebView - WebView - NSButton - WebView - NSButton - NSTabViewItem - WebView - NSTextFieldCell - NSImageView - NSTextField - NSTabView - NSButton - - - - aboutTabViewItem - NSTabViewItem - - - aboutWebView - WebView - - - blacklistDomainsTextField - NSTextField - - - blacklistIPsTextField - NSTextField - - - currentResolverTextField - NSTextField - - - dnscryptButton - NSButton - - - exceptionsTextField - NSTextField - - - fallbackButton - NSButton - - - familyShieldButton - NSButton - - - feedbackWebView - WebView - - - helpWebView - WebView - - - opendnsButton - NSButton - - - previewNotesWebView - WebView - - - queryLoggingButton - NSButton - - - releaseNotesTabViewItem - NSTabViewItem - - - releaseNotesWebView - WebView - - - staticResolversTextField - NSTextFieldCell - - - statusImageView - NSImageView - - - statusText - NSTextField - - - tabView - NSTabView - - - viewLogButton - NSButton - - - - IBProjectSource - ./Classes/DNSCrypt.h - - - - NSPreferencePane - NSObject - - NSView - NSView - NSView - NSWindow - - - - _firstKeyView - NSView - - - _initialKeyView - NSView - - - _lastKeyView - NSView - - - _window - NSWindow - - - - IBProjectSource - ./Classes/NSPreferencePane.h - - - - - 0 - IBCocoaFramework - - com.apple.InterfaceBuilder.CocoaPlugin.macosx - - - YES - 3 - - {15, 15} - {35, 35} - {300, 119} - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + NSAllRomanInputSourcesLocaleIdentifier + + + + + + + + + + + + + + + IP addresses (IPv4/IPv6) to block.

208.67.0.255
192.0.43.10 +::1 + + + + NSAllRomanInputSourcesLocaleIdentifier + + + + + + + + + + + + Domain names to block. +
*sex* +ads.* +*.example.com
suspicious.example.net + + + + NSAllRomanInputSourcesLocaleIdentifier + + + + + + + + + + + + + + + NSAllRomanInputSourcesLocaleIdentifier + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/DNSCrypt-Preference-Pane/DNSCrypt/extra/html/releasenotes.haml b/DNSCrypt-Preference-Pane/DNSCrypt/extra/html/releasenotes.haml index 627b883..87ba6a4 100644 --- a/DNSCrypt-Preference-Pane/DNSCrypt/extra/html/releasenotes.haml +++ b/DNSCrypt-Preference-Pane/DNSCrypt/extra/html/releasenotes.haml @@ -21,6 +21,13 @@ %body %h1 Release Notes for the user interface + %article + %h2 Version 0.21 by AlterStep + %time Thu, 17 Apr 2014 + %ul + %li Mavericks support + %li dnscrypt-proxy 1.4.0 + %article %h2 Version 0.19 %time Wed, 10 Oct 2012 diff --git a/DNSCrypt-Preference-Pane/DNSCrypt/extra/html/releasenotes.html b/DNSCrypt-Preference-Pane/DNSCrypt/extra/html/releasenotes.html index 1c1a740..dd15bd4 100644 --- a/DNSCrypt-Preference-Pane/DNSCrypt/extra/html/releasenotes.html +++ b/DNSCrypt-Preference-Pane/DNSCrypt/extra/html/releasenotes.html @@ -1,28 +1,38 @@ - + Release notes for the user interface

    Release Notes for the user interface

    +
    +

    Version 0.21 by AlterStep

    + +
      +
    • Mavericks support
      • +
    • dnscrypt-proxy 1.4.0
      • +
    +

    Version 0.19

    diff --git a/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/lib/libldns.1.dylib b/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/lib/libldns.1.dylib old mode 100755 new mode 100644 index 7635405..d68b28a Binary files a/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/lib/libldns.1.dylib and b/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/lib/libldns.1.dylib differ diff --git a/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/scripts/common.inc b/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/scripts/common.inc index fbf403f..efbe842 100644 --- a/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/scripts/common.inc +++ b/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/scripts/common.inc @@ -37,6 +37,9 @@ INTERFACE_PROXY_MASK="24" INTERFACE_PROBES="127.0.0.55" INTERFACE_PROBES_MASK="24" +PROVIDER_NAME='2.dnscrypt-cert.opendns.com' +PROVIDER_KEY='B735:1140:206F:225D:3E2B:D822:D7FD:691E:A1C3:3CC8:D666:8D0C:BE04:BFAB:CA43:FB79' + DOMAINS_EXCEPTIONS=' freebox.fr fritz.box intranet lan localdomain nowtv.com private routerlogin.net l ' diff --git a/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/scripts/start-dnscrypt-proxy.sh b/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/scripts/start-dnscrypt-proxy.sh index 3e131ad..ead2f14 100755 --- a/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/scripts/start-dnscrypt-proxy.sh +++ b/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/scripts/start-dnscrypt-proxy.sh @@ -32,6 +32,7 @@ try_resolver() { rm -f "${RES_DIR}/${priority}" exec alarmer 3 dnscrypt-proxy --pid="$pid_file" \ + --provider-name="$PROVIDER_NAME" --provider-key="$PROVIDER_KEY" \ --local-address="${INTERFACE_PROBES}:${priority}" $args 2>&1 | \ while read line; do case "$line" in @@ -135,6 +136,7 @@ fi best_args=$(cat "${RES_DIR}/${best_file}") eval dnscrypt-proxy $best_args --local-address="$INTERFACE_PROXY" \ + --provider-name="$PROVIDER_NAME" --provider-key="$PROVIDER_KEY" \ --pidfile="$PROXY_PID_FILE" --user=daemon --daemonize $plugin_args if [ $? != 0 ]; then @@ -146,6 +148,7 @@ if [ $? != 0 ]; then killall -9 dnscrypt-proxy sleep 1 eval dnscrypt-proxy $best_args --local-address="$INTERFACE_PROXY" \ + --provider-name="$PROVIDER_NAME" --provider-key="$PROVIDER_KEY" \ --pidfile="$PROXY_PID_FILE" --user=daemon --daemonize $plugin_args || \ exit 1 fi