• Converted SSYDigester to use CommonCrypto instead of openssl. Tests completed and passed.

•  Replaced deprecated method in SSYHintArrow.m.

Author: jerrykrinock

SSYDigester.h

@@ -1,5 +1,5 @@
 #import <Cocoa/Cocoa.h>
-#include <openssl/evp.h>
+#import <CommonCrypto/CommonDigest.h>
 
 enum SSYDigesterAlgorithm_enum {
 	SSYDigesterAlgorithmMd5,
@@ -13,7 +13,9 @@ typedef enum SSYDigesterAlgorithm_enum SSYDigesterAlgorithm ;
  @details  
 */
 @interface SSYDigester : NSObject {
-	EVP_MD_CTX m_context ;
+    SSYDigesterAlgorithm m_algorithm ;
+    CC_MD5_CTX m_context_md5 ;
+	CC_SHA1_CTX m_context_sha1 ;
 }
 
 /*!
@@ -63,6 +65,9 @@ typedef enum SSYDigesterAlgorithm_enum SSYDigesterAlgorithm ;
 @end
 
 #if 0
+/* The following method was used to test this class on 20150304, when it was
+ converted to use CommonCrypto instead of openssl.  The "expected" results
+ were obtained using the old openssl code. */
 + (void)testSSYDigester {
     SSYDigester* digester ;
     NSData* data ;
@@ -140,7 +145,6 @@ typedef enum SSYDigesterAlgorithm_enum SSYDigesterAlgorithm ;
                                       length:20] ;
     NSLog(@"sha1 expect = %@", expected) ;
     NSLog(@"sha1 test %@", [data isEqual:expected] ? @"passed" : @"failed") ;
-    
 }
 
 #endif

SSYDigester.m

@@ -1,5 +1,4 @@
 #import "SSYDigester.h"
-#include <openssl/err.h>
 
 NSString* const msgSSYDigesterContextIsDefunct = @"Context is defunct." ;
 
@@ -10,10 +9,12 @@ - (id)initWithAlgorithm:(SSYDigesterAlgorithm)algorithm {
 	if (self) {
 		switch (algorithm) {
 			case SSYDigesterAlgorithmMd5:
-				EVP_DigestInit(&m_context, EVP_md5()) ;
+                m_algorithm = SSYDigesterAlgorithmMd5 ;
+                CC_MD5_Init(&m_context_md5) ;
 				break;
-			case SSYDigesterAlgorithmSha1:
-				EVP_DigestInit(&m_context, EVP_sha1()) ;
+            case SSYDigesterAlgorithmSha1:;
+                m_algorithm = SSYDigesterAlgorithmSha1 ;
+                CC_SHA1_Init(&m_context_sha1) ;
 				break;
 		}
 	}
@@ -22,7 +23,14 @@ - (id)initWithAlgorithm:(SSYDigesterAlgorithm)algorithm {
 }
 
 - (void)updateWithData:(NSData*)data {
-	EVP_DigestUpdate(&m_context, [data bytes], [data length]) ;
+    switch (m_algorithm) {
+        case SSYDigesterAlgorithmMd5:
+            CC_MD5_Update(&m_context_md5, [data bytes], (CC_LONG)[data length]) ;
+            break ;
+        case SSYDigesterAlgorithmSha1:
+            CC_SHA1_Update(&m_context_sha1, [data bytes], (CC_LONG)[data length]) ;
+            break ;
+    }
 }
 
 
@@ -59,17 +67,24 @@ - (void)updateWithString:(NSString*)string
 
 	NSData* data = [NSData dataWithBytes:cString
 								  length:length] ;
-	EVP_DigestUpdate(&m_context, [data bytes], [data length]) ;	
+    [self updateWithData:data] ;
 }
 
 - (NSData*)finalizeDigest {
-	unsigned int length ;
-	unsigned char value[EVP_MAX_MD_SIZE] ;
-
-	EVP_DigestFinal(&m_context, value, &length) ;
-	EVP_MD_CTX_cleanup(&m_context) ;
-	return [NSData dataWithBytes:value
-						  length:length];
+    NSMutableData* hash ;
+    switch (m_algorithm) {
+        case SSYDigesterAlgorithmMd5:;
+            hash = [[NSMutableData alloc] initWithLength:CC_MD5_DIGEST_LENGTH] ;
+            CC_MD5_Final([hash mutableBytes], &m_context_md5) ;
+            break ;
+        case SSYDigesterAlgorithmSha1:;
+            hash = [[NSMutableData alloc] initWithLength:CC_SHA1_DIGEST_LENGTH] ;
+            CC_SHA1_Final([hash mutableBytes], &m_context_sha1) ;
+            break ;
+    }
+	NSData* answer =  [NSData dataWithData:hash] ;
+    [hash release] ;
+    return answer ;
 }
 
 @end

