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

Side by Side Diff: net/cert/x509_util_nss.h

Issue 2732913006: Remove unnecessary iOS ifdefs in NSS files. (Closed)
Patch Set: . Created 3 years, 9 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
« no previous file with comments | « net/cert/test_root_certs_nss.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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 #ifndef NET_CERT_X509_UTIL_NSS_H_ 5 #ifndef NET_CERT_X509_UTIL_NSS_H_
6 #define NET_CERT_X509_UTIL_NSS_H_ 6 #define NET_CERT_X509_UTIL_NSS_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 9
10 #include <string> 10 #include <string>
(...skipping 10 matching lines...) Expand all
21 typedef struct CERTCertificateStr CERTCertificate; 21 typedef struct CERTCertificateStr CERTCertificate;
22 typedef struct CERTNameStr CERTName; 22 typedef struct CERTNameStr CERTName;
23 typedef struct PK11SlotInfoStr PK11SlotInfo; 23 typedef struct PK11SlotInfoStr PK11SlotInfo;
24 typedef struct PLArenaPool PLArenaPool; 24 typedef struct PLArenaPool PLArenaPool;
25 typedef struct SECItemStr SECItem; 25 typedef struct SECItemStr SECItem;
26 26
27 namespace net { 27 namespace net {
28 28
29 namespace x509_util { 29 namespace x509_util {
30 30
31 #if defined(USE_NSS_CERTS)
32 // Parses the Principal attribute from |name| and outputs the result in 31 // Parses the Principal attribute from |name| and outputs the result in
33 // |principal|. 32 // |principal|.
34 void ParsePrincipal(CERTName* name, 33 void ParsePrincipal(CERTName* name,
35 CertPrincipal* principal); 34 CertPrincipal* principal);
36 35
37 // Parses the date from |der_date| and outputs the result in |result|. 36 // Parses the date from |der_date| and outputs the result in |result|.
38 void ParseDate(const SECItem* der_date, base::Time* result); 37 void ParseDate(const SECItem* der_date, base::Time* result);
39 38
40 // Parses the serial number from |certificate|. 39 // Parses the serial number from |certificate|.
41 std::string ParseSerialNumber(const CERTCertificate* certificate); 40 std::string ParseSerialNumber(const CERTCertificate* certificate);
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 // Generates a unique nickname for |slot|, returning |nickname| if it is 119 // Generates a unique nickname for |slot|, returning |nickname| if it is
121 // already unique. 120 // already unique.
122 // 121 //
123 // Note: The nickname returned will NOT include the token name, thus the 122 // Note: The nickname returned will NOT include the token name, thus the
124 // token name must be prepended if calling an NSS function that expects 123 // token name must be prepended if calling an NSS function that expects
125 // <token>:<nickname>. 124 // <token>:<nickname>.
126 // TODO(gspencer): Internationalize this: it's wrong to hard-code English. 125 // TODO(gspencer): Internationalize this: it's wrong to hard-code English.
127 std::string GetUniqueNicknameForSlot(const std::string& nickname, 126 std::string GetUniqueNicknameForSlot(const std::string& nickname,
128 const SECItem* subject, 127 const SECItem* subject,
129 PK11SlotInfo* slot); 128 PK11SlotInfo* slot);
130 #endif // defined(USE_NSS_CERTS)
131 129
132 } // namespace x509_util 130 } // namespace x509_util
133 131
134 } // namespace net 132 } // namespace net
135 133
136 #endif // NET_CERT_X509_UTIL_NSS_H_ 134 #endif // NET_CERT_X509_UTIL_NSS_H_
OLDNEW
« no previous file with comments | « net/cert/test_root_certs_nss.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698