Fix common crypto includes for Xcode 10 (#442)

* Fix common crypto includes for Xcode 10:

In theory, the COMMON_DIGEST_FOR_OPENSSL #define should work, which means that we can use the
openssl (non-"CC"-prefixed) symbols. For reasons, I still can't get to the bottom of, this breaks on
Xcode 10.

However, now that compatibility with GNUstep is no longer required, we can just drop the whole
openssl thing and use the CommonCrypto ("CC") symbols directly.

This also makes the old touchdb code more consistent with later CDTDatastore/Encryption code which
doesn't #define COMMON_DIGEST_FOR_OPENSSL.

* Update copyrights

* Fix a few more missing CC_ prefixed symbols

* PR feedback

Author: tomblench

CDTDatastore/touchdb/TDBlobStore.h

@@ -4,19 +4,22 @@
 //
 //  Created by Jens Alfke on 12/10/11.
 //  Copyright (c) 2011 Couchbase, Inc. All rights reserved.
+//  Copyright © 2018 IBM Corporation. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
+//  except in compliance with the License. You may obtain a copy of the License at
+//    http://www.apache.org/licenses/LICENSE-2.0
+//  Unless required by applicable law or agreed to in writing, software distributed under the
+//  License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+//  either express or implied. See the License for the specific language governing permissions
+//  and limitations under the License.
 //
 
 #import <Foundation/Foundation.h>
 
 #import <FMDB/FMDB.h>
 
-#ifdef GNUSTEP
-#import <openssl/md5.h>
-#import <openssl/sha.h>
-#else
-#define COMMON_DIGEST_FOR_OPENSSL
 #import <CommonCrypto/CommonDigest.h>
-#endif
 
 #import "CDTEncryptionKeyProvider.h"
 #import "CDTBlobReader.h"
@@ -31,7 +34,7 @@ typedef NS_ENUM(NSInteger, CDTBlobStoreError) {
 /** Key identifying a data blob. This happens to be a SHA-1 digest. */
 typedef struct TDBlobKey
 {
-    uint8_t bytes[SHA_DIGEST_LENGTH];
+    uint8_t bytes[CC_SHA1_DIGEST_LENGTH];
 } TDBlobKey;
 
 /** A persistent content-addressable store for arbitrary-size data blobs.
@@ -109,7 +112,7 @@ typedef struct TDBlobKey
 
 typedef struct
 {
-    uint8_t bytes[MD5_DIGEST_LENGTH];
+    uint8_t bytes[CC_MD5_DIGEST_LENGTH];
 } TDMD5Key;
 
 /** Lets you stream a large attachment to a TDBlobStore asynchronously, e.g. from a network
@@ -120,8 +123,8 @@ typedef struct
     NSString* _tempPath;
     id<CDTBlobWriter> _blobWriter;
     UInt64 _length;
-    SHA_CTX _shaCtx;
-    MD5_CTX _md5Ctx;
+    CC_SHA1_CTX _shaCtx;
+    CC_MD5_CTX _md5Ctx;
     TDBlobKey _blobKey;
     TDMD5Key _MD5Digest;
 }

CDTDatastore/touchdb/TDBlobStore.m

@@ -6,6 +6,7 @@
 //  Copyright (c) 2011 Couchbase, Inc. All rights reserved.
 //
 //  Modifications for this distribution by Cloudant, Inc., Copyright (c) 2014 Cloudant, Inc.
+//  Copyright © 2018 IBM Corporation. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
 //  except in compliance with the License. You may obtain a copy of the License at
@@ -81,10 +82,10 @@ + (TDBlobKey)keyForBlob:(NSData *)blob
     NSCParameterAssert(blob);
 
     TDBlobKey key;
-    SHA_CTX ctx;
-    SHA1_Init(&ctx);
-    SHA1_Update(&ctx, blob.bytes, blob.length);
-    SHA1_Final(key.bytes, &ctx);
+    CC_SHA1_CTX ctx;
+    CC_SHA1_Init(&ctx);
+    CC_SHA1_Update(&ctx, blob.bytes, blob.length);
+    CC_SHA1_Final(key.bytes, &ctx);
 
     return key;
 }
@@ -289,8 +290,8 @@ - (id)initWithStore:(TDBlobStore*)store
     self = [super init];
     if (self) {
         _store = store;
-        SHA1_Init(&_shaCtx);
-        MD5_Init(&_md5Ctx);
+        CC_SHA1_Init(&_shaCtx);
+        CC_MD5_Init(&_md5Ctx);
 
         // Open a temporary file in the store's temporary directory:
         NSString* filename = [TDCreateUUID() stringByAppendingPathExtension:@"blobtmp"];
@@ -312,8 +313,8 @@ - (void)appendData:(NSData*)data
     [_blobWriter appendData:data];
     NSUInteger dataLen = data.length;
     _length += dataLen;
-    SHA1_Update(&_shaCtx, data.bytes, dataLen);
-    MD5_Update(&_md5Ctx, data.bytes, dataLen);
+    CC_SHA1_Update(&_shaCtx, data.bytes, dataLen);
+    CC_MD5_Update(&_md5Ctx, data.bytes, dataLen);
 }
 
 - (void)closeFile
@@ -326,8 +327,8 @@ - (void)finish
 {
     Assert(_blobWriter, @"Already finished");
     [self closeFile];
-    SHA1_Final(_blobKey.bytes, &_shaCtx);
-    MD5_Final(_MD5Digest.bytes, &_md5Ctx);
+    CC_SHA1_Final(_blobKey.bytes, &_shaCtx);
+    CC_MD5_Final(_MD5Digest.bytes, &_md5Ctx);
 }
 
 - (NSString*)MD5DigestString

CDTDatastore/touchdb/TDMisc.m

@@ -4,6 +4,7 @@
 //
 //  Created by Jens Alfke on 1/13/12.
 //  Copyright (c) 2012 Couchbase, Inc. All rights reserved.
+//  Copyright © 2018 IBM Corporation. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
 //  except in compliance with the License. You may obtain a copy of the License at
@@ -20,14 +21,8 @@
 #import "CollectionUtils.h"
 #import <errno.h>
 
-#ifdef GNUSTEP
-#import <openssl/sha.h>
-#import <uuid/uuid.h>  // requires installing "uuid-dev" package on Ubuntu
-#else
-#define COMMON_DIGEST_FOR_OPENSSL
 #import <CommonCrypto/CommonDigest.h>
 #import <CommonCrypto/CommonHMAC.h>
-#endif
 
 NSString* TDCreateUUID()
 {
@@ -54,31 +49,31 @@
 
 NSData* TDSHA1Digest(NSData* input)
 {
-    unsigned char digest[SHA_DIGEST_LENGTH];
-    SHA_CTX ctx;
-    SHA1_Init(&ctx);
-    SHA1_Update(&ctx, input.bytes, input.length);
-    SHA1_Final(digest, &ctx);
+    unsigned char digest[CC_SHA1_DIGEST_LENGTH];
+    CC_SHA1_CTX ctx;
+    CC_SHA1_Init(&ctx);
+    CC_SHA1_Update(&ctx, input.bytes, input.length);
+    CC_SHA1_Final(digest, &ctx);
     return [NSData dataWithBytes:&digest length:sizeof(digest)];
 }
 
 NSData* TDSHA256Digest(NSData* input)
 {
-    unsigned char digest[SHA256_DIGEST_LENGTH];
-    SHA256_CTX ctx;
-    SHA256_Init(&ctx);
-    SHA256_Update(&ctx, input.bytes, input.length);
-    SHA256_Final(digest, &ctx);
+    unsigned char digest[CC_SHA256_DIGEST_LENGTH];
+    CC_SHA256_CTX ctx;
+    CC_SHA256_Init(&ctx);
+    CC_SHA256_Update(&ctx, input.bytes, input.length);
+    CC_SHA256_Final(digest, &ctx);
     return [NSData dataWithBytes:&digest length:sizeof(digest)];
 }
 
 NSString* TDHexSHA1Digest(NSData* input)
 {
-    unsigned char digest[SHA_DIGEST_LENGTH];
-    SHA_CTX ctx;
-    SHA1_Init(&ctx);
-    SHA1_Update(&ctx, input.bytes, input.length);
-    SHA1_Final(digest, &ctx);
+    unsigned char digest[CC_SHA1_DIGEST_LENGTH];
+    CC_SHA1_CTX ctx;
+    CC_SHA1_Init(&ctx);
+    CC_SHA1_Update(&ctx, input.bytes, input.length);
+    CC_SHA1_Final(digest, &ctx);
     return TDHexFromBytes(&digest, sizeof(digest));
 }
 
@@ -93,14 +88,14 @@
 
 NSData* TDHMACSHA1(NSData* key, NSData* data)
 {
-    UInt8 hmac[SHA_DIGEST_LENGTH];
+    UInt8 hmac[CC_SHA1_DIGEST_LENGTH];
     CCHmac(kCCHmacAlgSHA1, key.bytes, key.length, data.bytes, data.length, &hmac);
     return [NSData dataWithBytes:hmac length:sizeof(hmac)];
 }
 
 NSData* TDHMACSHA256(NSData* key, NSData* data)
 {
-    UInt8 hmac[SHA256_DIGEST_LENGTH];
+    UInt8 hmac[CC_SHA256_DIGEST_LENGTH];
     CCHmac(kCCHmacAlgSHA256, key.bytes, key.length, data.bytes, data.length, &hmac);
     return [NSData dataWithBytes:hmac length:sizeof(hmac)];
 }

CDTDatastore/touchdb/TD_Database+BlobFilenames.m

@@ -4,6 +4,7 @@
 //
 //  Created by Enrique de la Torre Fernandez on 29/05/2015.
 //  Copyright (c) 2015 IBM Cloudant. All rights reserved.
+//  Copyright © 2018 IBM Corporation. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
 //  except in compliance with the License. You may obtain a copy of the License at
@@ -118,7 +119,7 @@ + (NSArray *)rowsInBlobFilenamesTableInDatabase:(FMDatabase *)db
             NSData *keyData = dataFromHexadecimalString(hexKey);
 
             TDBlobKey key;
-            [keyData getBytes:key.bytes length:SHA_DIGEST_LENGTH];
+            [keyData getBytes:key.bytes length:CC_SHA1_DIGEST_LENGTH];
 
             NSString *blobFilename = [r stringForColumn:TDDatabaseBlobFilenamesColumnFilename];
 
@@ -204,8 +205,8 @@ + (BOOL)insertFilename:(NSString *)filename
 
 + (NSString *)generateRandomBlobFilename
 {
-    uint8_t randBytes[SHA_DIGEST_LENGTH];
-    arc4random_buf(randBytes, SHA_DIGEST_LENGTH);
+    uint8_t randBytes[CC_SHA1_DIGEST_LENGTH];
+    arc4random_buf(randBytes, CC_SHA1_DIGEST_LENGTH);
 
     NSString *randStr = TDHexFromBytes(randBytes, sizeof(randBytes));
 
@@ -260,4 +261,4 @@ + (instancetype)rowWithKey:(TDBlobKey)key blobFilename:(NSString *)blobFilename
     return [[[self class] alloc] initWithKey:key blobFilename:blobFilename];
 }
 
-@end
+@end

CDTDatastore/touchdb/TD_Database+Insertion.m

@@ -6,6 +6,7 @@
 //  Copyright (c) 2011 Couchbase, Inc. All rights reserved.
 //
 //  Modifications for this distribution by Cloudant, Inc., Copyright (c) 2014 Cloudant, Inc.
+//  Copyright © 2018 IBM Corporation. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
 //  except in compliance with the License. You may obtain a copy of the License at
@@ -33,12 +34,7 @@
 
 #import "CDTLogging.h"
 
-#ifdef GNUSTEP
-#import <openssl/sha.h>
-#else
-#define COMMON_DIGEST_FOR_OPENSSL
 #import <CommonCrypto/CommonDigest.h>
-#endif
 
 NSString* const TD_DatabaseChangeNotification = @"TD_DatabaseChange";
 
@@ -91,28 +87,28 @@ - (NSString*)generateIDForRevision:(TD_Revision*)rev
     // Generate a digest for this revision based on the previous revision ID, document JSON,
     // and attachment digests. This doesn't need to be secure; we just need to ensure that this
     // code consistently generates the same ID given equivalent revisions.
-    MD5_CTX ctx;
-    unsigned char digestBytes[MD5_DIGEST_LENGTH];
-    MD5_Init(&ctx);
+    CC_MD5_CTX ctx;
+    unsigned char digestBytes[CC_MD5_DIGEST_LENGTH];
+    CC_MD5_Init(&ctx);
 
     NSData* prevIDUTF8 = [prevID dataUsingEncoding:NSUTF8StringEncoding];
     NSUInteger length = prevIDUTF8.length;
     if (length > 0xFF) return nil;
     uint8_t lengthByte = length & 0xFF;
-    MD5_Update(&ctx, &lengthByte, 1);  // prefix with length byte
-    if (length > 0) MD5_Update(&ctx, prevIDUTF8.bytes, length);
+    CC_MD5_Update(&ctx, &lengthByte, 1);  // prefix with length byte
+    if (length > 0) CC_MD5_Update(&ctx, prevIDUTF8.bytes, length);
 
     uint8_t deletedByte = rev.deleted != NO;
-    MD5_Update(&ctx, &deletedByte, 1);
+    CC_MD5_Update(&ctx, &deletedByte, 1);
 
     for (NSString* attName in [attachments.allKeys sortedArrayUsingSelector:@selector(compare:)]) {
         TD_Attachment* attachment = attachments[attName];
-        MD5_Update(&ctx, &attachment->blobKey, sizeof(attachment->blobKey));
+        CC_MD5_Update(&ctx, &attachment->blobKey, sizeof(attachment->blobKey));
     }
 
-    MD5_Update(&ctx, json.bytes, json.length);
+    CC_MD5_Update(&ctx, json.bytes, json.length);
 
-    MD5_Final(digestBytes, &ctx);
+    CC_MD5_Final(digestBytes, &ctx);
     NSString* digest = TDHexFromBytes(digestBytes, sizeof(digestBytes));
     return [NSString stringWithFormat:@"%u-%@", generation + 1, digest];
 }

CDTDatastoreTests/Attachments/AttachmentCRUD.m

@@ -143,7 +143,7 @@ - (void)testCreate
         NSData *data = dataFromHexadecimalString(@"D55F9AC778BAF2256FA4DE87AAC61F590EBE66E0");
 
         TDBlobKey key;
-        [data getBytes:key.bytes length:SHA_DIGEST_LENGTH];
+        [data getBytes:key.bytes length:CC_SHA1_DIGEST_LENGTH];
 
         filename = [TD_Database filenameForKey:key inBlobFilenamesTableInDatabase:db];
     }];
@@ -215,7 +215,7 @@ - (void)testCreateWithMutableBodyAndAttachments
         NSData *data = dataFromHexadecimalString(@"D55F9AC778BAF2256FA4DE87AAC61F590EBE66E0");
 
         TDBlobKey key;
-        [data getBytes:key.bytes length:SHA_DIGEST_LENGTH];
+        [data getBytes:key.bytes length:CC_SHA1_DIGEST_LENGTH];
 
         filename = [TD_Database filenameForKey:key inBlobFilenamesTableInDatabase:db];
     }];
@@ -275,7 +275,7 @@ - (void) testUpdatingDocumentRetainsAttachments
         NSData *data = dataFromHexadecimalString(@"D55F9AC778BAF2256FA4DE87AAC61F590EBE66E0");
 
         TDBlobKey key;
-        [data getBytes:key.bytes length:SHA_DIGEST_LENGTH];
+        [data getBytes:key.bytes length:CC_SHA1_DIGEST_LENGTH];
 
         filename = [TD_Database filenameForKey:key inBlobFilenamesTableInDatabase:db];
     }];
@@ -377,13 +377,13 @@ - (void) testMultipleAttachments
         NSData *data = dataFromHexadecimalString(@"D55F9AC778BAF2256FA4DE87AAC61F590EBE66E0");
 
         TDBlobKey key;
-        [data getBytes:key.bytes length:SHA_DIGEST_LENGTH];
+        [data getBytes:key.bytes length:CC_SHA1_DIGEST_LENGTH];
 
         filenameImage = [TD_Database filenameForKey:key inBlobFilenamesTableInDatabase:db];
 
         data = dataFromHexadecimalString(@"3FF2989BCCF52150BBA806BAE1DB2E0B06AD6F88");
 
-        [data getBytes:key.bytes length:SHA_DIGEST_LENGTH];
+        [data getBytes:key.bytes length:CC_SHA1_DIGEST_LENGTH];
 
         filenameText = [TD_Database filenameForKey:key inBlobFilenamesTableInDatabase:db];
     }];
@@ -475,13 +475,13 @@ - (void) testAddAttachments
         NSData *data = dataFromHexadecimalString(@"D55F9AC778BAF2256FA4DE87AAC61F590EBE66E0");
 
         TDBlobKey key;
-        [data getBytes:key.bytes length:SHA_DIGEST_LENGTH];
+        [data getBytes:key.bytes length:CC_SHA1_DIGEST_LENGTH];
 
         filenameImage = [TD_Database filenameForKey:key inBlobFilenamesTableInDatabase:db];
 
         data = dataFromHexadecimalString(@"3FF2989BCCF52150BBA806BAE1DB2E0B06AD6F88");
 
-        [data getBytes:key.bytes length:SHA_DIGEST_LENGTH];
+        [data getBytes:key.bytes length:CC_SHA1_DIGEST_LENGTH];
 
         filenameText = [TD_Database filenameForKey:key inBlobFilenamesTableInDatabase:db];
     }];
@@ -610,13 +610,13 @@ - (void)testUpdate
         NSData *data = dataFromHexadecimalString(@"D55F9AC778BAF2256FA4DE87AAC61F590EBE66E0");
 
         TDBlobKey key;
-        [data getBytes:key.bytes length:SHA_DIGEST_LENGTH];
+        [data getBytes:key.bytes length:CC_SHA1_DIGEST_LENGTH];
 
         filenameImage = [TD_Database filenameForKey:key inBlobFilenamesTableInDatabase:db];
 
         data = dataFromHexadecimalString(@"3FF2989BCCF52150BBA806BAE1DB2E0B06AD6F88");
 
-        [data getBytes:key.bytes length:SHA_DIGEST_LENGTH];
+        [data getBytes:key.bytes length:CC_SHA1_DIGEST_LENGTH];
 
         filenameText = [TD_Database filenameForKey:key inBlobFilenamesTableInDatabase:db];
     }];
@@ -699,7 +699,7 @@ - (void)testDelete
         NSData *data = dataFromHexadecimalString(@"D55F9AC778BAF2256FA4DE87AAC61F590EBE66E0");
 
         TDBlobKey key;
-        [data getBytes:key.bytes length:SHA_DIGEST_LENGTH];
+        [data getBytes:key.bytes length:CC_SHA1_DIGEST_LENGTH];
 
         filename = [TD_Database filenameForKey:key inBlobFilenamesTableInDatabase:db];
     }];
@@ -774,7 +774,7 @@ - (void) testCDTUnsavedFileAttachment
         NSData *data = dataFromHexadecimalString(@"D55F9AC778BAF2256FA4DE87AAC61F590EBE66E0");
 
         TDBlobKey key;
-        [data getBytes:key.bytes length:SHA_DIGEST_LENGTH];
+        [data getBytes:key.bytes length:CC_SHA1_DIGEST_LENGTH];
 
         filename = [TD_Database filenameForKey:key inBlobFilenamesTableInDatabase:db];
     }];

CDTDatastoreTests/Encryption/TDBlobStoreEncryptionTests.m

@@ -286,7 +286,7 @@ - (void)testBlobForKeySucceedsIfKeyIsAMigratedKey
       NSData *data = dataFromHexadecimalString(TDBLOBSTOREENCRYPTIONTESTS_LOREM_SHA1DIGEST);
 
       TDBlobKey key;
-      [data getBytes:key.bytes length:SHA_DIGEST_LENGTH];
+      [data getBytes:key.bytes length:CC_SHA1_DIGEST_LENGTH];
 
       reader = [_blobStore blobForKey:key withDatabase:db];
     }];