SSYHintArrow.m

@@ -9,29 +9,34 @@
 #define SSYHINTARROW_TOP_COLOR [NSColor colorWithCalibratedRed:(80.0/256.0) green:(111.0/256.0) blue:(246.0/256.0) alpha:1.0]
 #define SSYHINTARROW_BOTTOM_COLOR [NSColor colorWithCalibratedRed:(27.0/256.0) green:(68.0/256.0) blue:(243.0/256.0) alpha:1.0]
 #define SSYHINTARROW_BORDER_COLOR [NSColor whiteColor]
-#define SSYHINTARROW_SCALE_FACTOR [[NSScreen mainScreen] userSpaceScaleFactor]
 
 static SSYHintArrow* static_helpArrow = nil ;
 
 @implementation SSYHintArrow
 
 # pragma mark * Heavy Lifters
 
+- (CGFloat)scaleFactor {
+    // Was using deprecated [NSScreen mainScreen] userSpaceScaleFactor]
+    CGFloat factor = [[self contentView] backingScaleFactor] ;
+    return factor ;
+}
+
 - (void)updateGeometry {
     [m_view setFrame:NSMakeRect(0.0, 0.0, m_size.width, m_size.height)] ;
 
 	NSRect contentRect = NSZeroRect ;
     contentRect.size = [m_view frame].size ;
 
     // Account for viewMargin.
-    m_viewFrame = NSMakeRect(m_viewMargin * SSYHINTARROW_SCALE_FACTOR,
-                            m_viewMargin * SSYHINTARROW_SCALE_FACTOR,
+    m_viewFrame = NSMakeRect(m_viewMargin * [self scaleFactor],
+                            m_viewMargin * [self scaleFactor],
                             [m_view frame].size.width, [m_view frame].size.height) ;
     contentRect = NSInsetRect(contentRect, 
-                              -m_viewMargin * SSYHINTARROW_SCALE_FACTOR, 
-                              -m_viewMargin * SSYHINTARROW_SCALE_FACTOR) ;
+                              -m_viewMargin * [self scaleFactor], 
+                              -m_viewMargin * [self scaleFactor]) ;
 
-    CGFloat scaledArrowHeight = m_arrowHeight * SSYHINTARROW_SCALE_FACTOR ;
+    CGFloat scaledArrowHeight = m_arrowHeight * [self scaleFactor] ;
     m_viewFrame.origin.x += scaledArrowHeight ;
     contentRect.size.width += scaledArrowHeight ;
 
@@ -56,7 +61,7 @@ - (void)updateGeometry {
 
 
 - (NSBezierPath *)backgroundPath {
-    CGFloat scaleFactor = SSYHINTARROW_SCALE_FACTOR ;
+    CGFloat scaleFactor = [self scaleFactor] ;
     CGFloat scaledRadius = m_cornerRadius * scaleFactor ;
     NSRect contentArea = NSInsetRect(m_viewFrame,
                                      -m_viewMargin * scaleFactor,
@@ -122,7 +127,7 @@ - (NSColor *)backgroundColorPatternImage {
                               // Draw border if appropriate.
                               if (m_borderWidth > 0) {
                                   // Double the borderWidth since we're drawing inside the path.
-                                  [bgPath setLineWidth:(m_borderWidth * 2.0) * SSYHINTARROW_SCALE_FACTOR] ;
+                                  [bgPath setLineWidth:(m_borderWidth * 2.0) * [self scaleFactor]] ;
                                   [m_borderColor set] ;
                                   [bgPath stroke] ;
                               }