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

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

Issue 1535363003: Switch to standard integer types in net/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: stddef Created 5 years 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/test/url_request/url_request_slow_download_job.cc ('k') | net/tools/balsa/balsa_frame.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 20 matching lines...) Expand all
31 * decision by deleting the provisions above and replace them with the notice 31 * decision by deleting the provisions above and replace them with the notice
32 * and other provisions required by the GPL or the LGPL. If you do not delete 32 * and other provisions required by the GPL or the LGPL. If you do not delete
33 * the provisions above, a recipient may use your version of this file under 33 * the provisions above, a recipient may use your version of this file under
34 * the terms of any one of the MPL, the GPL or the LGPL. 34 * the terms of any one of the MPL, the GPL or the LGPL.
35 * 35 *
36 * ***** END LICENSE BLOCK ***** */ 36 * ***** END LICENSE BLOCK ***** */
37 37
38 #ifndef NET_THIRD_PARTY_MOZILLA_SECURITY_MANAGER_NSPKCS12BLOB_H_ 38 #ifndef NET_THIRD_PARTY_MOZILLA_SECURITY_MANAGER_NSPKCS12BLOB_H_
39 #define NET_THIRD_PARTY_MOZILLA_SECURITY_MANAGER_NSPKCS12BLOB_H_ 39 #define NET_THIRD_PARTY_MOZILLA_SECURITY_MANAGER_NSPKCS12BLOB_H_
40 40
41 #include <stddef.h>
42
41 #include <string> 43 #include <string>
42 #include <vector> 44 #include <vector>
43 45
44 #include "base/memory/ref_counted.h" 46 #include "base/memory/ref_counted.h"
45 #include "base/strings/string16.h" 47 #include "base/strings/string16.h"
46 48
47 typedef struct CERTCertificateStr CERTCertificate; 49 typedef struct CERTCertificateStr CERTCertificate;
48 typedef struct PK11SlotInfoStr PK11SlotInfo; 50 typedef struct PK11SlotInfoStr PK11SlotInfo;
49 namespace net { 51 namespace net {
50 class X509Certificate; 52 class X509Certificate;
(...skipping 19 matching lines...) Expand all
70 // Export the given certificates into a PKCS#12 blob, storing into output. 72 // Export the given certificates into a PKCS#12 blob, storing into output.
71 // Returns the number of certificates exported. 73 // Returns the number of certificates exported.
72 // TODO(mattm): provide better error return status? 74 // TODO(mattm): provide better error return status?
73 int nsPKCS12Blob_Export(std::string* output, 75 int nsPKCS12Blob_Export(std::string* output,
74 const net::CertificateList& certs, 76 const net::CertificateList& certs,
75 const base::string16& password); 77 const base::string16& password);
76 78
77 } // namespace mozilla_security_manager 79 } // namespace mozilla_security_manager
78 80
79 #endif // NET_THIRD_PARTY_MOZILLA_SECURITY_MANAGER_NSPKCS12BLOB_H_ 81 #endif // NET_THIRD_PARTY_MOZILLA_SECURITY_MANAGER_NSPKCS12BLOB_H_
OLDNEW
« no previous file with comments | « net/test/url_request/url_request_slow_download_job.cc ('k') | net/tools/balsa/balsa_frame.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698