Skip to content

Commit

Permalink
Auto-generate kdf_short vector tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@rnapier
rnapier committed Jan 10, 2014
1 parent 588a868 commit b0a8f62
Show file tree
Hide file tree
Showing 7 changed files with 222 additions and 70 deletions.
50 changes: 23 additions & 27 deletions RNCryptor.xcodeproj/project.pbxproj
View file
Expand Up @@ -25,12 +25,11 @@
AB13429515E0FC4600456914 /* RNCryptor.m in Sources */ = {isa = PBXBuildFile; fileRef = FB75651B1512D3E9007B806B /* RNCryptor.m */; };
AB13429715E0FC4E00456914 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AB13429615E0FC4E00456914 /* Security.framework */; };
AB13429915E0FD1D00456914 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AB13429815E0FD1D00456914 /* Foundation.framework */; };
FB30216118802ED900BF8F3C /* RNCryptorGeneratedVectorTests.m in Sources */ = {isa = PBXBuildFile; fileRef = FB30216018802ED900BF8F3C /* RNCryptorGeneratedVectorTests.m */; };
FB53C180187EE93900952674 /* kdf in CopyFiles */ = {isa = PBXBuildFile; fileRef = FB53C17C187EE90400952674 /* kdf */; };
FB53C181187EE93900952674 /* key in CopyFiles */ = {isa = PBXBuildFile; fileRef = FB53C17D187EE90400952674 /* key */; };
FB53C182187EE93900952674 /* password in CopyFiles */ = {isa = PBXBuildFile; fileRef = FB53C17E187EE90400952674 /* password */; };
FB53C183187EE93900952674 /* password-short in CopyFiles */ = {isa = PBXBuildFile; fileRef = FB53C17F187EE90400952674 /* password-short */; };
FB53C187187EEDB600952674 /* kdf-short in CopyFiles */ = {isa = PBXBuildFile; fileRef = FB53C186187EEDA900952674 /* kdf-short */; };
FB53C196187F6AB300952674 /* RNCryptorVectorTests.m in Sources */ = {isa = PBXBuildFile; fileRef = FB53C195187F6AB300952674 /* RNCryptorVectorTests.m */; };
FB53C196187F6AB300952674 /* XCTestCase+RNCryptorVectorTests.m in Sources */ = {isa = PBXBuildFile; fileRef = FB53C195187F6AB300952674 /* XCTestCase+RNCryptorVectorTests.m */; };
FB6AC68D16F6704200CA0C0A /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FB7564F31512D3C4007B806B /* Foundation.framework */; };
FB6AC69016F6704200CA0C0A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = FB6AC68F16F6704200CA0C0A /* main.m */; };
FB6AC69D16F672F700CA0C0A /* RNCryptor.m in Sources */ = {isa = PBXBuildFile; fileRef = FB75651B1512D3E9007B806B /* RNCryptor.m */; };
Expand Down Expand Up @@ -62,7 +61,6 @@
FB7565241512D9BE007B808D /* RNOpenSSLEncryptor.h in Headers */ = {isa = PBXBuildFile; fileRef = FB7565241512D9BE007B808C /* RNOpenSSLEncryptor.h */; };
FB7565241512D9BE007B808F /* RNOpenSSLDecryptor.h in Headers */ = {isa = PBXBuildFile; fileRef = FB7565241512D9BE007B808E /* RNOpenSSLDecryptor.h */; };
FB7565241512D9BE007B8091 /* RNOpenSSLDecryptor.m in Sources */ = {isa = PBXBuildFile; fileRef = FB7565241512D9BE007B8090 /* RNOpenSSLDecryptor.m */; };
FB799107187F7EE00069BEB4 /* RNCryptorGeneratedVectorTests.m in Sources */ = {isa = PBXBuildFile; fileRef = FB799106187F7EE00069BEB4 /* RNCryptorGeneratedVectorTests.m */; };
FBF7D58E167E5031004B6F0F /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FB7564F31512D3C4007B806B /* Foundation.framework */; };
FBF7D591167E5032004B6F0F /* rncryptorvectors.m in Sources */ = {isa = PBXBuildFile; fileRef = FBF7D590167E5032004B6F0F /* rncryptorvectors.m */; };
FBF7D5A9167E515D004B6F0F /* RNCryptor.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AB13427A15E0FC2300456914 /* RNCryptor.framework */; };
Expand Down Expand Up @@ -94,11 +92,9 @@
dstPath = vectors/v3;
dstSubfolderSpec = 16;
files = (
FB53C187187EEDB600952674 /* kdf-short in CopyFiles */,
FB53C180187EE93900952674 /* kdf in CopyFiles */,
FB53C181187EE93900952674 /* key in CopyFiles */,
FB53C182187EE93900952674 /* password in CopyFiles */,
FB53C183187EE93900952674 /* password-short in CopyFiles */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -114,13 +110,14 @@
AB13428715E0FC2300456914 /* RNCryptor OS X-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "RNCryptor OS X-Prefix.pch"; sourceTree = "<group>"; };
AB13429615E0FC4E00456914 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Security.framework; sourceTree = DEVELOPER_DIR; };
AB13429815E0FD1D00456914 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; };
FB30216018802ED900BF8F3C /* RNCryptorGeneratedVectorTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNCryptorGeneratedVectorTests.m; sourceTree = "<group>"; };
FB30216218802F5000BF8F3C /* kdf_short */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = kdf_short; sourceTree = "<group>"; };
FB30216318802F5000BF8F3C /* password_short */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = password_short; sourceTree = "<group>"; };
FB53C17C187EE90400952674 /* kdf */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = kdf; sourceTree = "<group>"; };
FB53C17D187EE90400952674 /* key */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = key; sourceTree = "<group>"; };
FB53C17E187EE90400952674 /* password */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = password; sourceTree = "<group>"; };
FB53C17F187EE90400952674 /* password-short */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "password-short"; sourceTree = "<group>"; };
FB53C186187EEDA900952674 /* kdf-short */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "kdf-short"; sourceTree = "<group>"; };
FB53C195187F6AB300952674 /* RNCryptorVectorTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNCryptorVectorTests.m; sourceTree = "<group>"; };
FB53C197187F6C6500952674 /* RNCryptorVectorTests.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNCryptorVectorTests.h; sourceTree = "<group>"; };
FB53C195187F6AB300952674 /* XCTestCase+RNCryptorVectorTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "XCTestCase+RNCryptorVectorTests.m"; sourceTree = "<group>"; };
FB53C197187F6C6500952674 /* XCTestCase+RNCryptorVectorTests.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "XCTestCase+RNCryptorVectorTests.h"; sourceTree = "<group>"; };
FB6AC68C16F6704100CA0C0A /* rncrypt */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = rncrypt; sourceTree = BUILT_PRODUCTS_DIR; };
FB6AC68F16F6704200CA0C0A /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
FB6AC69216F6704200CA0C0A /* rncrypt-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "rncrypt-Prefix.pch"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -152,7 +149,6 @@
FB7565241512D9BE007B808E /* RNOpenSSLDecryptor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RNOpenSSLDecryptor.h; sourceTree = "<group>"; };
FB7565241512D9BE007B8090 /* RNOpenSSLDecryptor.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNOpenSSLDecryptor.m; sourceTree = "<group>"; };
FB7565241512D9BE007B8092 /* README.md */ = {isa = PBXFileReference; lastKnownFileType = file.md; path = README.md; sourceTree = "<group>"; };
FB799106187F7EE00069BEB4 /* RNCryptorGeneratedVectorTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RNCryptorGeneratedVectorTests.m; path = "RNCryptorGeneratedVectorTests.m"; sourceTree = BUILT_PRODUCTS_DIR; };
FBE1F73A16A899D800C90463 /* RNCryptorV1.enc */ = {isa = PBXFileReference; lastKnownFileType = file; path = RNCryptorV1.enc; sourceTree = SOURCE_ROOT; };
FBF7D58C167E5031004B6F0F /* rncryptorvectors */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = rncryptorvectors; sourceTree = BUILT_PRODUCTS_DIR; };
FBF7D590167E5032004B6F0F /* rncryptorvectors.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = rncryptorvectors.m; sourceTree = "<group>"; };
Expand Down Expand Up @@ -236,6 +232,14 @@
name = "Supporting Files";
sourceTree = "<group>";
};
FB30215F18802E9700BF8F3C /* Generated */ = {
isa = PBXGroup;
children = (
FB30216018802ED900BF8F3C /* RNCryptorGeneratedVectorTests.m */,
);
path = Generated;
sourceTree = "<group>";
};
FB53C175187EE90400952674 /* vectors */ = {
isa = PBXGroup;
children = (
Expand All @@ -248,11 +252,11 @@
FB53C17B187EE90400952674 /* v3 */ = {
isa = PBXGroup;
children = (
FB30216218802F5000BF8F3C /* kdf_short */,
FB30216318802F5000BF8F3C /* password_short */,
FB53C17C187EE90400952674 /* kdf */,
FB53C186187EEDA900952674 /* kdf-short */,
FB53C17D187EE90400952674 /* key */,
FB53C17E187EE90400952674 /* password */,
FB53C17F187EE90400952674 /* password-short */,
);
path = v3;
sourceTree = "<group>";
Expand Down Expand Up @@ -354,14 +358,14 @@
FB7565091512D3C4007B806B /* RNCryptorTests */ = {
isa = PBXGroup;
children = (
FB799108187F7F900069BEB4 /* Generated Files */,
FB30215F18802E9700BF8F3C /* Generated */,
FB53C197187F6C6500952674 /* XCTestCase+RNCryptorVectorTests.h */,
FB53C195187F6AB300952674 /* XCTestCase+RNCryptorVectorTests.m */,
FB7565101512D3C5007B806B /* RNCryptorTests.m */,
FB6C9617185A0F1700CC2098 /* RNOpenSSLTests.m */,
FB6C9619185A0F7600CC2098 /* RNCryptorTestHelpers.h */,
FB6C961A185A0F7600CC2098 /* RNCryptorTestHelpers.m */,
FB75650A1512D3C4007B806B /* Supporting Files */,
FB53C197187F6C6500952674 /* RNCryptorVectorTests.h */,
FB53C195187F6AB300952674 /* RNCryptorVectorTests.m */,
);
path = RNCryptorTests;
sourceTree = "<group>";
Expand All @@ -376,14 +380,6 @@
name = "Supporting Files";
sourceTree = "<group>";
};
FB799108187F7F900069BEB4 /* Generated Files */ = {
isa = PBXGroup;
children = (
FB799106187F7EE00069BEB4 /* RNCryptorGeneratedVectorTests.m */,
);
name = "Generated Files";
sourceTree = "<group>";
};
FBF7D58F167E5031004B6F0F /* RNCryptorVectors */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -597,7 +593,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = "/bin/sh -e -x";
shellScript = "export LANG=en_US.UTF-8\nexport LANGUAGE=en_US.UTF-8\nexport LC_ALL=en_US.UTF-8\n\n${SRCROOT}/${TARGETNAME}/GenVectorTests -o ${BUILT_PRODUCTS_DIR}/RNCryptorGeneratedVectorTests.m -3 ${SRCROOT}/Spec/vectors/v3\n";
shellScript = "export LANG=en_US.UTF-8\nexport LANGUAGE=en_US.UTF-8\nexport LC_ALL=en_US.UTF-8\n\n${SRCROOT}/${TARGETNAME}/GenVectorTests -o ${SRCROOT}/RNCryptorTests/Generated/RNCryptorGeneratedVectorTests.m -3 ${SRCROOT}/Spec/vectors/v3\n";
showEnvVarsInLog = 0;
};
FB7564FE1512D3C4007B806B /* ShellScript */ = {
Expand Down Expand Up @@ -660,10 +656,10 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
FB799107187F7EE00069BEB4 /* RNCryptorGeneratedVectorTests.m in Sources */,
FB30216118802ED900BF8F3C /* RNCryptorGeneratedVectorTests.m in Sources */,
FB6C9618185A0F1700CC2098 /* RNOpenSSLTests.m in Sources */,
FB7565111512D3C5007B806B /* RNCryptorTests.m in Sources */,
FB53C196187F6AB300952674 /* RNCryptorVectorTests.m in Sources */,
FB53C196187F6AB300952674 /* XCTestCase+RNCryptorVectorTests.m in Sources */,
FB6C961B185A0F7600CC2098 /* RNCryptorTestHelpers.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down
26 changes: 19 additions & 7 deletions RNCryptor.xcodeproj/project.xcworkspace/xcshareddata/RNCryptor.xccheckout
View file
Expand Up @@ -5,37 +5,49 @@
<key>IDESourceControlProjectFavoriteDictionaryKey</key>
<false/>
<key>IDESourceControlProjectIdentifier</key>
<string>57325159-086D-4DB3-936B-D4FEFABDF4DB</string>
<string>3ABD3F64-A1E8-41CD-8789-63CBB720A99A</string>
<key>IDESourceControlProjectName</key>
<string>RNCryptor</string>
<key>IDESourceControlProjectOriginsDictionary</key>
<dict>
<key>1D1067EB-8A1B-4368-9F17-F3953E22ACE9</key>
<string>ssh://github.com/rnapier/RNCryptor.git</string>
<key>AB89CCB2-8938-48E0-92DF-EE3DD2C75CCB</key>
<string>ssh://github.com/RNCryptor/RNCryptor-Spec.git</string>
<key>D68E4317-45C0-46EA-86CB-15B52B489B23</key>
<string>ssh://github.com/RNCryptor/RNCryptor.git</string>
</dict>
<key>IDESourceControlProjectPath</key>
<string>RNCryptor.xcodeproj/project.xcworkspace</string>
<key>IDESourceControlProjectRelativeInstallPathDictionary</key>
<dict>
<key>1D1067EB-8A1B-4368-9F17-F3953E22ACE9</key>
<key>AB89CCB2-8938-48E0-92DF-EE3DD2C75CCB</key>
<string>../../Spec</string>
<key>D68E4317-45C0-46EA-86CB-15B52B489B23</key>
<string>../..</string>
</dict>
<key>IDESourceControlProjectURL</key>
<string>ssh://github.com/rnapier/RNCryptor.git</string>
<string>ssh://github.com/RNCryptor/RNCryptor.git</string>
<key>IDESourceControlProjectVersion</key>
<integer>110</integer>
<key>IDESourceControlProjectWCCIdentifier</key>
<string>1D1067EB-8A1B-4368-9F17-F3953E22ACE9</string>
<string>D68E4317-45C0-46EA-86CB-15B52B489B23</string>
<key>IDESourceControlProjectWCConfigurations</key>
<array>
<dict>
<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
<string>public.vcs.git</string>
<key>IDESourceControlWCCIdentifierKey</key>
<string>1D1067EB-8A1B-4368-9F17-F3953E22ACE9</string>
<string>D68E4317-45C0-46EA-86CB-15B52B489B23</string>
<key>IDESourceControlWCCName</key>
<string>RNCryptor</string>
</dict>
<dict>
<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
<string>public.vcs.git</string>
<key>IDESourceControlWCCIdentifierKey</key>
<string>AB89CCB2-8938-48E0-92DF-EE3DD2C75CCB</string>
<key>IDESourceControlWCCName</key>
<string>Spec</string>
</dict>
</array>
</dict>
</plist>
43 changes: 25 additions & 18 deletions RNCryptorTests/GenVectorTests
View file
Expand Up @@ -3,47 +3,54 @@
require 'optparse'
require File.join(File.dirname(__FILE__), '../Spec/vectors', 'vectorparser')

@options = {}


def NSDictionaryForHash(hash)
"@{\n" + hash.collect { |key, value| %Q( @"#{key}": @"#{value}") }.join(",\n") + "}"
end

options = {}
def outputTestsForFile(output, name)

VectorParser.new(@options[:v3_directory] + "/" + name).vectors.each do |vector|
output << <<-TEST_CASE
- (void)test_#{name}_#{vector["title"].gsub(' ', '_')} {
[self verify_#{name}:#{NSDictionaryForHash(vector)}];
}
TEST_CASE

end
end

opt_parser = OptionParser.new do |opt|
opt.banner = "Usage: GenVectorTest -o VectorTests.m -3 v3_directory"
opt.separator ""
opt.on("-o","--output PATH","path to output code") do |output_path|
options[:output_path] = output_path
@options[:output_path] = output_path
end
opt.on("-3", "-3 PATH", "path to v3 directory") do |v3_directory|
options[:v3_directory] = v3_directory
@options[:v3_directory] = v3_directory
end
end

opt_parser.parse!

raise OptionParser::MissingArgument if options[:output_path].nil?
raise OptionParser::MissingArgument if options[:v3_directory].nil?
raise OptionParser::MissingArgument if @options[:output_path].nil?
raise OptionParser::MissingArgument if @options[:v3_directory].nil?

File.open(options[:output_path], "w") do |output|
File.open(@options[:output_path], "w") do |output|
output << <<-HEADER
// Automatically Generated by GenVectorTests
#import "RNCryptorVectorTests.h"
@interface RNCryptorGeneratedVectorTests : RNCryptorVectorTests
#import "XCTestCase+RNCryptorVectorTests.h"
@interface RNCryptorGeneratedVectorTests : XCTestCase
@end
@implementation RNCryptorGeneratedVectorTests
HEADER

VectorParser.new(options[:v3_directory] + "/kdf").vectors.each do |vector|
output << <<-TEST_CASE
- (void)test_kdf_#{vector["title"].gsub(' ', '_')} {
[self verifyKDFVector:#{NSDictionaryForHash(vector)}];
}
TEST_CASE

end
outputTestsForFile(output, "kdf");
outputTestsForFile(output, "kdf_short");

output<< <<-FOOTER
@end
Expand Down

0 comments on commit b0a8f62

Please sign in to comment.