crypto/openpgp_symmetric_encryption.cc - Issue 11186004: Use the NSS internal key slot for all temporary key operations

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/openpgp_symmetric_encryption.cc

Issue 11186004: Use the NSS internal key slot for all temporary key operations (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Remove unused slot Created 8 years, 2 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/openpgp_symmetric_encryption.cc

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

index 7eb6737fe162758fbd58a1992126623fa0fb7862..702952b018719e8e6f8c04f128899d0c07cbfbca 100644

--- a/crypto/openpgp_symmetric_encryption.cc

+++ b/crypto/openpgp_symmetric_encryption.cc

@@ -150,7 +150,7 @@ void SaltedIteratedS2K(unsigned cipher_key_length,

// in ECB mode and with no IV.

bool CreateAESContext(const uint8* key, unsigned key_len,

ScopedPK11Context* out_decryption_context) {

- ScopedPK11Slot slot(PK11_GetBestSlot(CKM_AES_ECB, NULL));

+ ScopedPK11Slot slot(PK11_GetInternalSlot());

if (!slot.get())

return false;

SECItem key_item;

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