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

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

Issue 14522022: Update NSS libSSL to NSS_3_15_BETA2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Make the changes rsleevi suggested Created 7 years, 7 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
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 * This Source Code Form is subject to the terms of the Mozilla Public 4 * This Source Code Form is subject to the terms of the Mozilla Public
5 * License, v. 2.0. If a copy of the MPL was not distributed with this 5 * License, v. 2.0. If a copy of the MPL was not distributed with this
6 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ 6 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
7 /* $Id: ssldef.c,v 1.13 2012/04/25 14:50:12 gerv%gerv.net Exp $ */ 7 /* $Id$ */
8 8
9 #include "cert.h" 9 #include "cert.h"
10 #include "ssl.h" 10 #include "ssl.h"
11 #include "sslimpl.h" 11 #include "sslimpl.h"
12 12
13 #if defined(WIN32) 13 #if defined(WIN32)
14 #define MAP_ERROR(from,to) if (err == from) { PORT_SetError(to); } 14 #define MAP_ERROR(from,to) if (err == from) { PORT_SetError(to); }
15 #define DEFINE_ERROR PRErrorCode err = PR_GetError(); 15 #define DEFINE_ERROR PRErrorCode err = PR_GetError();
16 #else 16 #else
17 #define MAP_ERROR(from,to) 17 #define MAP_ERROR(from,to)
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after
202 ** Now close the underlying socket. 202 ** Now close the underlying socket.
203 */ 203 */
204 rv = fd->methods->close(fd); 204 rv = fd->methods->close(fd);
205 205
206 ssl_FreeSocket(ss); 206 ssl_FreeSocket(ss);
207 207
208 SSL_TRC(5, ("%d: SSL[%d]: closing, rv=%d errno=%d", 208 SSL_TRC(5, ("%d: SSL[%d]: closing, rv=%d errno=%d",
209 SSL_GETPID(), fd, rv, PORT_GetError())); 209 SSL_GETPID(), fd, rv, PORT_GetError()));
210 return rv; 210 return rv;
211 } 211 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698