crypto/ec_private_key_openssl.cc - Issue 1321793002: Roll src/third_party/boringssl/src 12fe1b25e..ac8302a09

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

Issue 1321793002: Roll src/third_party/boringssl/src 12fe1b25e..ac8302a09 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: roll further Created 5 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:

View side-by-side diff with in-line comments

Download patch

Index: crypto/ec_private_key_openssl.cc

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

index 35403f39ce88588a492f222800842268ce55ddd4..1a060283892296079e6ba7d338c914d5839cd702 100644

--- a/crypto/ec_private_key_openssl.cc

+++ b/crypto/ec_private_key_openssl.cc

@@ -176,9 +176,10 @@ bool ECPrivateKey::ExportEncryptedPrivateKey(

// equivalent.

ScopedX509_SIG encrypted(PKCS8_encrypt_pbe(

NID_pbe_WithSHA1And3_Key_TripleDES_CBC,

+ nullptr,

reinterpret_cast<const uint8_t*>(password.data()),

password.size(),

- NULL,

+ nullptr,

iterations,

pkcs8.get()));

« no previous file with comments | « DEPS ('k') | third_party/boringssl/BUILD.gn » ('j') | no next file with comments »