This commit is contained in:
Kelp 2013-11-21 13:11:44 +08:00
parent c7fdceef68
commit b10faf55e3
2 changed files with 11 additions and 13 deletions

View File

@ -187,7 +187,7 @@
2113922F16EAD6AF00AFDF87 /* Project object */ = { 2113922F16EAD6AF00AFDF87 /* Project object */ = {
isa = PBXProject; isa = PBXProject;
attributes = { attributes = {
LastUpgradeCheck = 0460; LastUpgradeCheck = 0500;
TargetAttributes = { TargetAttributes = {
21BB8A2C17FEA0EC0032C38C = { 21BB8A2C17FEA0EC0032C38C = {
TestTargetID = 2113923616EAD6AF00AFDF87; TestTargetID = 2113923616EAD6AF00AFDF87;
@ -349,7 +349,6 @@
21BB8A3E17FEA0EC0032C38C /* Debug */ = { 21BB8A3E17FEA0EC0032C38C /* Debug */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
@ -379,7 +378,6 @@
21BB8A3F17FEA0EC0032C38C /* Release */ = { 21BB8A3F17FEA0EC0032C38C /* Release */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;

View File

@ -52,12 +52,12 @@
} }
// setup output buffer // setup output buffer
size_t bufferSize = [data length] + kCCBlockSizeAES128; size_t bufferSize = [data length] + kCCBlockSizeAES128;
void *buffer = malloc(bufferSize); void *buffer = malloc(bufferSize);
// do encrypt // do encrypt
size_t encryptedSize = 0; size_t encryptedSize = 0;
CCCryptorStatus cryptStatus = CCCrypt(kCCEncrypt, CCCryptorStatus cryptStatus = CCCrypt(kCCEncrypt,
kCCAlgorithmAES128, kCCAlgorithmAES128,
kCCOptionPKCS7Padding, kCCOptionPKCS7Padding,
[key bytes], // Key [key bytes], // Key
@ -68,7 +68,7 @@
buffer, buffer,
bufferSize, bufferSize,
&encryptedSize); &encryptedSize);
if (cryptStatus == kCCSuccess) { if (cryptStatus == kCCSuccess) {
CocoaSecurityResult *result = [[CocoaSecurityResult alloc] initWithBytes:buffer length:encryptedSize]; CocoaSecurityResult *result = [[CocoaSecurityResult alloc] initWithBytes:buffer length:encryptedSize];
free(buffer); free(buffer);
@ -121,12 +121,12 @@
} }
// setup output buffer // setup output buffer
size_t bufferSize = [data length] + kCCBlockSizeAES128; size_t bufferSize = [data length] + kCCBlockSizeAES128;
void *buffer = malloc(bufferSize); void *buffer = malloc(bufferSize);
// do encrypt // do encrypt
size_t encryptedSize = 0; size_t encryptedSize = 0;
CCCryptorStatus cryptStatus = CCCrypt(kCCDecrypt, CCCryptorStatus cryptStatus = CCCrypt(kCCDecrypt,
kCCAlgorithmAES128, kCCAlgorithmAES128,
kCCOptionPKCS7Padding, kCCOptionPKCS7Padding,
[key bytes], // Key [key bytes], // Key
@ -137,7 +137,7 @@
buffer, buffer,
bufferSize, bufferSize,
&encryptedSize); &encryptedSize);
if (cryptStatus == kCCSuccess) { if (cryptStatus == kCCSuccess) {
CocoaSecurityResult *result = [[CocoaSecurityResult alloc] initWithBytes:buffer length:encryptedSize]; CocoaSecurityResult *result = [[CocoaSecurityResult alloc] initWithBytes:buffer length:encryptedSize];
free(buffer); free(buffer);