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

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

Issue 11275240: Update net/third_party/nss/ssl to NSS 3.14. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Upload before commit Created 8 years, 1 month 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/sslcon.c ('k') | net/third_party/nss/ssl/sslenum.c » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * "Default" SSLSocket methods, used by sockets that do neither SSL nor socks. 2 * "Default" SSLSocket methods, used by sockets that do neither SSL nor socks.
3 * 3 *
4 * ***** BEGIN LICENSE BLOCK ***** 4 * This Source Code Form is subject to the terms of the Mozilla Public
5 * Version: MPL 1.1/GPL 2.0/LGPL 2.1 5 * License, v. 2.0. If a copy of the MPL was not distributed with this
6 * 6 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
7 * The contents of this file are subject to the Mozilla Public License Version 7 /* $Id: ssldef.c,v 1.13 2012/04/25 14:50:12 gerv%gerv.net Exp $ */
8 * 1.1 (the "License"); you may not use this file except in compliance with
9 * the License. You may obtain a copy of the License at
10 * http://www.mozilla.org/MPL/
11 *
12 * Software distributed under the License is distributed on an "AS IS" basis,
13 * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
14 * for the specific language governing rights and limitations under the
15 * License.
16 *
17 * The Original Code is the Netscape security libraries.
18 *
19 * The Initial Developer of the Original Code is
20 * Netscape Communications Corporation.
21 * Portions created by the Initial Developer are Copyright (C) 1994-2000
22 * the Initial Developer. All Rights Reserved.
23 *
24 * Contributor(s):
25 *
26 * Alternatively, the contents of this file may be used under the terms of
27 * either the GNU General Public License Version 2 or later (the "GPL"), or
28 * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
29 * in which case the provisions of the GPL or the LGPL are applicable instead
30 * of those above. If you wish to allow use of your version of this file only
31 * under the terms of either the GPL or the LGPL, and not to allow others to
32 * use your version of this file under the terms of the MPL, indicate your
33 * decision by deleting the provisions above and replace them with the notice
34 * and other provisions required by the GPL or the LGPL. If you do not delete
35 * the provisions above, a recipient may use your version of this file under
36 * the terms of any one of the MPL, the GPL or the LGPL.
37 *
38 * ***** END LICENSE BLOCK ***** */
39 /* $Id: ssldef.c,v 1.11 2006/04/20 08:46:34 nelson%bolyard.com Exp $ */
40 8
41 #include "cert.h" 9 #include "cert.h"
42 #include "ssl.h" 10 #include "ssl.h"
43 #include "sslimpl.h" 11 #include "sslimpl.h"
44 12
45 #if defined(WIN32) 13 #if defined(WIN32)
46 #define MAP_ERROR(from,to) if (err == from) { PORT_SetError(to); } 14 #define MAP_ERROR(from,to) if (err == from) { PORT_SetError(to); }
47 #define DEFINE_ERROR PRErrorCode err = PR_GetError(); 15 #define DEFINE_ERROR PRErrorCode err = PR_GetError();
48 #else 16 #else
49 #define MAP_ERROR(from,to) 17 #define MAP_ERROR(from,to)
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after
234 ** Now close the underlying socket. 202 ** Now close the underlying socket.
235 */ 203 */
236 rv = fd->methods->close(fd); 204 rv = fd->methods->close(fd);
237 205
238 ssl_FreeSocket(ss); 206 ssl_FreeSocket(ss);
239 207
240 SSL_TRC(5, ("%d: SSL[%d]: closing, rv=%d errno=%d", 208 SSL_TRC(5, ("%d: SSL[%d]: closing, rv=%d errno=%d",
241 SSL_GETPID(), fd, rv, PORT_GetError())); 209 SSL_GETPID(), fd, rv, PORT_GetError()));
242 return rv; 210 return rv;
243 } 211 }
OLDNEW
« no previous file with comments | « net/third_party/nss/ssl/sslcon.c ('k') | net/third_party/nss/ssl/sslenum.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698