Replace Keychain.framework with lightweight implementation of Extendmac. Fixes issue #2001.

This commit is contained in:
David Kocher
2008-12-30 12:45:10 +00:00
parent 329decdf5b
commit 1ec89918a3
5 changed files with 70 additions and 42 deletions
+16 -2
View File
@@ -1,7 +1,7 @@
{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf430
{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
{\colortbl;\red255\green255\blue255;}
\paperw11900\paperh16840\margl1440\margr1440\vieww17800\viewh19900\viewkind0
\paperw11900\paperh16840\margl1440\margr1440\vieww22020\viewh14080\viewkind0
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
\f0\b\fs28 \cf0 Acknowledgements \
@@ -461,4 +461,18 @@ Redistribution and use in source and binary forms, with or without modification,
- Neither the name of the Git Development Community nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.\
\
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\
}
\
\pard\tqr\tx2040\tx2235\ql\qnatural\pardirnatural
\b\fs24 \cf0 Brian Amerige of Extendmac, LLC. \'96 EMKeychain\
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
\i\b0 \cf0 Copyright (c) 2007 Extendmac, LLC. All Rights Reserved.
\i0\fs22 \
\pard\tqr\tx2040\tx2235\li1140\ql\qnatural\pardirnatural
\cf0 \
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:\
\
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.\
\
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. }
+3 -3
View File
@@ -1,7 +1,7 @@
{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf330
{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf430
{\fonttbl\f0\froman\fcharset0 Times-Roman;}
{\colortbl;\red255\green255\blue255;\red128\green128\blue128;}
\paperw11900\paperh16840\margl1440\margr1440\vieww17800\viewh22000\viewkind0
\paperw11900\paperh16840\margl1440\margr1440\vieww17800\viewh14080\viewkind0
\pard\tqr\tx2040\tx2235\ql\qnatural\pardirnatural
\f0\fs24 \cf2 \
@@ -17,7 +17,6 @@
\cf2 {\field{\*\fldinst{HYPERLINK "http://jakarta.apache.org/commons/net/"}}{\fldrslt Jakarta Commons Net}}\cf0 Apache Foundation\
\cf2 {\field{\*\fldinst{HYPERLINK "http://jakarta.apache.org/slide/"}}{\fldrslt Jakarta Slide}}\cf0 Apache Foundation\
\cf2 {\field{\*\fldinst{HYPERLINK "http://jets3t.s3.amazonaws.com/index.html"}}{\fldrslt JetS3t}}\cf0 James Murty\
\cf2 {\field{\*\fldinst{HYPERLINK "http://keychain.sf.net"}}{\fldrslt Keychain Framework}}\cf0 Wade Tregaskis\
\cf2 {\field{\*\fldinst{HYPERLINK "http://growl.info"}}{\fldrslt Growl Framework}}\cf0 \
Christopher Forsythe et al.\
@@ -30,6 +29,7 @@
\cf2 {\field{\*\fldinst{HYPERLINK "http://www.snoize.com/"}}{\fldrslt SNDisclosableView}}\cf0 Kurt Revis\
\cf2 {\field{\*\fldinst{HYPERLINK "http://www.macfoh.com/"}}{\fldrslt SKWSegmentedControl}}\cf0 Shaun Wexler\
\cf2 {\field{\*\fldinst{HYPERLINK "http://svn.oofn.net/"}}{\fldrslt CTGradient}}\cf0 Chad Weider\
\cf2 {\field{\*\fldinst{HYPERLINK "http://extendmac.com/EMKeychain/"}}{\fldrslt EMKeychain}}\cf0 Brian Amerige\
\b0 \cf2 \
Dashboard Widget
+24 -6
View File
@@ -81,7 +81,6 @@
4739EFBB0856991200405FD3 /* JavaVM.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4725BE0A05D2E27000C7CCBD /* JavaVM.framework */; };
4739EFBC0856991200405FD3 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; };
4739EFBD0856991200405FD3 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 479982AF05F54B1600F81519 /* Carbon.framework */; };
4739F01808569A8100405FD3 /* Keychain.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4739EFFB08569A8100405FD3 /* Keychain.framework */; };
4739F04508569B5E00405FD3 /* Growl.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4739F03D08569B5E00405FD3 /* Growl.framework */; };
473D6C680EED5134008F3B04 /* me.png in Resources */ = {isa = PBXBuildFile; fileRef = 473D6C670EED5134008F3B04 /* me.png */; };
474163C106C4F64100AC0BD2 /* Info.nib in Resources */ = {isa = PBXBuildFile; fileRef = 474163A306C4F64000AC0BD2 /* Info.nib */; };
@@ -126,6 +125,10 @@
4741686B06C6BA9400AC0BD2 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 4741686906C6BA9400AC0BD2 /* Localizable.strings */; };
47457F8E09980270002C93C3 /* UKCrashReporter.h in Headers */ = {isa = PBXBuildFile; fileRef = 47457F8C09980270002C93C3 /* UKCrashReporter.h */; };
47457F8F09980270002C93C3 /* UKCrashReporter.m in Sources */ = {isa = PBXBuildFile; fileRef = 47457F8D09980270002C93C3 /* UKCrashReporter.m */; };
47462ADD0F0A473D0075CBA9 /* EMKeychainItem.h in Headers */ = {isa = PBXBuildFile; fileRef = 47462AD90F0A473D0075CBA9 /* EMKeychainItem.h */; };
47462ADE0F0A473D0075CBA9 /* EMKeychainItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 47462ADA0F0A473D0075CBA9 /* EMKeychainItem.m */; };
47462ADF0F0A473D0075CBA9 /* EMKeychainProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 47462ADB0F0A473D0075CBA9 /* EMKeychainProxy.h */; };
47462AE00F0A473D0075CBA9 /* EMKeychainProxy.m in Sources */ = {isa = PBXBuildFile; fileRef = 47462ADC0F0A473D0075CBA9 /* EMKeychainProxy.m */; };
47494C4007EC6B4200B34D53 /* CDOutlineView.m in Sources */ = {isa = PBXBuildFile; fileRef = 47494C3C07EC6B4200B34D53 /* CDOutlineView.m */; };
47494C4107EC6B4200B34D53 /* CDOutlineView.h in Headers */ = {isa = PBXBuildFile; fileRef = 47494C3D07EC6B4200B34D53 /* CDOutlineView.h */; };
47494C4207EC6B4200B34D53 /* CDListView.m in Sources */ = {isa = PBXBuildFile; fileRef = 47494C3E07EC6B4200B34D53 /* CDListView.m */; };
@@ -215,7 +218,6 @@
47BEDB130B92968E00141EB4 /* URLSchemeHandlerConfiguration.m in Sources */ = {isa = PBXBuildFile; fileRef = 47BEDB0F0B92967600141EB4 /* URLSchemeHandlerConfiguration.m */; };
47BEDBD30B9296C800141EB4 /* ApplicationServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 47BEDBD20B9296C800141EB4 /* ApplicationServices.framework */; };
47C261A90859014400765C4A /* Growl.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 4739F03D08569B5E00405FD3 /* Growl.framework */; };
47C261AA0859014400765C4A /* Keychain.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 4739EFFB08569A8100405FD3 /* Keychain.framework */; };
47CD32A10751163400B82A2B /* plus.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 47CD32A00751163400B82A2B /* plus.tiff */; };
47D3275B0F0828C800619C38 /* disk.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 47D3275A0F0828C800619C38 /* disk.tiff */; };
47D327720F08291F00619C38 /* idisk.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 47D327710F08291F00619C38 /* idisk.tiff */; };
@@ -348,7 +350,6 @@
4773DCC90A73C0C600AB81E6 /* Sparkle.framework in CopyFiles */,
47DC8F0D0869A44E00B9DD7D /* DotMacKit.framework in CopyFiles */,
47C261A90859014400765C4A /* Growl.framework in CopyFiles */,
47C261AA0859014400765C4A /* Keychain.framework in CopyFiles */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -597,7 +598,6 @@
4739EFA20856990000405FD3 /* libGrowl.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libGrowl.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
4739EFB00856990900405FD3 /* libProxy.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libProxy.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
4739EFC10856991300405FD3 /* libLocal.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libLocal.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
4739EFFB08569A8100405FD3 /* Keychain.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Keychain.framework; path = build/Keychain.framework; sourceTree = "<group>"; };
4739F03D08569B5E00405FD3 /* Growl.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Growl.framework; path = build/Growl.framework; sourceTree = "<group>"; };
473D6C670EED5134008F3B04 /* me.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = me.png; sourceTree = "<group>"; };
474152F106C4F08A00AC0BD2 /* Proxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Proxy.h; sourceTree = "<group>"; };
@@ -839,6 +839,10 @@
4743003109596BD900848A35 /* cy */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = cy; path = cy.lproj/Status.strings; sourceTree = "<group>"; };
47457F8C09980270002C93C3 /* UKCrashReporter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UKCrashReporter.h; sourceTree = "<group>"; };
47457F8D09980270002C93C3 /* UKCrashReporter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UKCrashReporter.m; sourceTree = "<group>"; };
47462AD90F0A473D0075CBA9 /* EMKeychainItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EMKeychainItem.h; sourceTree = "<group>"; };
47462ADA0F0A473D0075CBA9 /* EMKeychainItem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EMKeychainItem.m; sourceTree = "<group>"; };
47462ADB0F0A473D0075CBA9 /* EMKeychainProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EMKeychainProxy.h; sourceTree = "<group>"; };
47462ADC0F0A473D0075CBA9 /* EMKeychainProxy.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EMKeychainProxy.m; sourceTree = "<group>"; };
47494C3C07EC6B4200B34D53 /* CDOutlineView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CDOutlineView.m; sourceTree = "<group>"; };
47494C3D07EC6B4200B34D53 /* CDOutlineView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CDOutlineView.h; sourceTree = "<group>"; };
47494C3E07EC6B4200B34D53 /* CDListView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CDListView.m; sourceTree = "<group>"; };
@@ -1497,7 +1501,6 @@
files = (
4739EF6D0856981300405FD3 /* JavaVM.framework in Frameworks */,
4739EF6E0856981300405FD3 /* Foundation.framework in Frameworks */,
4739F01808569A8100405FD3 /* Keychain.framework in Frameworks */,
476847090D99502A0090077B /* Security.framework in Frameworks */,
475D461D0D9953CD009450C4 /* SecurityInterface.framework in Frameworks */,
);
@@ -1624,7 +1627,6 @@
475599FD0A72AE6200B5DCDB /* Sparkle.framework */,
47DC7F4308694B5A00B9DD7D /* DotMacKit.framework */,
4739F03D08569B5E00405FD3 /* Growl.framework */,
4739EFFB08569A8100405FD3 /* Keychain.framework */,
47983764072AD73700FA3CDB /* Security.framework */,
47C761EA06A88D7600B464FF /* SystemConfiguration.framework */,
476DEBE10629C6FB005EF4B1 /* CoreFoundation.framework */,
@@ -1775,6 +1777,7 @@
4741532B06C4F08A00AC0BD2 /* com */ = {
isa = PBXGroup;
children = (
47462AD80F0A473D0075CBA9 /* extendmac */,
47152E180D9F2586003D8AE4 /* macfoh */,
477B1B7B0AF384350023BA7F /* snoize */,
);
@@ -1939,6 +1942,17 @@
path = zathras;
sourceTree = "<group>";
};
47462AD80F0A473D0075CBA9 /* extendmac */ = {
isa = PBXGroup;
children = (
47462AD90F0A473D0075CBA9 /* EMKeychainItem.h */,
47462ADA0F0A473D0075CBA9 /* EMKeychainItem.m */,
47462ADB0F0A473D0075CBA9 /* EMKeychainProxy.h */,
47462ADC0F0A473D0075CBA9 /* EMKeychainProxy.m */,
);
path = extendmac;
sourceTree = "<group>";
};
476691820DAA874100DAE443 /* quicklook */ = {
isa = PBXGroup;
children = (
@@ -2082,6 +2096,8 @@
buildActionMask = 2147483647;
files = (
4739EF690856981300405FD3 /* Keychain.h in Headers */,
47462ADD0F0A473D0075CBA9 /* EMKeychainItem.h in Headers */,
47462ADF0F0A473D0075CBA9 /* EMKeychainProxy.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -2787,6 +2803,8 @@
buildActionMask = 2147483647;
files = (
4739EF6B0856981300405FD3 /* Keychain.m in Sources */,
47462ADE0F0A473D0075CBA9 /* EMKeychainItem.m in Sources */,
47462AE00F0A473D0075CBA9 /* EMKeychainProxy.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
-6
View File
@@ -2,12 +2,6 @@
#include <jni.h>
/* Header for class ch_cyberduck_core_Keychain */
#import <Security/Security.h>
#import <SecurityInterface/SFCertificateTrustPanel.h>
#import <Keychain/Keychain.h>
#import <Keychain/Trust.h>
#import <Keychain/KeychainSearch.h>
#ifndef _Included_ch_cyberduck_core_Keychain
#define _Included_ch_cyberduck_core_Keychain
#ifdef __cplusplus
+27 -25
View File
@@ -16,7 +16,13 @@
* dkocher@cyberduck.ch
*/
#import <Security/Security.h>
#import <SecurityInterface/SFCertificateTrustPanel.h>
#import "Keychain.h"
#import "EMKeychainProxy.h"
#import "EMKeychainItem.h"
// Simple utility to convert java strings to NSStrings
NSString *convertToNSString(JNIEnv *env, jstring javaString)
@@ -55,44 +61,40 @@ SecProtocolType convertToSecProtocolType(JNIEnv *env, jstring jProtocol)
return kSecProtocolTypeAny;
}
JNIEXPORT jstring JNICALL Java_ch_cyberduck_core_Keychain_getInternetPasswordFromKeychain(JNIEnv *env, jobject this, jstring jProtocol, jint port, jstring jService,jstring jAccount)
JNIEXPORT jstring JNICALL Java_ch_cyberduck_core_Keychain_getInternetPasswordFromKeychain(JNIEnv *env, jobject this, jstring jProtocol, jint port, jstring jService,jstring jUsername)
{
NSString *password = [[Keychain defaultKeychain] passwordForInternetServer:convertToNSString(env, jService)
forAccount:convertToNSString(env, jAccount)
port:port
path:@""
inSecurityDomain:@""
protocol:convertToSecProtocolType(env, jProtocol)
auth:kSecAuthenticationTypeDefault];
return (*env)->NewStringUTF(env, [password UTF8String]);
EMInternetKeychainItem *keychainItem = [[EMKeychainProxy sharedProxy] internetKeychainItemForServer:convertToNSString(env, jService)
withUsername:convertToNSString(env, jUsername)
path:nil
port:port
protocol:convertToSecProtocolType(env, jProtocol)];
return (*env)->NewStringUTF(env, [[keychainItem password] UTF8String]);
}
JNIEXPORT jstring JNICALL Java_ch_cyberduck_core_Keychain_getPasswordFromKeychain(JNIEnv *env, jobject this, jstring jService, jstring jAccount)
JNIEXPORT jstring JNICALL Java_ch_cyberduck_core_Keychain_getPasswordFromKeychain(JNIEnv *env, jobject this, jstring jService, jstring jUsername)
{
NSString *password = [[Keychain defaultKeychain] passwordForGenericService:convertToNSString(env, jService)
forAccount:convertToNSString(env, jAccount)];
return (*env)->NewStringUTF(env, [password UTF8String]);
EMGenericKeychainItem *keychainItem = [[EMKeychainProxy sharedProxy] genericKeychainItemForService:convertToNSString(env, jService)
withUsername:convertToNSString(env, jUsername)];
return (*env)->NewStringUTF(env, [[keychainItem password] UTF8String]);
}
JNIEXPORT void JNICALL Java_ch_cyberduck_core_Keychain_addInternetPasswordToKeychain(JNIEnv *env, jobject this, jstring jProtocol, jint port, jstring jService, jstring jUsername, jstring jPassword
)
{
[[Keychain defaultKeychain] addInternetPassword:convertToNSString(env, jPassword)
onServer:convertToNSString(env, jService)
forAccount:convertToNSString(env, jUsername)
port:port
path:@""
inSecurityDomain:@""
protocol:convertToSecProtocolType(env, jProtocol)
auth:kSecAuthenticationTypeDefault
replaceExisting:YES];
[[EMKeychainProxy sharedProxy] addInternetKeychainItemForServer:convertToNSString(env, jService)
withUsername:convertToNSString(env, jUsername)
password:convertToNSString(env, jPassword)
path:nil
port:port
protocol:convertToSecProtocolType(env, jProtocol)];
}
JNIEXPORT void JNICALL Java_ch_cyberduck_core_Keychain_addPasswordToKeychain(JNIEnv *env, jobject this, jstring jService, jstring jUsername, jstring jPass)
{
[[Keychain defaultKeychain] addGenericPassword:convertToNSString(env, jPass) onService:convertToNSString(env, jService) forAccount:convertToNSString(env, jUsername) replaceExisting:YES];
[[EMKeychainProxy sharedProxy] addGenericKeychainItemForService:convertToNSString(env, jService)
withUsername:convertToNSString(env, jUsername)
password:convertToNSString(env, jPass)];
}
NSArray* Java_ch_cyberduck_core_Keychain_createCertificatesFromData(JNIEnv *env, jobjectArray jCertificates)