openssl/crypto/pkcs12/p12_crt.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_crt.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_crt.c

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

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

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

@@ -59,12 +59,8 @@

#include <stdio.h>

#include "cryptlib.h"

#include <openssl/pkcs12.h>

-#ifdef OPENSSL_FIPS

-#include <openssl/fips.h>

-#endif

static int pkcs12_add_bag(STACK_OF(PKCS12_SAFEBAG) **pbags, PKCS12_SAFEBAG *bag);

static int copy_bag_attr(PKCS12_SAFEBAG *bag, EVP_PKEY *pkey, int nid)

@@ -94,14 +90,7 @@

/* Set defaults */

if (!nid_cert)

- {

-#ifdef OPENSSL_FIPS

- if (FIPS_mode())

- nid_cert = NID_pbe_WithSHA1And3_Key_TripleDES_CBC;

- else

-#endif

nid_cert = NID_pbe_WithSHA1And40BitRC2_CBC;

- }

if (!nid_key)

nid_key = NID_pbe_WithSHA1And3_Key_TripleDES_CBC;

if (!iter)

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