chrome/third_party/mozilla_security_manager/nsNSSCertHelper.cpp - Issue 9940001: Fix imported server certs being distrusted in NSS 3.13.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: chrome/third_party/mozilla_security_manager/nsNSSCertHelper.cpp

Issue 9940001: Fix imported server certs being distrusted in NSS 3.13. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 8 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 unified diff | Download patch | Annotate | Revision Log

« chrome/browser/certificate_manager_model.h ('K') | « chrome/browser/ui/webui/options2/certificate_manager_handler2.cc ('k') | net/base/cert_database.h » ('j') | net/base/cert_database.h » ('J')

OLD	NEW
1 /* *** BEGIN LICENSE BLOCK ***	1 /* *** BEGIN LICENSE BLOCK ***

2 * Version: MPL 1.1/GPL 2.0/LGPL 2.1	2 * Version: MPL 1.1/GPL 2.0/LGPL 2.1

3 *	3 *

4 * The contents of this file are subject to the Mozilla Public License Version	4 * The contents of this file are subject to the Mozilla Public License Version

5 * 1.1 (the "License"); you may not use this file except in compliance with	5 * 1.1 (the "License"); you may not use this file except in compliance with

6 * the License. You may obtain a copy of the License at	6 * the License. You may obtain a copy of the License at

7 * http://www.mozilla.org/MPL/	7 * http://www.mozilla.org/MPL/

8 *	8 *

9 * Software distributed under the License is distributed on an "AS IS" basis,	9 * Software distributed under the License is distributed on an "AS IS" basis,

10 * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License	10 * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License

(...skipping 1040 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1051 }	1051 }

1052 return rv;	1052 return rv;

1053 }	1053 }

1054	1054

1055 net::CertType GetCertType(CERTCertificate *cert) {	1055 net::CertType GetCertType(CERTCertificate *cert) {

1056 nsNSSCertTrust trust(cert->trust);	1056 nsNSSCertTrust trust(cert->trust);

1057 if (cert->nickname && trust.HasAnyUser())	1057 if (cert->nickname && trust.HasAnyUser())

1058 return net::USER_CERT;	1058 return net::USER_CERT;

1059 if (trust.HasAnyCA() \|\| CERT_IsCACert(cert, NULL))	1059 if (trust.HasAnyCA() \|\| CERT_IsCACert(cert, NULL))

1060 return net::CA_CERT;	1060 return net::CA_CERT;

1061 if (trust.HasPeer(PR_TRUE, PR_FALSE, PR_FALSE))	1061 if (trust.HasTerminalRecord(PR_TRUE, PR_FALSE, PR_FALSE))

1062 return net::SERVER_CERT;	1062 return net::SERVER_CERT;

1063 return net::UNKNOWN_CERT;	1063 return net::UNKNOWN_CERT;

1064 }	1064 }

1065	1065

1066 } // namespace mozilla_security_manager	1066 } // namespace mozilla_security_manager

OLD	NEW