Objective pgp2

ObjectivePGP.xcodeproj/project.xcworkspace/xcshareddata/ObjectivePGP.xccheckout

@@ -10,31 +10,31 @@
 	<string>ObjectivePGP</string>
 	<key>IDESourceControlProjectOriginsDictionary</key>
 	<dict>
-		<key>E87A640A-257A-4EA9-8911-A3A876F28D8B</key>
-		<string>ssh://bitbucket.org/krzyzanowskim/objectivepgp.git</string>
+		<key>4858D38B24AED68A4237F0D24D6AD46EA9025A89</key>
+		<string>bitbucket.org:krzyzanowskim/objectivepgp.git</string>
 	</dict>
 	<key>IDESourceControlProjectPath</key>
-	<string>ObjectivePGP.xcodeproj/project.xcworkspace</string>
+	<string>ObjectivePGP.xcodeproj</string>
 	<key>IDESourceControlProjectRelativeInstallPathDictionary</key>
 	<dict>
-		<key>E87A640A-257A-4EA9-8911-A3A876F28D8B</key>
+		<key>4858D38B24AED68A4237F0D24D6AD46EA9025A89</key>
 		<string>../..</string>
 	</dict>
 	<key>IDESourceControlProjectURL</key>
-	<string>ssh://bitbucket.org/krzyzanowskim/objectivepgp.git</string>
+	<string>bitbucket.org:krzyzanowskim/objectivepgp.git</string>
 	<key>IDESourceControlProjectVersion</key>
-	<integer>110</integer>
+	<integer>111</integer>
 	<key>IDESourceControlProjectWCCIdentifier</key>
-	<string>E87A640A-257A-4EA9-8911-A3A876F28D8B</string>
+	<string>4858D38B24AED68A4237F0D24D6AD46EA9025A89</string>
 	<key>IDESourceControlProjectWCConfigurations</key>
 	<array>
 		<dict>
 			<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
 			<string>public.vcs.git</string>
 			<key>IDESourceControlWCCIdentifierKey</key>
-			<string>E87A640A-257A-4EA9-8911-A3A876F28D8B</string>
+			<string>4858D38B24AED68A4237F0D24D6AD46EA9025A89</string>
 			<key>IDESourceControlWCCName</key>
-			<string>OpenPGPKeyring</string>
+			<string>objectivepgp</string>
 		</dict>
 	</array>
 </dict>

ObjectivePGP/Categories/NSData+PGP.h

@@ -0,0 +1,14 @@
+//
+//  NSData+PGP.h
+//  ObjectivePGP
+//
+//  Created by Marcin Krzyzanowski on 17/02/15.
+//  Copyright (c) 2015 Marcin Krzyżanowski. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@interface NSData (PGP)
+- (UInt16) readUInt16BE:(NSRange)range;
+- (UInt32) readUInt32BE:(NSRange)range;
+@end

ObjectivePGP/Categories/NSData+PGP.m

@@ -0,0 +1,27 @@
+//
+//  NSData+PGP.m
+//  ObjectivePGP
+//
+//  Created by Marcin Krzyzanowski on 17/02/15.
+//  Copyright (c) 2015 Marcin Krzyżanowski. All rights reserved.
+//
+
+#import "NSData+PGP.h"
+
+@implementation NSData (PGP)
+- (UInt16) readUInt16BE:(NSRange)range
+{
+    NSAssert(range.length == 2, @"Invalid length");
+    UInt16 value = 0;
+    [self getBytes:&value range:range];
+    return CFSwapInt16BigToHost(value);
+}
+
+- (UInt32) readUInt32BE:(NSRange)range
+{
+    NSAssert(range.length == 4, @"Invalid length");
+    UInt32 value = 0;
+    [self getBytes:&value range:range];
+    return CFSwapInt32BigToHost(value);
+}
+@end

ObjectivePGP/Categories/NSInputStream+PGP.h

