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

Side by Side Diff: net/third_party/mozilla_security_manager/nsNSSCertificateDB.h

Issue 1423333006: Adding User Certificate (.crt) Import to Certificate Manager (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 11 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
OLDNEW
1 /* ***** BEGIN LICENSE BLOCK ***** 1 /* ***** BEGIN LICENSE BLOCK *****
2 * Version: MPL 1.1/GPL 2.0/LGPL 2.1 2 * Version: MPL 1.1/GPL 2.0/LGPL 2.1
3 * 3 *
4 * The contents of this file are subject to the Mozilla Public License Version 4 * The contents of this file are subject to the Mozilla Public License Version
5 * 1.1 (the "License"); you may not use this file except in compliance with 5 * 1.1 (the "License"); you may not use this file except in compliance with
6 * the License. You may obtain a copy of the License at 6 * the License. You may obtain a copy of the License at
7 * http://www.mozilla.org/MPL/ 7 * http://www.mozilla.org/MPL/
8 * 8 *
9 * Software distributed under the License is distributed on an "AS IS" basis, 9 * Software distributed under the License is distributed on an "AS IS" basis,
10 * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License 10 * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 net::X509Certificate* root, 58 net::X509Certificate* root,
59 net::NSSCertDatabase::TrustBits trustBits, 59 net::NSSCertDatabase::TrustBits trustBits,
60 net::NSSCertDatabase::ImportCertFailureList* not_imported); 60 net::NSSCertDatabase::ImportCertFailureList* not_imported);
61 61
62 bool ImportServerCert( 62 bool ImportServerCert(
63 PK11SlotInfo* slot, 63 PK11SlotInfo* slot,
64 const net::CertificateList& certificates, 64 const net::CertificateList& certificates,
65 net::NSSCertDatabase::TrustBits trustBits, 65 net::NSSCertDatabase::TrustBits trustBits,
66 net::NSSCertDatabase::ImportCertFailureList* not_imported); 66 net::NSSCertDatabase::ImportCertFailureList* not_imported);
67 67
68 int ImportUserCert(const net::CertificateList& certificates);
69
68 bool SetCertTrust(const net::X509Certificate* cert, 70 bool SetCertTrust(const net::X509Certificate* cert,
69 net::CertType type, 71 net::CertType type,
70 net::NSSCertDatabase::TrustBits trustBits); 72 net::NSSCertDatabase::TrustBits trustBits);
71 73
72 } // namespace mozilla_security_manager 74 } // namespace mozilla_security_manager
73 75
74 #endif // NET_THIRD_PARTY_MOZILLA_SECURITY_MANAGER_NSNSSCERTIFICATEDB_H_ 76 #endif // NET_THIRD_PARTY_MOZILLA_SECURITY_MANAGER_NSNSSCERTIFICATEDB_H_
OLDNEW
« no previous file with comments | « net/cert/nss_cert_database.cc ('k') | net/third_party/mozilla_security_manager/nsNSSCertificateDB.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698