crypto/symmetric_key_unittest.cc - Issue 10831307: Upstream minor iOS crypto diffs.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: crypto/symmetric_key_unittest.cc

Issue 10831307: Upstream minor iOS crypto diffs. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Created 8 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: crypto/symmetric_key_unittest.cc

diff --git a/crypto/symmetric_key_unittest.cc b/crypto/symmetric_key_unittest.cc

index a07194ec0bb8d42c6202d3377e4bb15168320eef..389d7f5c5290540f461faef8a984e8323f6de80d 100644

--- a/crypto/symmetric_key_unittest.cc

+++ b/crypto/symmetric_key_unittest.cc

@@ -80,7 +80,7 @@ class SymmetricKeyDeriveKeyFromPasswordTest

TEST_P(SymmetricKeyDeriveKeyFromPasswordTest, DeriveKeyFromPassword) {

PBKDF2TestVector test_data(GetParam());

-#if defined(OS_MACOSX)

+#if defined(OS_MACOSX) && !defined(OS_IOS)

// The OS X crypto libraries have minimum salt and iteration requirements

// so some of the tests below will cause them to barf. Skip these.

if (strlen(test_data.salt) < 8 || test_data.rounds < 1000) {

« no previous file with comments | « crypto/nss_util.cc ('k') | no next file » | no next file with comments »