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

Side by Side Diff: net/socket/nss_ssl_util.cc

Issue 36593002: crypto/nss_util: Get TPM slot id, do lookup by id instead of by name. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sandbox debugging crap Created 7 years, 2 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
« crypto/nss_util_internal.h ('K') | « net/http/des.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/socket/nss_ssl_util.h" 5 #include "net/socket/nss_ssl_util.h"
6 6
7 #include <nss.h> 7 #include <nss.h>
8 #include <secerr.h> 8 #include <secerr.h>
9 #include <ssl.h> 9 #include <ssl.h>
10 #include <sslerr.h> 10 #include <sslerr.h>
(...skipping 14 matching lines...) Expand all
25 25
26 #if defined(OS_WIN) 26 #if defined(OS_WIN)
27 #include "base/win/windows_version.h" 27 #include "base/win/windows_version.h"
28 #endif 28 #endif
29 29
30 namespace net { 30 namespace net {
31 31
32 class NSSSSLInitSingleton { 32 class NSSSSLInitSingleton {
33 public: 33 public:
34 NSSSSLInitSingleton() { 34 NSSSSLInitSingleton() {
35 LOG(ERROR) << "HIIIIIIIIIIIIIIIIIIIIIIIIIII";
35 crypto::EnsureNSSInit(); 36 crypto::EnsureNSSInit();
36 37
37 NSS_SetDomesticPolicy(); 38 NSS_SetDomesticPolicy();
38 39
39 const PRUint16* const ssl_ciphers = SSL_GetImplementedCiphers(); 40 const PRUint16* const ssl_ciphers = SSL_GetImplementedCiphers();
40 const PRUint16 num_ciphers = SSL_GetNumImplementedCiphers(); 41 const PRUint16 num_ciphers = SSL_GetNumImplementedCiphers();
41 42
42 // Disable ECDSA cipher suites on platforms that do not support ECDSA 43 // Disable ECDSA cipher suites on platforms that do not support ECDSA
43 // signed certificates, as servers may use the presence of such 44 // signed certificates, as servers may use the presence of such
44 // ciphersuites as a hint to send an ECDSA certificate. 45 // ciphersuites as a hint to send an ECDSA certificate.
(...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after
271 const char* param) { 272 const char* param) {
272 DCHECK(function); 273 DCHECK(function);
273 DCHECK(param); 274 DCHECK(param);
274 net_log.AddEvent( 275 net_log.AddEvent(
275 NetLog::TYPE_SSL_NSS_ERROR, 276 NetLog::TYPE_SSL_NSS_ERROR,
276 base::Bind(&NetLogSSLFailedNSSFunctionCallback, 277 base::Bind(&NetLogSSLFailedNSSFunctionCallback,
277 function, param, PR_GetError())); 278 function, param, PR_GetError()));
278 } 279 }
279 280
280 } // namespace net 281 } // namespace net
OLDNEW
« crypto/nss_util_internal.h ('K') | « net/http/des.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698