write Big Endian. Refactor method names for clear BE->LE->BE conversion.

ObjectivePGP/Categories/NSInputStream+PGP.h

@@ -12,11 +12,11 @@
 - (UInt8) readUInt8; // BE->LE
 - (UInt8) readUInt8:(UInt8 *)bytes;
 - (UInt8) readUInt8BytesAppendTo:(NSMutableData *)data;
-- (UInt16) readUInt16; // BE->LE
-- (UInt16) readUInt16:(UInt8 *)readBytes;
-- (UInt16) readUInt16BytesAppendTo:(NSMutableData *)data;
-- (UInt32) readUInt32; // BE->LE
-- (UInt32) readUInt32:(UInt8 *)readBytes;
+- (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

@@ -37,38 +37,40 @@ - (UInt8) readUInt8:(UInt8 *)readBytes
     return result;
 }
 
-- (UInt16) readUInt16
+- (UInt16) readUInt16BE
 {
-    return [self readUInt16:nil];
+    return [self readUInt16BE:nil];
 }
 
-- (UInt16) readUInt16BytesAppendTo:(NSMutableData *)data
+- (UInt16) readUInt16BEBytesAppendTo:(NSMutableData *)data
 {
     NSParameterAssert(data);
 
     UInt16 result;
     UInt8 bytes[2];
-    result = [self readUInt16:bytes];
+    result = [self readUInt16BE:bytes];
     [data appendBytes:bytes length:sizeof(bytes)];
     return result;
 }
 
-- (UInt16) readUInt16:(UInt8 *)readBytes
+- (UInt16) readUInt16BE:(UInt8 *)readBytes
 {
     UInt8 bytes[2];
     if ([self read:bytes maxLength:sizeof(bytes)] > 0) {
         if (readBytes) {
             bcopy(bytes, readBytes, sizeof(bytes));
         }
-        return bytes[0] << 8 | bytes[1];
+        UInt16 value = 0;
+        bcopy(bytes, &value, sizeof(bytes));
+        return CFSwapInt16BigToHost(value);
     }
     NSAssert(false,@"readUInt16 failed");
     return 0;
 }
 
-- (UInt32) readUInt32
+- (UInt32) readUInt32BE
 {
-    return [self readUInt32:nil];
+    return [self readUInt32BE:nil];
 }
 
 - (UInt32) readUInt32BytesAppendTo:(NSMutableData *)data
@@ -77,20 +79,22 @@ - (UInt32) readUInt32BytesAppendTo:(NSMutableData *)data
 
     UInt32 result;
     UInt8 bytes[4];
-    result = [self readUInt32:bytes];
+    result = [self readUInt32BE:bytes];
     [data appendBytes:bytes length:sizeof(bytes)];
     return result;
 }
 
 
-- (UInt32) readUInt32:(UInt8 *)readBytes
+- (UInt32) readUInt32BE:(UInt8 *)readBytes
 {
     UInt8 bytes[4];
     if ([self read:bytes maxLength:sizeof(bytes)] > 0) {
         if (readBytes) {
             bcopy(bytes, readBytes, sizeof(bytes));
         }
-        return bytes[0] << 24 | bytes[1] << 16 | bytes[2] << 8 | bytes[3];
+        UInt32 value;
+        bcopy(bytes, &value, sizeof(bytes));
+        return CFSwapInt32BigToHost(value);
     }
     NSAssert(false,@"readUInt32 failed");
     return 0;

ObjectivePGP/Categories/NSOutputStream+PGP.h

@@ -10,7 +10,7 @@
 
 @interface NSOutputStream (PGP)
 - (BOOL) writeUInt8:(UInt8)value;
-- (BOOL) writeUInt16:(UInt16)value;
-- (BOOL) writeUInt32:(UInt32)value;
+- (BOOL) writeUInt16BE:(UInt16)value;
+- (BOOL) writeUInt32BE:(UInt32)value;
 - (BOOL) writeData:(NSData *)data;
 @end

ObjectivePGP/Categories/NSOutputStream+PGP.m

@@ -21,21 +21,23 @@ - (BOOL) writeUInt8:(UInt8)value
 
 }
 
-- (BOOL) writeUInt16:(UInt16)value
+- (BOOL) writeUInt16BE:(UInt16)value
 {
+    UInt16 valueBE = CFSwapInt16HostToBig(value);
     UInt8 bytes[2];
-    bcopy(&value, bytes, sizeof(bytes));
+    bcopy(&valueBE, bytes, sizeof(bytes));
     if ([self write:bytes maxLength:sizeof(bytes)] == -1) {
         return NO;
     }
     return YES;
 }
 
 
