| OLD | NEW |
| 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 24 matching lines...) Expand all Loading... |
| 35 * the terms of any one of the MPL, the GPL or the LGPL. | 35 * the terms of any one of the MPL, the GPL or the LGPL. |
| 36 * | 36 * |
| 37 * ***** END LICENSE BLOCK ***** */ | 37 * ***** END LICENSE BLOCK ***** */ |
| 38 | 38 |
| 39 #ifndef NET_THIRD_PARTY_MOZILLA_SECURITY_MANAGER_NSNSSCERTIFICATEDB_H_ | 39 #ifndef NET_THIRD_PARTY_MOZILLA_SECURITY_MANAGER_NSNSSCERTIFICATEDB_H_ |
| 40 #define NET_THIRD_PARTY_MOZILLA_SECURITY_MANAGER_NSNSSCERTIFICATEDB_H_ | 40 #define NET_THIRD_PARTY_MOZILLA_SECURITY_MANAGER_NSNSSCERTIFICATEDB_H_ |
| 41 | 41 |
| 42 #include <vector> | 42 #include <vector> |
| 43 | 43 |
| 44 #include "base/memory/ref_counted.h" | 44 #include "base/memory/ref_counted.h" |
| 45 #include "crypto/scoped_nss_types.h" |
| 45 #include "net/cert/nss_cert_database.h" | 46 #include "net/cert/nss_cert_database.h" |
| 46 | 47 |
| 47 typedef struct CERTCertificateStr CERTCertificate; | 48 typedef struct CERTCertificateStr CERTCertificate; |
| 48 namespace net { | 49 namespace net { |
| 49 class X509Certificate; | 50 class X509Certificate; |
| 50 typedef std::vector<scoped_refptr<X509Certificate> > CertificateList; | 51 typedef std::vector<scoped_refptr<X509Certificate> > CertificateList; |
| 51 } // namespace net | 52 } // namespace net |
| 52 | 53 |
| 53 namespace mozilla_security_manager { | 54 namespace mozilla_security_manager { |
| 54 | 55 |
| 55 bool ImportCACerts(const net::CertificateList& certificates, | 56 bool ImportCACerts(crypto::ScopedPK11Slot slot, |
| 57 const net::CertificateList& certificates, |
| 56 net::X509Certificate* root, | 58 net::X509Certificate* root, |
| 57 net::NSSCertDatabase::TrustBits trustBits, | 59 net::NSSCertDatabase::TrustBits trustBits, |
| 58 net::NSSCertDatabase::ImportCertFailureList* not_imported); | 60 net::NSSCertDatabase::ImportCertFailureList* not_imported); |
| 59 | 61 |
| 60 bool ImportServerCert( | 62 bool ImportServerCert( |
| 63 crypto::ScopedPK11Slot slot, |
| 61 const net::CertificateList& certificates, | 64 const net::CertificateList& certificates, |
| 62 net::NSSCertDatabase::TrustBits trustBits, | 65 net::NSSCertDatabase::TrustBits trustBits, |
| 63 net::NSSCertDatabase::ImportCertFailureList* not_imported); | 66 net::NSSCertDatabase::ImportCertFailureList* not_imported); |
| 64 | 67 |
| 65 bool SetCertTrust(const net::X509Certificate* cert, | 68 bool SetCertTrust(const net::X509Certificate* cert, |
| 66 net::CertType type, | 69 net::CertType type, |
| 67 net::NSSCertDatabase::TrustBits trustBits); | 70 net::NSSCertDatabase::TrustBits trustBits); |
| 68 | 71 |
| 69 } // namespace mozilla_security_manager | 72 } // namespace mozilla_security_manager |
| 70 | 73 |
| 71 #endif // NET_THIRD_PARTY_MOZILLA_SECURITY_MANAGER_NSNSSCERTIFICATEDB_H_ | 74 #endif // NET_THIRD_PARTY_MOZILLA_SECURITY_MANAGER_NSNSSCERTIFICATEDB_H_ |
| OLD | NEW |