@@ -0,0 +1,22 @@
+//
+//  NSInputStream+PGP.h
+//  ObjectivePGP
+//
+//  Created by Marcin Krzyzanowski on 18/01/15.
+//  Copyright (c) 2015 Marcin Krzyżanowski. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@interface NSInputStream (PGP)
+- (UInt8) readUInt8; // BE->LE
+- (UInt8) readUInt8:(UInt8 *)bytes;
+- (UInt8) readUInt8BytesAppendTo:(NSMutableData *)data;
+- (UInt16) readUInt16BE; // BE->LE
+- (UInt16) readUInt16BE:(UInt8 *)readBytes;
+- (UInt16) readUInt16BEBytesAppendTo:(NSMutableData *)data;
+- (UInt32) readUInt32BE; // BE->LE
+- (UInt32) readUInt32BE:(UInt8 *)readBytes;
+- (UInt32) readUInt32BytesAppendTo:(NSMutableData *)data;
+- (NSData *) readDataLength:(NSUInteger)length;
+@end

ObjectivePGP/Categories/NSInputStream+PGP.m

@@ -0,0 +1,115 @@
+//
+//  NSInputStream+PGP.m
+//  ObjectivePGP
+//
+//  Created by Marcin Krzyzanowski on 18/01/15.
+//  Copyright (c) 2015 Marcin Krzyżanowski. All rights reserved.
+//
+
+#import "NSInputStream+PGP.h"
+
+@implementation NSInputStream (PGP)
+
+- (UInt8) readUInt8
+{
+    return [self readUInt8:nil];
+}
+
+- (UInt8) readUInt8BytesAppendTo:(NSMutableData *)data
+{
+    NSParameterAssert(data);
+
+    UInt8 result;
+    UInt8 byte;
+    result = [self readUInt8:&byte];
+    [data appendBytes:&byte length:1];
+    return result;
+}
+
+- (UInt8) readUInt8:(UInt8 *)readBytes
+{
+    UInt8 result = 0;
+    [self read:&result maxLength:1];
+
+    if (readBytes) {
+        *readBytes = result;
+    }
+    return result;
+}
+
+- (UInt16) readUInt16BE
+{
+    return [self readUInt16BE:nil];
+}
+
+- (UInt16) readUInt16BEBytesAppendTo:(NSMutableData *)data
+{
+    NSParameterAssert(data);
+
+    UInt16 result;
+    UInt8 bytes[2];
+    result = [self readUInt16BE:bytes];
+    [data appendBytes:bytes length:sizeof(bytes)];
+    return result;
+}
+
+- (UInt16) readUInt16BE:(UInt8 *)readBytes
+{
+    UInt8 bytes[2];
+    if ([self read:bytes maxLength:sizeof(bytes)] > 0) {
+        if (readBytes) {
+            bcopy(bytes, readBytes, sizeof(bytes));
+        }
+        UInt16 value = 0;
+        bcopy(bytes, &value, sizeof(bytes));
+        return CFSwapInt16BigToHost(value);
+    }
+    NSAssert(false,@"readUInt16 failed");
+    return 0;
+}
+
+- (UInt32) readUInt32BE
+{
+    return [self readUInt32BE:nil];
+}
+
+- (UInt32) readUInt32BytesAppendTo:(NSMutableData *)data
+{
+    NSParameterAssert(data);
+
+    UInt32 result;
+    UInt8 bytes[4];
+    result = [self readUInt32BE:bytes];
+    [data appendBytes:bytes length:sizeof(bytes)];
+    return result;
+}
+
+
+- (UInt32) readUInt32BE:(UInt8 *)readBytes
+{
+    UInt8 bytes[4];
+    if ([self read:bytes maxLength:sizeof(bytes)] > 0) {
+        if (readBytes) {
+            bcopy(bytes, readBytes, sizeof(bytes));
+        }
+        UInt32 value;
+        bcopy(bytes, &value, sizeof(bytes));
+        return CFSwapInt32BigToHost(value);
+    }
+    NSAssert(false,@"readUInt32 failed");
+    return 0;
+}
+
+- (NSData *) readDataLength:(NSUInteger)length
+{
+    NSData *output = nil;
+    UInt8 buffer[length];
+    NSInteger readResult = [self read:buffer maxLength:length];
+    if (readResult > 0) {
+        output = [NSData dataWithBytes:buffer length:readResult]; // 8 bytes long
+    }
+    free(buffer);
+    return output;
+}
+
+@end