-- (BOOL) writeUInt32:(UInt32)value
+- (BOOL) writeUInt32BE:(UInt32)value
 {
+    UInt32 valueBE = CFSwapInt32BigToHost(value);
     UInt8 bytes[4];
-    bcopy(&value, bytes, sizeof(bytes));
+    bcopy(&valueBE, bytes, sizeof(bytes));
     if ([self write:bytes maxLength:sizeof(bytes)] == -1) {
         return NO;
     }

ObjectivePGP/PGPMPI.m

@@ -24,7 +24,7 @@ + (instancetype) readFromStream:(NSInputStream *)inputStream error:(NSError * __
 
     PGPMPI *mpi = [[PGPMPI alloc] init];
 
-    UInt16 bits = [inputStream readUInt16];
+    UInt16 bits = [inputStream readUInt16BE];
     NSUInteger bytesCount = (bits + 7) / 8;
 
     UInt8 *mpiBuffer = calloc(1, bytesCount);

ObjectivePGP/PGPPacketHeader.m

@@ -152,7 +152,7 @@ - (BOOL) readNewLengthFromStream:(NSInputStream *)inputStream error:(NSError * _
         // 4.2.2.3.  Five-Octet Length
         // bodyLen = (2nd_octet << 24) | (3rd_octet << 16) |
         //           (4th_octet << 8)  | 5th_octet
-        self.bodyLength = [inputStream readUInt32];
+        self.bodyLength = [inputStream readUInt32BE];
         //self.bodyLength   = (secondOctet << 24) | (thirdOctet << 16) | (fourthOctet << 8)  | fifthOctet;
     } else if (firstOctet >= 224 && firstOctet < 255) {
         // 4.2.2.4.  Partial Body Length
@@ -182,12 +182,12 @@ - (BOOL) readOldLengthFromStream:(NSInputStream *)inputStream lengthType:(UInt8)
         case 1:
         {
             // value of a two-octet scalar is ((n[0] << 8) + n[1]).
-            self.bodyLength = [inputStream readUInt16];
+            self.bodyLength = [inputStream readUInt16BE];
         }
             break;
         case 2:
         {
-            self.bodyLength = [inputStream readUInt32];
+            self.bodyLength = [inputStream readUInt32BE];
         }
             break;
         case 3:

ObjectivePGP/Packets/PGPPublicKeyPacket.m

@@ -34,15 +34,15 @@ + (instancetype) readFromStream:(NSInputStream *)inputStream maxLength:(NSUInteg
     }
 
     // A four-octet number denoting the time that the key was created.
-    UInt32 timestamp = [inputStream readUInt32];
+    UInt32 timestamp = [inputStream readUInt32BE];
     if (timestamp) {
         packet.createDate = [NSDate dateWithTimeIntervalSince1970:timestamp];
     }
 
     if (version == 0x03) {
         // A two-octet number denoting the time in days that this key is
         // valid.  If this number is zero, then it does not expire.
-        UInt16 validityPeriod = [inputStream readUInt16];
+        UInt16 validityPeriod = [inputStream readUInt16BE];
         packet.validityPeriod = validityPeriod;
     }
 
@@ -125,9 +125,9 @@ - (BOOL) writeToStream:(NSOutputStream *)outputStream error:(NSError * __autorel
     NSParameterAssert(outputStream);
 
     [outputStream writeUInt8:self.version];
-    [outputStream writeUInt32:[self.createDate timeIntervalSince1970]];
+    [outputStream writeUInt32BE:[self.createDate timeIntervalSince1970]];
     if (self.version == 0x03) {
-        [outputStream writeUInt16:self.validityPeriod];
+        [outputStream writeUInt16BE:self.validityPeriod];
     }
     [outputStream writeUInt8:self.keyAlgorithm];
     for (PGPMPI *mpi in self.MPIs) {

ObjectivePGP/Packets/PGPSignaturePacket.m

@@ -70,7 +70,7 @@ - (BOOL) readV3FromStream:(NSInputStream *)inputStream error:(NSError * __autore
     self.signatureType = [inputStream readUInt8];
 
     // - Four-octet creation time
-    UInt32 timestamp = [inputStream readUInt32];
+    UInt32 timestamp = [inputStream readUInt32BE];
     self.creationDate = [NSDate dateWithTimeIntervalSince1970:timestamp];
 
     //Eight-octet Key ID of signer
@@ -84,7 +84,7 @@ - (BOOL) readV3FromStream:(NSInputStream *)inputStream error:(NSError * __autore
     self.hashAlgoritm = [inputStream readUInt8];
 
     // Two-octet field holding the left 16 bits of the signed hash value.
-    UInt16 signedHashValue = [inputStream readUInt16];
+    UInt16 signedHashValue = [inputStream readUInt16BE];
     self.hashValue = signedHashValue;
 
     // 5.2.2. One or more multiprecision integers comprising the signature. This portion is algorithm specific Signature
@@ -145,7 +145,7 @@ - (BOOL) readV4FromStream:(NSInputStream *)inputStream error:(NSError * __autore
     self.hashAlgoritm = [inputStream readUInt8BytesAppendTo:toHashData];
 
     // Two-octet scalar octet count for following hashed subpacket data.
-    UInt16 hashedSubpacketsBytes = [inputStream readUInt16BytesAppendTo:toHashData];
+    UInt16 hashedSubpacketsBytes = [inputStream readUInt16BEBytesAppendTo:toHashData];
     UInt16 consumedBytes = 0;
     if (hashedSubpacketsBytes) {
         while (consumedBytes < hashedSubpacketsBytes) {
@@ -162,7 +162,7 @@ - (BOOL) readV4FromStream:(NSInputStream *)inputStream error:(NSError * __autore
     //-->HASHED
 
     // Two-octet scalar octet count for following unhashed subpacket data.
-    UInt16 unhashedSubpacketsBytes = [inputStream readUInt16];
+    UInt16 unhashedSubpacketsBytes = [inputStream readUInt16BE];
     consumedBytes = 0;
     if (unhashedSubpacketsBytes) {
         while (consumedBytes < unhashedSubpacketsBytes) {
@@ -176,7 +176,7 @@ - (BOOL) readV4FromStream:(NSInputStream *)inputStream error:(NSError * __autore
     }
 
     // Two-octet field holding the left 16 bits of the signed hash value.
-    UInt16 signedHashValue = [inputStream readUInt16];
+    UInt16 signedHashValue = [inputStream readUInt16BE];
     self.hashValue = signedHashValue;
 
     // One or more multiprecision integers comprising the signature.
@@ -262,19 +262,21 @@ - (BOOL) writeToStream:(NSOutputStream *)outputStream error:(NSError * __autorel
 {
     NSParameterAssert(outputStream);
 
+    NSMutableData *outputData = [NSMutableData dataWithCapacity:5];
+
     [outputStream writeUInt8:self.version];
     switch (self.version) {
         case 0x04:
         {
             [outputStream writeUInt8:self.signatureType];
             [outputStream writeUInt8:self.publicKeyAlgorithm];
             [outputStream writeUInt8:self.hashAlgoritm];
-            [outputStream writeUInt16:self.hashedSubpackets.count];
+            [outputStream writeUInt16BE:self.hashedSubpackets.count];
             //TODO: hashed subpackets here
             //TODO: Two-octet field holding the left 16 bits of the signed hash value.
-            [outputStream writeUInt16:self.hashValue]; //TODO: calculate hash first
+            [outputStream writeUInt16BE:self.hashValue]; //TODO: calculate hash first
             NSAssert(self.hashValue != 0, @"Calculate hash");
-            [outputStream writeUInt16:self.unhashedSubpackets.count];
+            [outputStream writeUInt16BE:self.unhashedSubpackets.count];
             //TODO: unhashed subpackets here
             for (PGPMPI *mpi in self.MPIs) {
                 if (![mpi writeToStream:outputStream error:error]) {
@@ -287,12 +289,12 @@ - (BOOL) writeToStream:(NSOutputStream *)outputStream error:(NSError * __autorel
         {
             [outputStream writeUInt8:0x05];
             [outputStream writeUInt8:self.signatureType];
-            [outputStream writeUInt32:[self.creationDate timeIntervalSince1970]];
+            [outputStream writeUInt32BE:[self.creationDate timeIntervalSince1970]];
 
             NSAssert(self.issuerKeyID, @"Missing issued key id");
             [outputStream writeData:self.issuerKeyID.octetsData];
 
-            [outputStream writeUInt16:self.hashValue];
+            [outputStream writeUInt16BE:self.hashValue];
             NSAssert(self.hashValue != 0, @"Calculate hash");
 
             for (PGPMPI *mpi in self.MPIs) {

ObjectivePGPTests/PGPInputStreamCategoryTests.m

@@ -45,7 +45,7 @@ - (void) testReadUInt16
     [stream open];
     XCTAssertNotNil(stream);
     UInt8 readBytes[2];
-    UInt16 result = [stream readUInt16:readBytes];
+    UInt16 result = [stream readUInt16BE:readBytes];
     XCTAssertEqual(result, 0x0102);
     for (int i = 0; i < sizeof(bytes); i++) {
         XCTAssertEqual(readBytes[i], bytes[i]);
@@ -60,7 +60,7 @@ - (void) testReadUInt32
     [stream open];
     XCTAssertNotNil(stream);
     UInt8 readBytes[4];
-    UInt32 result = [stream readUInt32:readBytes];
+    UInt32 result = [stream readUInt32BE:readBytes];
     XCTAssertEqual(result, 0x01020304);
     for (int i = 0; i < sizeof(bytes); i++) {
         XCTAssertEqual(readBytes[i], bytes[i]);