Merge branch 'develop'

Author: Danny Greg

.gitignore

@@ -1,4 +1,4 @@
 build
-*.mode2v3
+*.mode*
 *.pbxuser
-*.perspectivev3
+*.perspectivev3

objc/CFobLicGenerator.m

@@ -50,6 +50,14 @@ - (id)initWithPrivateKey:(NSString *)privKey {
 	return self;
 }
 
+- (void)finalize
+{
+	if (dsa)
+		DSA_free(dsa);
+	[self shutdownOpenSSL];
+	[super finalize];
+}
+
 - (void)dealloc {
 	if (dsa)
 		DSA_free(dsa);

objc/CFobLicVerifier.m

@@ -79,6 +79,14 @@ - (id)initWithPublicKey:(NSString *)pubKey {
 	return self;
 }
 
+- (void)finalize
+{
+	if (dsa)
+		DSA_free(dsa);
+	[self shutdownOpenSSL];
+	[super finalize];
+}
+
 - (void)dealloc {
 	if (dsa)
 		DSA_free(dsa);

objc/CocoaFob-Info.plist

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string>${EXECUTABLE_NAME}</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.yourcompany.${PRODUCT_NAME:rfc1034identifier}</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+</dict>
+</plist>

objc/NSData+PECrypt.m

@@ -22,7 +22,7 @@ - (NSString *)base32 {
 	if (!buf)
 		return @"";
 	base32_encode((uint8_t *)buf, bufsize, [self bytes], [self length]);
-	NSString *s = [NSString stringWithCString:buf length:bufsize];
+	NSString *s = [NSString stringWithCString:buf encoding:NSUTF8StringEncoding];
 	free(buf);
 	return s;
 }

objc/NSString+PECrypt.m

@@ -9,9 +9,9 @@
 //
 
 #import "NSString+PECrypt.h"
-#import "sha.h"
-#import "bio.h"
-#import "evp.h"
+#import <openssl/sha.h>
+#import <openssl/bio.h>
+#import <openssl/evp.h>
 
 @implementation NSString (PXCrypt)
 

objc/NSString-Base64Extensions.m

@@ -22,8 +22,8 @@
 // PixelEspresso, http://www.pixelespressoapps.com/
 
 #import "NSString-Base64Extensions.h"
-#import "bio.h"
-#import "evp.h"
+#import <openssl/bio.h>
+#import <openssl/evp.h>
 
 
 @implementation NSString (Base64)