Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(436)

Side by Side Diff: net/third_party/nss/ssl/sslauth.c

Issue 6487026: Update to NSS 3.12.9. falsestart.patch, falsestart2.patch, and... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 10 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
« no previous file with comments | « net/third_party/nss/ssl/ssl3gthr.c ('k') | net/third_party/nss/ssl/sslerr.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 15 matching lines...) Expand all
26 * in which case the provisions of the GPL or the LGPL are applicable instead 26 * in which case the provisions of the GPL or the LGPL are applicable instead
27 * of those above. If you wish to allow use of your version of this file only 27 * of those above. If you wish to allow use of your version of this file only
28 * under the terms of either the GPL or the LGPL, and not to allow others to 28 * under the terms of either the GPL or the LGPL, and not to allow others to
29 * use your version of this file under the terms of the MPL, indicate your 29 * use your version of this file under the terms of the MPL, indicate your
30 * decision by deleting the provisions above and replace them with the notice 30 * decision by deleting the provisions above and replace them with the notice
31 * and other provisions required by the GPL or the LGPL. If you do not delete 31 * and other provisions required by the GPL or the LGPL. If you do not delete
32 * the provisions above, a recipient may use your version of this file under 32 * the provisions above, a recipient may use your version of this file under
33 * the terms of any one of the MPL, the GPL or the LGPL. 33 * the terms of any one of the MPL, the GPL or the LGPL.
34 * 34 *
35 * ***** END LICENSE BLOCK ***** */ 35 * ***** END LICENSE BLOCK ***** */
36 /* $Id: sslauth.c,v 1.16 2006/04/20 00:20:45 alexei.volkov.bugs%sun.com Exp $ */ 36 /* $Id: sslauth.c,v 1.16.66.1 2010/08/03 18:52:13 wtc%google.com Exp $ */
37 #include "cert.h" 37 #include "cert.h"
38 #include "secitem.h" 38 #include "secitem.h"
39 #include "ssl.h" 39 #include "ssl.h"
40 #include "sslimpl.h" 40 #include "sslimpl.h"
41 #include "sslproto.h" 41 #include "sslproto.h"
42 #include "pk11func.h" 42 #include "pk11func.h"
43 43
44 /* NEED LOCKS IN HERE. */ 44 /* NEED LOCKS IN HERE. */
45 CERTCertificate * 45 CERTCertificate *
46 SSL_PeerCertificate(PRFileDesc *fd) 46 SSL_PeerCertificate(PRFileDesc *fd)
(...skipping 282 matching lines...) Expand 10 before | Expand all | Expand 10 after
329 hostname = ss->url; 329 hostname = ss->url;
330 if (hostname && hostname[0]) 330 if (hostname && hostname[0])
331 rv = CERT_VerifyCertName(ss->sec.peerCert, hostname); 331 rv = CERT_VerifyCertName(ss->sec.peerCert, hostname);
332 else 332 else
333 rv = SECFailure; 333 rv = SECFailure;
334 if (rv != SECSuccess) 334 if (rv != SECSuccess)
335 PORT_SetError(SSL_ERROR_BAD_CERT_DOMAIN); 335 PORT_SetError(SSL_ERROR_BAD_CERT_DOMAIN);
336 336
337 return rv; 337 return rv;
338 } 338 }
OLDNEW
« no previous file with comments | « net/third_party/nss/ssl/ssl3gthr.c ('k') | net/third_party/nss/ssl/sslerr.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698