ObjectivePGP/Categories/NSOutputStream+PGP.h

@@ -0,0 +1,16 @@
+//
+//  NSOutputStream+PGP.h
+//  ObjectivePGP
+//
+//  Created by Marcin Krzyzanowski on 05/02/15.
+//  Copyright (c) 2015 Marcin Krzyżanowski. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@interface NSOutputStream (PGP)
+- (BOOL) writeUInt8:(UInt8)value;
+- (BOOL) writeUInt16BE:(UInt16)value;
+- (BOOL) writeUInt32BE:(UInt32)value;
+- (BOOL) writeData:(NSData *)data;
+@end

ObjectivePGP/Categories/NSOutputStream+PGP.m

@@ -0,0 +1,55 @@
+//
+//  NSOutputStream+PGP.m
+//  ObjectivePGP
+//
+//  Created by Marcin Krzyzanowski on 05/02/15.
+//  Copyright (c) 2015 Marcin Krzyżanowski. All rights reserved.
+//
+
+#import "NSOutputStream+PGP.h"
+
+@implementation NSOutputStream (PGP)
+
+- (BOOL) writeUInt8:(UInt8)value
+{
+    UInt8 bytes[1];
+    bcopy(&value, bytes, sizeof(bytes));
+    if ([self write:bytes maxLength:sizeof(bytes)] == -1) {
+        return NO;
+    }
+    return YES;
+
+}
+
+- (BOOL) writeUInt16BE:(UInt16)value
+{
+    UInt16 valueBE = CFSwapInt16HostToBig(value);
+    UInt8 bytes[2];
+    bcopy(&valueBE, bytes, sizeof(bytes));
+    if ([self write:bytes maxLength:sizeof(bytes)] == -1) {
+        return NO;
+    }
+    return YES;
+}
+
+
+- (BOOL) writeUInt32BE:(UInt32)value
+{
+    UInt32 valueBE = CFSwapInt32BigToHost(value);
+    UInt8 bytes[4];
+    bcopy(&valueBE, bytes, sizeof(bytes));
+    if ([self write:bytes maxLength:sizeof(bytes)] == -1) {
+        return NO;
+    }
+    return YES;
+}
+
+- (BOOL) writeData:(NSData *)data
+{
+    if ([self write:data.bytes maxLength:data.length] == -1) {
+        return NO;
+    }
+    return YES;
+}
+
+@end

ObjectivePGP/Helpers/PGPFunctions.h

@@ -0,0 +1,24 @@
+//
+//  PGPFunctions.h
+//  ObjectivePGP
+//
+//  Created by Marcin Krzyzanowski on 21/01/15.
+//  Copyright (c) 2015 Marcin Krzyżanowski. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+#pragma once
+
+NSData *pgpCalculateSHA512(const void *bytes, unsigned int length);
+UInt8 *pgpCalculateSHA384(const void *bytes, unsigned int length);
+UInt8 *pgpCalculateSHA256(const void *bytes, unsigned int length);
+UInt8 *pgpCalculateSHA224(const void *bytes, unsigned int length);
+NSData *pgpCalculateSHA1(const void *bytes, unsigned int length);
+NSData *pgpCalculateMD5(const void *bytes, unsigned int length);
+NSUInteger pgpNumBits(Byte *bytes, NSUInteger maxLength);
+NSInteger isPowerOfTwo (NSUInteger x);
+NSData *buildNewFormatLengthBytesForData(NSData *bodyData);
+NSData *buildOldFormatLengthBytesForData(NSData *bodyData);
+
+