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

Side by Side Diff: net/third_party/nss/ssl/sslinfo.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 /* This Source Code Form is subject to the terms of the Mozilla Public 1 /* This Source Code Form is subject to the terms of the Mozilla Public
2 * License, v. 2.0. If a copy of the MPL was not distributed with this 2 * License, v. 2.0. If a copy of the MPL was not distributed with this
3 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ 3 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
4 /* $Id: sslinfo.c,v 1.31 2012/08/03 23:54:31 wtc%google.com Exp $ */ 4 /* $Id$ */
5 #include "ssl.h" 5 #include "ssl.h"
6 #include "sslimpl.h" 6 #include "sslimpl.h"
7 #include "sslproto.h" 7 #include "sslproto.h"
8 8
9 static const char * 9 static const char *
10 ssl_GetCompressionMethodName(SSLCompressionMethod compression) 10 ssl_GetCompressionMethodName(SSLCompressionMethod compression)
11 { 11 {
12 switch (compression) { 12 switch (compression) {
13 case ssl_compression_null: 13 case ssl_compression_null:
14 return "NULL"; 14 return "NULL";
(...skipping 374 matching lines...) Expand 10 before | Expand all | Expand 10 after
389 rv = ssl3_TLSPRFWithMasterSecret(ss->ssl3.cwSpec, label, labelLen, val, 389 rv = ssl3_TLSPRFWithMasterSecret(ss->ssl3.cwSpec, label, labelLen, val,
390 valLen, out, outLen); 390 valLen, out, outLen);
391 } 391 }
392 ssl_ReleaseSpecReadLock(ss); 392 ssl_ReleaseSpecReadLock(ss);
393 ssl_ReleaseSSL3HandshakeLock(ss); 393 ssl_ReleaseSSL3HandshakeLock(ss);
394 ssl_ReleaseRecvBufLock(ss); 394 ssl_ReleaseRecvBufLock(ss);
395 395
396 PORT_ZFree(val, valLen); 396 PORT_ZFree(val, valLen);
397 return rv; 397 return rv;
398 } 398 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698