openssl/crypto/pkcs12/p12_crpt.c - Issue 9254031: Upgrade chrome's OpenSSL to same version Android ships with.

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: openssl/crypto/pkcs12/p12_crpt.c

Issue 9254031: Upgrade chrome's OpenSSL to same version Android ships with. (Closed) Base URL: http://src.chromium.org/svn/trunk/deps/third_party/openssl/

Patch Set: '' Created 8 years, 11 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: openssl/crypto/pkcs12/p12_crpt.c

===================================================================

--- openssl/crypto/pkcs12/p12_crpt.c (revision 105093)

+++ openssl/crypto/pkcs12/p12_crpt.c (working copy)

@@ -60,28 +60,10 @@

#include "cryptlib.h"

#include <openssl/pkcs12.h>

-/* PKCS#12 specific PBE functions */

+/* PKCS#12 PBE algorithms now in static table */

void PKCS12_PBE_add(void)

{

-#ifndef OPENSSL_NO_RC4

-EVP_PBE_alg_add(NID_pbe_WithSHA1And128BitRC4, EVP_rc4(), EVP_sha1(),

- PKCS12_PBE_keyivgen);

-EVP_PBE_alg_add(NID_pbe_WithSHA1And40BitRC4, EVP_rc4_40(), EVP_sha1(),

- PKCS12_PBE_keyivgen);

-#endif

-#ifndef OPENSSL_NO_DES

-EVP_PBE_alg_add(NID_pbe_WithSHA1And3_Key_TripleDES_CBC,

- EVP_des_ede3_cbc(), EVP_sha1(), PKCS12_PBE_keyivgen);

-EVP_PBE_alg_add(NID_pbe_WithSHA1And2_Key_TripleDES_CBC,

- EVP_des_ede_cbc(), EVP_sha1(), PKCS12_PBE_keyivgen);

-#endif

-#ifndef OPENSSL_NO_RC2

-EVP_PBE_alg_add(NID_pbe_WithSHA1And128BitRC2_CBC, EVP_rc2_cbc(),

- EVP_sha1(), PKCS12_PBE_keyivgen);

-EVP_PBE_alg_add(NID_pbe_WithSHA1And40BitRC2_CBC, EVP_rc2_40_cbc(),

- EVP_sha1(), PKCS12_PBE_keyivgen);

-#endif

}

int PKCS12_PBE_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen,

« no previous file with comments | « openssl/crypto/pkcs12/p12_attr.c ('k') | openssl/crypto/pkcs12/p12_crt.c » ('j') | no next file with comments »