Adium

Changeset 25607

Show
Ignore:
Timestamp:
11/20/2008 04:59:07 AM (2 months ago)
Author:
catfish_man
Message:

Switch from our own copy of sha1 to using libcrypto. warnings--

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/Adium.xcodeproj/project.pbxproj

    r25598 r25607  
    10581058                4947F6330655E90D00B791E5 /* AWEzvXMLNode.m in Sources */ = {isa = PBXBuildFile; fileRef = 4947F6010655E90D00B791E5 /* AWEzvXMLNode.m */; }; 
    10591059                4947F6350655E90D00B791E5 /* AWEzvXMLStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 4947F6030655E90D00B791E5 /* AWEzvXMLStream.m */; }; 
    1060                 4947F6360655E90D00B791E5 /* sha1.c in Sources */ = {isa = PBXBuildFile; fileRef = 4947F6040655E90D00B791E5 /* sha1.c */; }; 
    10611060                49778165067F558700401CC7 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 34E839050583207E00F2AADB /* SystemConfiguration.framework */; }; 
    10621061                4B03711606595A70008F5981 /* Template.html in Resources */ = {isa = PBXBuildFile; fileRef = 4B03711506595A70008F5981 /* Template.html */; }; 
    …… 
    11851184                634BCD1F0DDC1542005AF1C2 /* TestMutableStringAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 634BCD1E0DDC1542005AF1C2 /* TestMutableStringAdditions.m */; }; 
    11861185                6360B25A0BF2EB93004CD99B /* AIWebKitDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 6360B2590BF2EB93004CD99B /* AIWebKitDelegate.m */; }; 
     1186                636C6E4C0ED56C2A00E0E528 /* libcrypto.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 636C6E4B0ED56C2A00E0E528 /* libcrypto.dylib */; }; 
    11871187                636D8C980E4E95A500E5F558 /* AIAddressBookController.m in Sources */ = {isa = PBXBuildFile; fileRef = 636D8C970E4E95A500E5F558 /* AIAddressBookController.m */; }; 
    11881188                636D92790E4E95CE00E5F558 /* AIAddressBookController.h in Headers */ = {isa = PBXBuildFile; fileRef = 34E2A2EE07B018B1006735BC /* AIAddressBookController.h */; settings = {ATTRIBUTES = (Public, ); }; }; 
    …… 
    38083808                4947F5D40655E90C00B791E5 /* AWEzvContact.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AWEzvContact.h; sourceTree = "<group>"; }; 
    38093809                4947F5D50655E90C00B791E5 /* AWEzvContact.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AWEzvContact.m; sourceTree = "<group>"; }; 
    3810                 4947F5D70655E90C00B791E5 /* COPYING */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = COPYING; sourceTree = "<group>"; }; 
    3811                 4947F5D80655E90C00B791E5 /* expat_config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = expat_config.h; sourceTree = "<group>"; }; 
    3812                 4947F5DA0655E90C00B791E5 /* ascii.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ascii.h; sourceTree = "<group>"; }; 
    3813                 4947F5DB0655E90C00B791E5 /* asciitab.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = asciitab.h; sourceTree = "<group>"; }; 
    3814                 4947F5DC0655E90C00B791E5 /* expat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = expat.h; sourceTree = "<group>"; }; 
    3815                 4947F5DD0655E90C00B791E5 /* iasciitab.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = iasciitab.h; sourceTree = "<group>"; }; 
    3816                 4947F5DE0655E90C00B791E5 /* internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = internal.h; sourceTree = "<group>"; }; 
    3817                 4947F5DF0655E90C00B791E5 /* latin1tab.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = latin1tab.h; sourceTree = "<group>"; }; 
    3818                 4947F5E00655E90C00B791E5 /* nametab.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = nametab.h; sourceTree = "<group>"; }; 
    3819                 4947F5E10655E90C00B791E5 /* utf8tab.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = utf8tab.h; sourceTree = "<group>"; }; 
    3820                 4947F5E20655E90C00B791E5 /* xmlparse.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = xmlparse.c; sourceTree = "<group>"; }; 
    3821                 4947F5E30655E90C00B791E5 /* xmlrole.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = xmlrole.c; sourceTree = "<group>"; }; 
    3822                 4947F5E40655E90C00B791E5 /* xmlrole.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = xmlrole.h; sourceTree = "<group>"; }; 
    3823                 4947F5E50655E90C00B791E5 /* xmltok.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = xmltok.c; sourceTree = "<group>"; }; 
    3824                 4947F5E60655E90C00B791E5 /* xmltok.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = xmltok.h; sourceTree = "<group>"; }; 
    3825                 4947F5E70655E90C00B791E5 /* xmltok_impl.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = xmltok_impl.c; sourceTree = "<group>"; }; 
    3826                 4947F5E80655E90C00B791E5 /* xmltok_impl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = xmltok_impl.h; sourceTree = "<group>"; }; 
    38273810                4947F5EB0655E90C00B791E5 /* LICENSE */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = LICENSE; sourceTree = "<group>"; }; 
    38283811                4947F5ED0655E90C00B791E5 /* AWEzvDefines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AWEzvDefines.h; sourceTree = "<group>"; }; 
    …… 
    38483831                4947F6020655E90D00B791E5 /* AWEzvXMLStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AWEzvXMLStream.h; sourceTree = "<group>"; }; 
    38493832                4947F6030655E90D00B791E5 /* AWEzvXMLStream.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AWEzvXMLStream.m; sourceTree = "<group>"; }; 
    3850                 4947F6040655E90D00B791E5 /* sha1.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sha1.c; sourceTree = "<group>"; }; 
    3851                 4947F6050655E90D00B791E5 /* sha1.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sha1.h; sourceTree = "<group>"; }; 
    38523833                4B0149050733D3A4001A4C57 /* AICoreComponentLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AICoreComponentLoader.h; path = Source/AICoreComponentLoader.h; sourceTree = "<group>"; }; 
    38533834                4B0149060733D3A5001A4C57 /* AICoreComponentLoader.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AICoreComponentLoader.m; path = Source/AICoreComponentLoader.m; sourceTree = "<group>"; }; 
    …… 
    41204101                636AB7F1087E2B6700A87670 /* AIDockBadger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AIDockBadger.h; sourceTree = "<group>"; }; 
    41214102                636AB7F2087E2B6700A87670 /* AIDockBadger.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AIDockBadger.m; sourceTree = "<group>"; }; 
     4103                636C6A1F0ED5675100E0E528 /* Kernel.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Kernel.framework; path = /System/Library/Frameworks/Kernel.framework; sourceTree = "<absolute>"; }; 
     4104                636C6E4B0ED56C2A00E0E528 /* libcrypto.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcrypto.dylib; path = /usr/lib/libcrypto.dylib; sourceTree = "<absolute>"; }; 
    41224105                636D8C970E4E95A500E5F558 /* AIAddressBookController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIAddressBookController.m; path = "Frameworks/Adium Framework/Source/AIAddressBookController.m"; sourceTree = "<group>"; }; 
    41234106                636D93660E4E9FD300E5F558 /* AdiumAddressBookAction_Yahoo.scpt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.scpt; name = AdiumAddressBookAction_Yahoo.scpt; path = "Frameworks/Adium Framework/Resources/AdiumAddressBookAction_Yahoo.scpt"; sourceTree = "<group>"; }; 
    …… 
    45314514                                3448761606D1EC3000DA778C /* Cocoa.framework in Frameworks */, 
    45324515                                6341AEFF0E53A09C00AE1439 /* libexpat.dylib in Frameworks */, 
     4516                                636C6E4C0ED56C2A00E0E528 /* libcrypto.dylib in Frameworks */, 
    45334517                        ); 
    45344518                        runOnlyForDeploymentPostprocessing = 0; 
    …… 
    46574641                        isa = PBXGroup; 
    46584642                        children = ( 
     4643                                636C6E4B0ED56C2A00E0E528 /* libcrypto.dylib */, 
     4644                                636C6A1F0ED5675100E0E528 /* Kernel.framework */, 
    46594645                                4BE9FFE7055981AB00359B15 /* Adium.pch */, 
    46604646                                F59DB3D6033EA9CD01A8010A /* AIAdium.h */, 
    …… 
    62906276                        children = ( 
    62916277                                4947F5D10655E90C00B791E5 /* Classes */, 
    6292                                 4947F5D60655E90C00B791E5 /* expat */, 
    62936278                                4947F5EB0655E90C00B791E5 /* LICENSE */, 
    62946279                                4947F5EC0655E90C00B791E5 /* Other Sources */, 
    …… 
    63096294                        ); 
    63106295                        path = Classes; 
    6311                         sourceTree = "<group>"; 
    6312                 }; 
    6313                 4947F5D60655E90C00B791E5 /* expat */ = { 
    6314                         isa = PBXGroup; 
    6315                         children = ( 
    6316                                 4947F5D70655E90C00B791E5 /* COPYING */, 
    6317                                 4947F5D80655E90C00B791E5 /* expat_config.h */, 
    6318                                 4947F5D90655E90C00B791E5 /* lib */, 
    6319                         ); 
    6320                         path = expat; 
    6321                         sourceTree = "<group>"; 
    6322                 }; 
    6323                 4947F5D90655E90C00B791E5 /* lib */ = { 
    6324                         isa = PBXGroup; 
    6325                         children = ( 
    6326                                 4947F5DA0655E90C00B791E5 /* ascii.h */, 
    6327                                 4947F5DB0655E90C00B791E5 /* asciitab.h */, 
    6328                                 4947F5DC0655E90C00B791E5 /* expat.h */, 
    6329                                 4947F5DD0655E90C00B791E5 /* iasciitab.h */, 
    6330                                 4947F5DE0655E90C00B791E5 /* internal.h */, 
    6331                                 4947F5DF0655E90C00B791E5 /* latin1tab.h */, 
    6332                                 4947F5E00655E90C00B791E5 /* nametab.h */, 
    6333                                 4947F5E10655E90C00B791E5 /* utf8tab.h */, 
    6334                                 4947F5E20655E90C00B791E5 /* xmlparse.c */, 
    6335                                 4947F5E30655E90C00B791E5 /* xmlrole.c */, 
    6336                                 4947F5E40655E90C00B791E5 /* xmlrole.h */, 
    6337                                 4947F5E50655E90C00B791E5 /* xmltok.c */, 
    6338                                 4947F5E60655E90C00B791E5 /* xmltok.h */, 
    6339                                 4947F5E70655E90C00B791E5 /* xmltok_impl.c */, 
    6340                                 4947F5E80655E90C00B791E5 /* xmltok_impl.h */, 
    6341                         ); 
    6342                         path = lib; 
    63436296                        sourceTree = "<group>"; 
    63446297                }; 
    …… 
    63806333                                4947F6020655E90D00B791E5 /* AWEzvXMLStream.h */, 
    63816334                                4947F6030655E90D00B791E5 /* AWEzvXMLStream.m */, 
    6382                                 4947F6040655E90D00B791E5 /* sha1.c */, 
    6383                                 4947F6050655E90D00B791E5 /* sha1.h */, 
    63846335                        ); 
    63856336                        path = "Private Classes"; 
    …… 
    98719822                                4947F6330655E90D00B791E5 /* AWEzvXMLNode.m in Sources */, 
    98729823                                4947F6350655E90D00B791E5 /* AWEzvXMLStream.m in Sources */, 
    9873                                 4947F6360655E90D00B791E5 /* sha1.c in Sources */, 
    98749824                                34F4675E080F46AC007800AB /* ESBonjourAccountViewController.m in Sources */, 
    98759825                                34F46760080F46AC007800AB /* AWBonjourPlugin.m in Sources */, 

  • trunk/Plugins/Bonjour/libezv/Private Classes/AWEzvContactManagerRendezvous.m

    r25604 r25607  
    4343#include <dns_sd.h> 
    4444 
    45 #include "sha1.h" 
     45#include <openssl/sha.h> 
    4646 
    4747/* One of the stupidest things I've ever met. Doing DNS lookups using the standard 
    …… 
    325325- (void)setImageData:(NSData *)JPEGData { 
    326326        DNSServiceErrorType error; 
    327         SHA1_CTX ctx; 
     327        SHA_CTX ctx; 
    328328        unsigned char digest[20]; 
    329329 
    …… 
    375375        if (error == kDNSServiceErr_NoError) { 
    376376                /* Let's create the hash */ 
    377                 SHA1Init(&ctx); 
    378                 SHA1Update(&ctx, [JPEGData bytes], [JPEGData length]); 
    379                 SHA1Final(digest, &ctx); 
     377                SHA1_Init(&ctx); 
     378                SHA1_Update(&ctx, [JPEGData bytes], (unsigned long)[JPEGData length]); 
     379                SHA1_Final(digest, &ctx); 
    380380                imagehash = [[NSData dataWithBytes:digest length:20] retain]; 
    381381