From bba541806122340f47072fd351e2d447f5df5995 Mon Sep 17 00:00:00 2001 From: mjewkes Date: Tue, 29 Jul 2014 21:33:38 -0300 Subject: [PATCH] Final removal of the CryptoUtils class name, replaced with CryptoTools. --- Signal.xcodeproj/project.pbxproj | 12 ++++++------ Signal/src/crypto/CryptoTools.h | 2 +- Signal/src/crypto/CryptoTools.m | 2 +- .../util/{CryptoUtilTest.h => CryptoToolsTest.h} | 0 .../util/{CryptoUtilTest.m => CryptoToolsTest.m} | 0 5 files changed, 8 insertions(+), 8 deletions(-) rename Signal/test/util/{CryptoUtilTest.h => CryptoToolsTest.h} (100%) rename Signal/test/util/{CryptoUtilTest.m => CryptoToolsTest.m} (100%) diff --git a/Signal.xcodeproj/project.pbxproj b/Signal.xcodeproj/project.pbxproj index eb820004f..441f7de4b 100644 --- a/Signal.xcodeproj/project.pbxproj +++ b/Signal.xcodeproj/project.pbxproj @@ -365,7 +365,7 @@ A157077617F0CD6D007C2BD6 /* CancelTokenTest.m in Sources */ = {isa = PBXBuildFile; fileRef = A157074117F0CD6D007C2BD6 /* CancelTokenTest.m */; }; A157077717F0CD6D007C2BD6 /* ConversionsTest.m in Sources */ = {isa = PBXBuildFile; fileRef = A157074317F0CD6D007C2BD6 /* ConversionsTest.m */; }; A157077817F0CD6D007C2BD6 /* Crc32Test.m in Sources */ = {isa = PBXBuildFile; fileRef = A157074517F0CD6D007C2BD6 /* Crc32Test.m */; }; - A157077917F0CD6D007C2BD6 /* CryptoUtilTest.m in Sources */ = {isa = PBXBuildFile; fileRef = A157074717F0CD6D007C2BD6 /* CryptoUtilTest.m */; }; + A157077917F0CD6D007C2BD6 /* CryptoToolsTest.m in Sources */ = {isa = PBXBuildFile; fileRef = A157074717F0CD6D007C2BD6 /* CryptoToolsTest.m */; }; A157077A17F0CD6D007C2BD6 /* CyclicalBufferTest.m in Sources */ = {isa = PBXBuildFile; fileRef = A157074917F0CD6D007C2BD6 /* CyclicalBufferTest.m */; }; A157077B17F0CD6D007C2BD6 /* ExceptionsTest.m in Sources */ = {isa = PBXBuildFile; fileRef = A157074B17F0CD6D007C2BD6 /* ExceptionsTest.m */; }; A157077C17F0CD6D007C2BD6 /* FunctionalUtilTest.m in Sources */ = {isa = PBXBuildFile; fileRef = A157074D17F0CD6D007C2BD6 /* FunctionalUtilTest.m */; }; @@ -1084,8 +1084,8 @@ A157074317F0CD6D007C2BD6 /* ConversionsTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ConversionsTest.m; sourceTree = ""; }; A157074417F0CD6D007C2BD6 /* Crc32Test.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Crc32Test.h; sourceTree = ""; }; A157074517F0CD6D007C2BD6 /* Crc32Test.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Crc32Test.m; sourceTree = ""; }; - A157074617F0CD6D007C2BD6 /* CryptoUtilTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CryptoUtilTest.h; sourceTree = ""; }; - A157074717F0CD6D007C2BD6 /* CryptoUtilTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CryptoUtilTest.m; sourceTree = ""; }; + A157074617F0CD6D007C2BD6 /* CryptoToolsTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CryptoToolsTest.h; sourceTree = ""; }; + A157074717F0CD6D007C2BD6 /* CryptoToolsTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CryptoToolsTest.m; sourceTree = ""; }; A157074817F0CD6D007C2BD6 /* CyclicalBufferTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CyclicalBufferTest.h; sourceTree = ""; }; A157074917F0CD6D007C2BD6 /* CyclicalBufferTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CyclicalBufferTest.m; sourceTree = ""; }; A157074A17F0CD6D007C2BD6 /* ExceptionsTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ExceptionsTest.h; sourceTree = ""; }; @@ -2426,8 +2426,8 @@ A157074317F0CD6D007C2BD6 /* ConversionsTest.m */, A157074417F0CD6D007C2BD6 /* Crc32Test.h */, A157074517F0CD6D007C2BD6 /* Crc32Test.m */, - A157074617F0CD6D007C2BD6 /* CryptoUtilTest.h */, - A157074717F0CD6D007C2BD6 /* CryptoUtilTest.m */, + A157074617F0CD6D007C2BD6 /* CryptoToolsTest.h */, + A157074717F0CD6D007C2BD6 /* CryptoToolsTest.m */, A157074817F0CD6D007C2BD6 /* CyclicalBufferTest.h */, A157074917F0CD6D007C2BD6 /* CyclicalBufferTest.m */, A157074A17F0CD6D007C2BD6 /* ExceptionsTest.h */, @@ -3363,7 +3363,7 @@ B97CBFA918860EA3008E0DE9 /* CountryCodeViewController.m in Sources */, 76EB060918170B33006006FC /* ResponderSessionDescriptor.m in Sources */, 76EB062518170B33006006FC /* PriorityQueue.m in Sources */, - A157077917F0CD6D007C2BD6 /* CryptoUtilTest.m in Sources */, + A157077917F0CD6D007C2BD6 /* CryptoToolsTest.m in Sources */, 76EB066118170B34006006FC /* RegisterViewController.m in Sources */, 76EB068D18170B34006006FC /* InboxFeedTableViewCell.m in Sources */, 76EB05A918170B33006006FC /* RtpSocket.m in Sources */, diff --git a/Signal/src/crypto/CryptoTools.h b/Signal/src/crypto/CryptoTools.h index d89e7a1df..584fb6832 100644 --- a/Signal/src/crypto/CryptoTools.h +++ b/Signal/src/crypto/CryptoTools.h @@ -16,7 +16,7 @@ @end -@interface NSData (CryptoUtil) +@interface NSData (CryptoTools) -(NSData*)hashWithSha256; diff --git a/Signal/src/crypto/CryptoTools.m b/Signal/src/crypto/CryptoTools.m index 8eee95552..38ea8c3e6 100644 --- a/Signal/src/crypto/CryptoTools.m +++ b/Signal/src/crypto/CryptoTools.m @@ -30,7 +30,7 @@ @end -@implementation NSData (CryptoUtil) +@implementation NSData (CryptoTools) -(NSData*)hmacWithSha1WithKey:(NSData*)key { return [EvpMessageDigest hmacUsingSha1Data:self withKey:key]; diff --git a/Signal/test/util/CryptoUtilTest.h b/Signal/test/util/CryptoToolsTest.h similarity index 100% rename from Signal/test/util/CryptoUtilTest.h rename to Signal/test/util/CryptoToolsTest.h diff --git a/Signal/test/util/CryptoUtilTest.m b/Signal/test/util/CryptoToolsTest.m similarity index 100% rename from Signal/test/util/CryptoUtilTest.m rename to Signal/test/util/CryptoToolsTest.m