nss/lib/softoken/lowpbe.h - Issue 1843333003: Update NSPR to 4.12 and NSS to 3.23 on iOS

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: nss/lib/softoken/lowpbe.h

Issue 1843333003: Update NSPR to 4.12 and NSS to 3.23 on iOS (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/nss.git@master

Patch Set: Created 4 years, 9 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: nss/lib/softoken/lowpbe.h

diff --git a/nss/lib/softoken/lowpbe.h b/nss/lib/softoken/lowpbe.h

index 00c1007f552af552ce7e254b4a09789fa519fb9a..3bf04f4392f45829c1d510a5e5bb08422c5377d4 100644

--- a/nss/lib/softoken/lowpbe.h

+++ b/nss/lib/softoken/lowpbe.h

@@ -77,7 +77,8 @@ nsspkcs5_AlgidToParam(SECAlgorithmID *algid);

* keyDB which only support PKCS 5 v1, PFX, and PKCS 12.

NSSPKCS5PBEParameter *

-nsspkcs5_NewParam(SECOidTag alg, SECItem *salt, int iterator);

+nsspkcs5_NewParam(SECOidTag alg, HASH_HashType hashType, SECItem *salt,

+ int iterationCount);

/* Encrypt/Decrypt data using password based encryption.