Build and project fixes for running on 10.6 (64-bit).

RNCryptor · Apr 8, 2013 · 3dbab5d · 3dbab5d
1 parent 76cdd1b
commit 3dbab5d
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 22 deletions.
diff --git a/RNCryptor.xcodeproj/project.pbxproj b/RNCryptor.xcodeproj/project.pbxproj
@@ -673,7 +673,7 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "rncrypt/rncrypt-Prefix.pch";
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.8;
+				MACOSX_DEPLOYMENT_TARGET = 10.6;
 				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = macosx;
@@ -696,7 +696,7 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "rncrypt/rncrypt-Prefix.pch";
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.8;
+				MACOSX_DEPLOYMENT_TARGET = 10.6;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = macosx;
 			};
@@ -863,6 +863,7 @@
 				FB6AC69616F6704200CA0C0A /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
 		};
 		FB7564EA1512D3C4007B806B /* Build configuration list for PBXProject "RNCryptor" */ = {
 			isa = XCConfigurationList;

diff --git a/rncrypt/main.m b/rncrypt/main.m
@@ -13,8 +13,10 @@
 
 NSData *GetDataForHex(NSString *hex)
 {
-  NSString *hexNoSpaces = [hex stringByReplacingOccurrencesOfString:@" " withString:@""];
-
+  NSString *hexNoSpaces = [[[hex stringByReplacingOccurrencesOfString:@" " withString:@""]
+                            stringByReplacingOccurrencesOfString:@"<" withString:@""]
+                           stringByReplacingOccurrencesOfString:@">" withString:@""];
+
   NSMutableData *data = [[NSMutableData alloc] init];
   unsigned char whole_byte = 0;
   char byte_chars[3] = {'\0','\0','\0'};
@@ -33,6 +35,17 @@ void usage() {
   exit(2);
 }
 
+void OutputData(NSData *data)
+{
+  NSString *string = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
+  if (string) {
+    printf("%s\n", [string UTF8String]);
+  }
+  else {
+    printf("%s\n", [[data description] UTF8String]);
+  }
+}
+
 int main(int argc, char * const argv[])
 {
   @autoreleasepool {
@@ -42,7 +55,7 @@ int main(int argc, char * const argv[])
     NSString *message = nil;
 
     char ch;
-    
+
     /* options descriptor */
     struct option longopts[] = {
       { "decrypt",    no_argument,            &decrypt_flag,    1 },
@@ -71,24 +84,25 @@ int main(int argc, char * const argv[])
     message = [NSString stringWithUTF8String:argv[0]];
 
     NSError *error;
+    NSData *data;
     if (decrypt_flag) {
-      NSData *decryptedData = [RNDecryptor decryptData:GetDataForHex(message)
-                                          withPassword:password
-                                                 error:&error];
-      if (error) {
-        NSLog(@"Failed: %@", error);
-        exit(1);
-      }
-      else {
-        NSString *string = [[NSString alloc] initWithData:decryptedData encoding:NSUTF8StringEncoding];
-        if (string) {
-          printf("%s\n", [string UTF8String]);
-        }
-        else {
-          printf("%s\n", [[decryptedData description] UTF8String]);
-        }
-      }
+      data = [RNDecryptor decryptData:GetDataForHex(message)
+                         withPassword:password
+                                error:&error];
+    }
+    else {
+      data = [RNEncryptor encryptData:[message dataUsingEncoding:NSUTF8StringEncoding]
+                         withSettings:kRNCryptorAES256Settings
+                             password:password
+                                error:&error];
+    }
+    if (error) {
+      NSLog(@"Failed: %@", error);
+      exit(1);
+    }
+    else {
+      OutputData(data);
     }
-    return 0;
   }
+  return 0;
 }