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

Side by Side Diff: net/cert/cert_database_win.cc

Issue 686883002: Add crypto/wincrypt_shim.h wrapper header to resolve BoringSSL conflicts. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: sleevi comments Created 6 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
« no previous file with comments | « net/base/keygen_handler_win.cc ('k') | net/cert/cert_verify_proc_win.cc » ('j') | 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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/cert/cert_database.h" 5 #include "net/cert/cert_database.h"
6 6
7 #include <windows.h> 7 #include <windows.h>
8 #include <wincrypt.h>
9 #pragma comment(lib, "crypt32.lib")
10 8
11 #include "base/observer_list_threadsafe.h" 9 #include "base/observer_list_threadsafe.h"
10 #include "crypto/wincrypt_shim.h"
12 #include "net/base/net_errors.h" 11 #include "net/base/net_errors.h"
13 #include "net/cert/x509_certificate.h" 12 #include "net/cert/x509_certificate.h"
14 13
14 #pragma comment(lib, "crypt32.lib")
15
15 namespace net { 16 namespace net {
16 17
17 CertDatabase::CertDatabase() 18 CertDatabase::CertDatabase()
18 : observer_list_(new ObserverListThreadSafe<Observer>) { 19 : observer_list_(new ObserverListThreadSafe<Observer>) {
19 } 20 }
20 21
21 CertDatabase::~CertDatabase() {} 22 CertDatabase::~CertDatabase() {}
22 23
23 int CertDatabase::CheckUserCert(X509Certificate* cert) { 24 int CertDatabase::CheckUserCert(X509Certificate* cert) {
24 if (!cert) 25 if (!cert)
(...skipping 27 matching lines...) Expand all
52 CertCloseStore(cert_db, 0); 53 CertCloseStore(cert_db, 0);
53 54
54 if (!added) 55 if (!added)
55 return ERR_ADD_USER_CERT_FAILED; 56 return ERR_ADD_USER_CERT_FAILED;
56 57
57 NotifyObserversOfCertAdded(cert); 58 NotifyObserversOfCertAdded(cert);
58 return OK; 59 return OK;
59 } 60 }
60 61
61 } // namespace net 62 } // namespace net
OLDNEW
« no previous file with comments | « net/base/keygen_handler_win.cc ('k') | net/cert/cert_verify_proc_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698