Skip to content

Commit c5cb9ee

Browse files
remove check e2ee
Signed-off-by: Marino Faggiana <[email protected]>
1 parent 874908d commit c5cb9ee

File tree

2 files changed

+7
-15
lines changed

2 files changed

+7
-15
lines changed

Nextcloud.xcodeproj/project.pbxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5907,7 +5907,7 @@
59075907
CLANG_WARN_UNREACHABLE_CODE = YES;
59085908
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
59095909
COPY_PHASE_STRIP = NO;
5910-
CURRENT_PROJECT_VERSION = 1;
5910+
CURRENT_PROJECT_VERSION = 0;
59115911
DEBUG_INFORMATION_FORMAT = dwarf;
59125912
DEVELOPMENT_TEAM = NKUJUXUJ3B;
59135913
ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -5934,7 +5934,7 @@
59345934
"@executable_path/Frameworks",
59355935
"@executable_path/../../Frameworks",
59365936
);
5937-
MARKETING_VERSION = 7.0.6;
5937+
MARKETING_VERSION = 7.0.7;
59385938
ONLY_ACTIVE_ARCH = YES;
59395939
OTHER_CFLAGS = "-v";
59405940
OTHER_LDFLAGS = "";
@@ -5973,7 +5973,7 @@
59735973
CLANG_WARN_UNREACHABLE_CODE = YES;
59745974
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
59755975
COPY_PHASE_STRIP = NO;
5976-
CURRENT_PROJECT_VERSION = 1;
5976+
CURRENT_PROJECT_VERSION = 0;
59775977
DEVELOPMENT_TEAM = NKUJUXUJ3B;
59785978
ENABLE_STRICT_OBJC_MSGSEND = YES;
59795979
ENABLE_TESTABILITY = YES;
@@ -5997,7 +5997,7 @@
59975997
"@executable_path/Frameworks",
59985998
"@executable_path/../../Frameworks",
59995999
);
6000-
MARKETING_VERSION = 7.0.6;
6000+
MARKETING_VERSION = 7.0.7;
60016001
ONLY_ACTIVE_ARCH = YES;
60026002
OTHER_CFLAGS = "-v";
60036003
OTHER_LDFLAGS = "";

iOSClient/Networking/E2EE/NCEndToEndMetadataV20.swift

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -271,21 +271,12 @@ extension NCEndToEndMetadata {
271271

272272
// SIGNATURE CHECK
273273
//
274-
if let signature {
275-
if !verifySignature(account: session.account, signature: signature, userId: tableUser.userId, metadata: metadata, users: users, version: version, certificate: tableUser.certificate) {
276-
return NKError(errorCode: NCGlobal.shared.errorE2EEKeyVerifySignature, errorDescription: "_e2e_error_")
277-
}
278-
}
279-
280-
/*
274+
// TODO: if null exit with error
281275
if let signature, !signature.isEmpty {
282276
if !verifySignature(account: session.account, signature: signature, userId: tableUser.userId, metadata: metadata, users: users, version: version, certificate: tableUser.certificate) {
283277
return NKError(errorCode: NCGlobal.shared.errorE2EEKeyVerifySignature, errorDescription: "_e2e_error_")
284278
}
285-
} else {
286-
return NKError(errorCode: NCGlobal.shared.errorE2EEKeyVerifySignature, errorDescription: "_e2e_error_")
287279
}
288-
*/
289280

290281
// FILEDROP
291282
//
@@ -325,7 +316,8 @@ extension NCEndToEndMetadata {
325316

326317
// CHECKSUM CHECK
327318
//
328-
if let keyChecksums = jsonCiphertextMetadata.keyChecksums {
319+
// TODO: if null exit with error
320+
if let keyChecksums = jsonCiphertextMetadata.keyChecksums, !keyChecksums.isEmpty {
329321
guard let hash = NCEndToEndEncryption.shared().createSHA256(decryptedMetadataKey),
330322
keyChecksums.contains(hash) else {
331323
return NKError(errorCode: NCGlobal.shared.errorE2EEKeyChecksums, errorDescription: NSLocalizedString("_e2e_error_", comment: ""))

0 commit comments

Comments
 (0)