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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: patches/nss-pkix-no-ldap.patch

Issue 195763027: Update NSS to NSS_3_16_RC0. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/nss/
Patch Set: Use the RTM tag Created 6 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 | Annotate | Revision Log
« no previous file with comments | « nss/lib/util/nssutil.h ('k') | scripts/nss-checkout.sh » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
(Empty)
1 diff --git a/lib/libpkix/include/pkix_errorstrings.h b/lib/libpkix/include/pkix_ errorstrings.h
2 --- a/lib/libpkix/include/pkix_errorstrings.h
3 +++ b/lib/libpkix/include/pkix_errorstrings.h
4 @@ -573,17 +573,19 @@ PKIX_ERRORENTRY(ILLEGALUSEOFAMP,Illegal
5 PKIX_ERRORENTRY(IMPOSSIBLECRITERIONFORCRLQUERY,Impossible criterion for Crl Que ry,SEC_ERROR_INVALID_ARGS),
6 PKIX_ERRORENTRY(INDEXOUTOFBOUNDS,Index out of bounds,SEC_ERROR_LIBPKIX_INTERNAL ),
7 PKIX_ERRORENTRY(INESCAPEDASCII,in EscapedASCII,0),
8 PKIX_ERRORENTRY(INFOACCESSCREATEFAILED,pkix_pl_InfoAccess_Create failed,0),
9 PKIX_ERRORENTRY(INFOACCESSCREATELISTFAILED,pkix_pl_InfoAccess_CreateList failed ,0),
10 PKIX_ERRORENTRY(INFOACCESSGETLOCATIONFAILED,PKIX_PL_InfoAccess_GetLocation fail ed,0),
11 PKIX_ERRORENTRY(INFOACCESSGETLOCATIONTYPEFAILED,PKIX_PL_InfoAccess_GetLocationT ype failed,0),
12 PKIX_ERRORENTRY(INFOACCESSGETMETHODFAILED,PKIX_PL_InfoAccess_GetMethod failed,0 ),
13 +#ifndef NSS_PKIX_NO_LDAP
14 PKIX_ERRORENTRY(INFOACCESSPARSELOCATIONFAILED,pkix_pl_InfoAccess_ParseLocation failed,SEC_ERROR_BAD_INFO_ACCESS_LOCATION),
15 +#endif
16 PKIX_ERRORENTRY(INFOACCESSPARSETOKENSFAILED,pkix_pl_InfoAccess_ParseTokens fail ed,SEC_ERROR_BAD_INFO_ACCESS_LOCATION),
17 PKIX_ERRORENTRY(INITIALIZECHECKERSFAILED,pkix_InitializeCheckers failed,0),
18 PKIX_ERRORENTRY(INITIALIZEFAILED,PKIX_PL_Initialize failed,0),
19 PKIX_ERRORENTRY(INPUTLISTMUSTBEHEADER,Input List must be header,SEC_ERROR_INVAL ID_ARGS),
20 PKIX_ERRORENTRY(INPUTLISTSMUSTBELISTHEADERS,Input Lists must be list headers,SE C_ERROR_INVALID_ARGS),
21 PKIX_ERRORENTRY(INSUFFICIENTCRITERIAFORCERTQUERY,Insufficient criteria for Cert query,0),
22 PKIX_ERRORENTRY(INSUFFICIENTCRITERIAFORCRLQUERY,Insufficient criteria for Crl Q uery,0),
23 PKIX_ERRORENTRY(INTRUSTEDCERT,in Trusted Cert,0),
24 diff --git a/lib/libpkix/include/pkix_pl_pki.h b/lib/libpkix/include/pkix_pl_pki .h
25 --- a/lib/libpkix/include/pkix_pl_pki.h
26 +++ b/lib/libpkix/include/pkix_pl_pki.h
27 @@ -1822,17 +1822,19 @@ PKIX_PL_Cert_GetCrlDp(PKIX_PL_Cert *cert
28
29 #define PKIX_INFOACCESS_OCSP 1
30 #define PKIX_INFOACCESS_CA_ISSUERS 2
31 #define PKIX_INFOACCESS_TIMESTAMPING 3
32 #define PKIX_INFOACCESS_CA_REPOSITORY 5
33
34 #define PKIX_INFOACCESS_LOCATION_UNKNOWN 0
35 #define PKIX_INFOACCESS_LOCATION_HTTP 1
36 +#ifndef NSS_PKIX_NO_LDAP
37 #define PKIX_INFOACCESS_LOCATION_LDAP 2
38 +#endif
39
40 /*
41 * FUNCTION: PKIX_PL_InfoAccess_GetMethod
42 * DESCRIPTION:
43 *
44 * Stores the method of the Information Access from "infoAccess" and
45 * returns in "pMethod".
46 *
47 diff --git a/lib/libpkix/include/pkix_sample_modules.h b/lib/libpkix/include/pki x_sample_modules.h
48 --- a/lib/libpkix/include/pkix_sample_modules.h
49 +++ b/lib/libpkix/include/pkix_sample_modules.h
50 @@ -112,16 +112,17 @@ PKIX_PL_CollectionCertStore_Create(
51 * Returns a CertStore Error if the function fails in a non-fatal way.
52 * Returns a Fatal Error if the function fails in an unrecoverable way.
53 */
54 PKIX_Error *
55 PKIX_PL_Pk11CertStore_Create(
56 PKIX_CertStore **pPk11CertStore,
57 void *plContext);
58
59 +#ifndef NSS_PKIX_NO_LDAP
60 /* PKIX_PL_LdapCertStore
61 *
62 * A PKIX_PL_LdapCertStore retrieves certificates and CRLs from an LDAP server
63 * over a socket connection. It used the LDAP protocol as described in RFC1777.
64 *
65 * Once the caller has created the LdapCertStore object, the caller can call
66 * pkix_pl_LdapCertStore_GetCert or pkix_pl_LdapCertStore_GetCert to obtain
67 * a List of PKIX_PL_Certs or PKIX_PL_CRL objects, respectively.
68 @@ -244,16 +245,17 @@ PKIX_PL_LdapDefaultClient_CreateByName(
69 * Returns a CertStore Error if the function fails in a non-fatal way.
70 * Returns a Fatal Error if the function fails in an unrecoverable way.
71 */
72 PKIX_Error *
73 PKIX_PL_LdapCertStore_Create(
74 PKIX_PL_LdapClient *client,
75 PKIX_CertStore **pCertStore,
76 void *plContext);
77 +#endif /* !NSS_PKIX_NO_LDAP */
78
79 /* PKIX_PL_NssContext
80 *
81 * A PKIX_PL_NssContext provides an example showing how the "plContext"
82 * argument, that is part of every libpkix function call, can be used.
83 * The "plContext" is the Portability Layer Context, which can be used
84 * to communicate layer-specific information from the application to the
85 * underlying Portability Layer (while bypassing the Portable Code, which
86 diff --git a/lib/libpkix/pkix/top/pkix_build.h b/lib/libpkix/pkix/top/pkix_build .h
87 --- a/lib/libpkix/pkix/top/pkix_build.h
88 +++ b/lib/libpkix/pkix/top/pkix_build.h
89 @@ -6,17 +6,19 @@
90 *
91 * Header file for buildChain function
92 *
93 */
94
95 #ifndef _PKIX_BUILD_H
96 #define _PKIX_BUILD_H
97 #include "pkix_tools.h"
98 +#ifndef NSS_PKIX_NO_LDAP
99 #include "pkix_pl_ldapt.h"
100 +#endif
101 #include "pkix_ekuchecker.h"
102
103 #ifdef __cplusplus
104 extern "C" {
105 #endif
106
107 typedef enum {
108 BUILD_SHORTCUTPENDING,
109 diff --git a/lib/libpkix/pkix_pl_nss/module/pkix_pl_aiamgr.c b/lib/libpkix/pkix_ pl_nss/module/pkix_pl_aiamgr.c
110 --- a/lib/libpkix/pkix_pl_nss/module/pkix_pl_aiamgr.c
111 +++ b/lib/libpkix/pkix_pl_nss/module/pkix_pl_aiamgr.c
112 @@ -6,16 +6,17 @@
113 *
114 * AIAMgr Object Definitions
115 *
116 */
117
118 #include "pkix_pl_aiamgr.h"
119 extern PKIX_PL_HashTable *aiaConnectionCache;
120
121 +#ifndef NSS_PKIX_NO_LDAP
122 /* --Virtual-LdapClient-Functions------------------------------------ */
123
124 PKIX_Error *
125 PKIX_PL_LdapClient_InitiateRequest(
126 PKIX_PL_LdapClient *client,
127 LDAPRequestParams *requestParams,
128 void **pNBIO,
129 PKIX_List **pResponse,
130 @@ -46,16 +47,17 @@ PKIX_PL_LdapClient_ResumeRequest(
131 PKIX_CHECK(client->resumeFcn
132 (client, pNBIO, pResponse, plContext),
133 PKIX_LDAPCLIENTRESUMEREQUESTFAILED);
134 cleanup:
135
136 PKIX_RETURN(LDAPCLIENT);
137
138 }
139 +#endif /* !NSS_PKIX_NO_LDAP */
140
141 /* --Private-AIAMgr-Functions----------------------------------*/
142
143 /*
144 * FUNCTION: pkix_pl_AIAMgr_Destroy
145 * (see comments for PKIX_PL_DestructorCallback in pkix_pl_pki.h)
146 */
147 static PKIX_Error *
148 @@ -76,17 +78,19 @@ pkix_pl_AIAMgr_Destroy(
149 /* pointer to cert cache */
150 /* pointer to crl cache */
151 aiaMgr->method = 0;
152 aiaMgr->aiaIndex = 0;
153 aiaMgr->numAias = 0;
154 PKIX_DECREF(aiaMgr->aia);
155 PKIX_DECREF(aiaMgr->location);
156 PKIX_DECREF(aiaMgr->results);
157 +#ifndef NSS_PKIX_NO_LDAP
158 PKIX_DECREF(aiaMgr->client.ldapClient);
159 +#endif
160
161 cleanup:
162
163 PKIX_RETURN(AIAMGR);
164 }
165
166 /*
167 * FUNCTION: pkix_pl_AIAMgr_RegisterSelf
168 @@ -109,16 +113,17 @@ pkix_pl_AIAMgr_RegisterSelf(void *plCont
169
170 entry->description = "AIAMgr";
171 entry->typeObjectSize = sizeof(PKIX_PL_AIAMgr);
172 entry->destructor = pkix_pl_AIAMgr_Destroy;
173
174 PKIX_RETURN(AIAMGR);
175 }
176
177 +#ifndef NSS_PKIX_NO_LDAP
178 /*
179 * FUNCTION: pkix_pl_AiaMgr_FindLDAPClient
180 * DESCRIPTION:
181 *
182 * This function checks the collection of LDAPClient connections held by the
183 * AIAMgr pointed to by "aiaMgr" for one matching the domain name given by
184 * "domainName". The string may include a port number: e.g., "betty.nist.gov"
185 * or "nss.red.iplanet.com:1389". If a match is found, that LDAPClient is
186 @@ -194,16 +199,17 @@ pkix_pl_AiaMgr_FindLDAPClient(
187 *pClient = (PKIX_PL_LdapClient *)client;
188
189 cleanup:
190
191 PKIX_DECREF(domainString);
192
193 PKIX_RETURN(AIAMGR);
194 }
195 +#endif /* !NSS_PKIX_NO_LDAP */
196
197 PKIX_Error *
198 pkix_pl_AIAMgr_GetHTTPCerts(
199 PKIX_PL_AIAMgr *aiaMgr,
200 PKIX_PL_InfoAccess *ia,
201 void **pNBIOContext,
202 PKIX_List **pCerts,
203 void *plContext)
204 @@ -370,16 +376,17 @@ cleanup:
205 }
206 if (path) {
207 PORT_Free(path);
208 }
209
210 PKIX_RETURN(AIAMGR);
211 }
212
213 +#ifndef NSS_PKIX_NO_LDAP
214 PKIX_Error *
215 pkix_pl_AIAMgr_GetLDAPCerts(
216 PKIX_PL_AIAMgr *aiaMgr,
217 PKIX_PL_InfoAccess *ia,
218 void **pNBIOContext,
219 PKIX_List **pCerts,
220 void *plContext)
221 {
222 @@ -478,16 +485,17 @@ cleanup:
223 if (PKIX_ERROR_RECEIVED) {
224 PKIX_DECREF(aiaMgr->client.ldapClient);
225 }
226
227 PKIX_DECREF(location);
228
229 PKIX_RETURN(AIAMGR);
230 }
231 +#endif /* !NSS_PKIX_NO_LDAP */
232
233 /*
234 * FUNCTION: PKIX_PL_AIAMgr_Create
235 * DESCRIPTION:
236 *
237 * This function creates an AIAMgr, storing the result at "pAIAMgr".
238 *
239 * PARAMETERS:
240 @@ -614,20 +622,22 @@ PKIX_PL_AIAMgr_GetAIACerts(
241 PKIX_CHECK(PKIX_PL_InfoAccess_GetLocationType
242 (ia, &iaType, plContext),
243 PKIX_INFOACCESSGETLOCATIONTYPEFAILED);
244
245 if (iaType == PKIX_INFOACCESS_LOCATION_HTTP) {
246 PKIX_CHECK(pkix_pl_AIAMgr_GetHTTPCerts
247 (aiaMgr, ia, &nbio, &certs, plContext),
248 PKIX_AIAMGRGETHTTPCERTSFAILED);
249 +#ifndef NSS_PKIX_NO_LDAP
250 } else if (iaType == PKIX_INFOACCESS_LOCATION_LDAP) {
251 PKIX_CHECK(pkix_pl_AIAMgr_GetLDAPCerts
252 (aiaMgr, ia, &nbio, &certs, plContext),
253 PKIX_AIAMGRGETLDAPCERTSFAILED);
254 +#endif
255 } else {
256 /* We only support http and ldap requests. */
257 PKIX_DECREF(ia);
258 continue;
259 }
260
261 if (nbio != NULL) { /* WOULDBLOCK */
262 aiaMgr->aiaIndex = aiaIndex;
263 @@ -659,16 +669,18 @@ PKIX_PL_AIAMgr_GetAIACerts(
264 *pCerts = aiaMgr->results;
265 aiaMgr->results = NULL;
266
267 cleanup:
268
269 if (PKIX_ERROR_RECEIVED) {
270 PKIX_DECREF(aiaMgr->aia);
271 PKIX_DECREF(aiaMgr->results);
272 +#ifndef NSS_PKIX_NO_LDAP
273 PKIX_DECREF(aiaMgr->client.ldapClient);
274 +#endif
275 }
276
277 PKIX_DECREF(certs);
278 PKIX_DECREF(ia);
279
280 PKIX_RETURN(AIAMGR);
281 }
282 diff --git a/lib/libpkix/pkix_pl_nss/module/pkix_pl_aiamgr.h b/lib/libpkix/pkix_ pl_nss/module/pkix_pl_aiamgr.h
283 --- a/lib/libpkix/pkix_pl_nss/module/pkix_pl_aiamgr.h
284 +++ b/lib/libpkix/pkix_pl_nss/module/pkix_pl_aiamgr.h
285 @@ -22,40 +22,44 @@ struct PKIX_PL_AIAMgrStruct {
286 /* pointer to crl cache */
287 PKIX_UInt32 method;
288 PKIX_UInt32 aiaIndex;
289 PKIX_UInt32 numAias;
290 PKIX_List *aia;
291 PKIX_PL_GeneralName *location;
292 PKIX_List *results;
293 union {
294 +#ifndef NSS_PKIX_NO_LDAP
295 PKIX_PL_LdapClient *ldapClient;
296 +#endif
297 struct {
298 const SEC_HttpClientFcn *httpClient;
299 SEC_HTTP_SERVER_SESSION serverSession;
300 SEC_HTTP_REQUEST_SESSION requestSession;
301 char *path;
302 } hdata;
303 } client;
304 };
305
306 /* see source file for function documentation */
307
308 PKIX_Error *pkix_pl_AIAMgr_RegisterSelf(void *plContext);
309
310 +#ifndef NSS_PKIX_NO_LDAP
311 PKIX_Error *PKIX_PL_LdapClient_InitiateRequest(
312 PKIX_PL_LdapClient *client,
313 LDAPRequestParams *requestParams,
314 void **pPollDesc,
315 PKIX_List **pResponse,
316 void *plContext);
317
318 PKIX_Error *PKIX_PL_LdapClient_ResumeRequest(
319 PKIX_PL_LdapClient *client,
320 void **pPollDesc,
321 PKIX_List **pResponse,
322 void *plContext);
323 +#endif /* !NSS_PKIX_NO_LDAP */
324
325 #ifdef __cplusplus
326 }
327 #endif
328
329 #endif /* _PKIX_PL_AIAMGR_H */
330 diff --git a/lib/libpkix/pkix_pl_nss/pki/pkix_pl_infoaccess.c b/lib/libpkix/pkix _pl_nss/pki/pkix_pl_infoaccess.c
331 --- a/lib/libpkix/pkix_pl_nss/pki/pkix_pl_infoaccess.c
332 +++ b/lib/libpkix/pkix_pl_nss/pki/pkix_pl_infoaccess.c
333 @@ -476,34 +476,37 @@ PKIX_PL_InfoAccess_GetLocationType(
334 PKIX_TOSTRING(infoAccess->location, &locationString, plContext,
335 PKIX_GENERALNAMETOSTRINGFAILED);
336
337 PKIX_CHECK(PKIX_PL_String_GetEncoded
338 (locationString, PKIX_ESCASCII, &location, &len, plContext) ,
339 PKIX_STRINGGETENCODEDFAILED);
340
341 PKIX_OID_DEBUG("\tCalling PORT_Strcmp).\n");
342 +#ifndef NSS_PKIX_NO_LDAP
343 if (PORT_Strncmp(location, "ldap:", 5) == 0){
344 type = PKIX_INFOACCESS_LOCATION_LDAP;
345 } else
346 +#endif
347 if (PORT_Strncmp(location, "http:", 5) == 0){
348 type = PKIX_INFOACCESS_LOCATION_HTTP;
349 }
350 }
351
352 *pType = type;
353
354 cleanup:
355
356 PKIX_PL_Free(location, plContext);
357 PKIX_DECREF(locationString);
358
359 PKIX_RETURN(INFOACCESS);
360 }
361
362 +#ifndef NSS_PKIX_NO_LDAP
363 /*
364 * FUNCTION: pkix_pl_InfoAccess_ParseTokens
365 * DESCRIPTION:
366 *
367 * This function parses the string beginning at "startPos" into tokens using
368 * the separator contained in "separator" and the terminator contained in
369 * "terminator", copying the tokens into space allocated from the arena
370 * pointed to by "arena". It stores in "tokens" a null-terminated array of
371 @@ -863,8 +866,9 @@ pkix_pl_InfoAccess_ParseLocation(
372
373 cleanup:
374
375 PKIX_PL_Free(locationAscii, plContext);
376 PKIX_DECREF(locationString);
377
378 PKIX_RETURN(INFOACCESS);
379 }
380 +#endif /* !NSS_PKIX_NO_LDAP */
381 diff --git a/lib/libpkix/pkix_pl_nss/pki/pkix_pl_infoaccess.h b/lib/libpkix/pkix _pl_nss/pki/pkix_pl_infoaccess.h
382 --- a/lib/libpkix/pkix_pl_nss/pki/pkix_pl_infoaccess.h
383 +++ b/lib/libpkix/pkix_pl_nss/pki/pkix_pl_infoaccess.h
384 @@ -27,21 +27,23 @@ struct PKIX_PL_InfoAccessStruct{
385 PKIX_Error *pkix_pl_InfoAccess_RegisterSelf(void *plContext);
386
387 PKIX_Error *
388 pkix_pl_InfoAccess_CreateList(
389 CERTAuthInfoAccess **authInfoAccess,
390 PKIX_List **pAiaList, /* of PKIX_PL_InfoAccess */
391 void *plContext);
392
393 +#ifndef NSS_PKIX_NO_LDAP
394 PKIX_Error *
395 pkix_pl_InfoAccess_ParseLocation(
396 PKIX_PL_GeneralName *generalName,
397 PLArenaPool *arena,
398 LDAPRequestParams *request,
399 char **pDomainName,
400 void *plContext);
401 +#endif /* !NSS_PKIX_NO_LDAP */
402
403 #ifdef __cplusplus
404 }
405 #endif
406
407 #endif /* _PKIX_PL_INFOACCESS_H */
408 diff --git a/lib/libpkix/pkix_pl_nss/system/pkix_pl_common.h b/lib/libpkix/pkix_ pl_nss/system/pkix_pl_common.h
409 --- a/lib/libpkix/pkix_pl_nss/system/pkix_pl_common.h
410 +++ b/lib/libpkix/pkix_pl_nss/system/pkix_pl_common.h
411 @@ -33,17 +33,19 @@
412 #include "prio.h"
413
414 /* NSPR headers */
415 #include "nspr.h"
416
417 /* private PKIX_PL_NSS system headers */
418 #include "pkix_pl_object.h"
419 #include "pkix_pl_string.h"
420 +#ifndef NSS_PKIX_NO_LDAP
421 #include "pkix_pl_ldapt.h"
422 +#endif /* !NSS_PKIX_NO_LDAP */
423 #include "pkix_pl_aiamgr.h"
424 #include "pkix_pl_bigint.h"
425 #include "pkix_pl_oid.h"
426 #include "pkix_pl_x500name.h"
427 #include "pkix_pl_generalname.h"
428 #include "pkix_pl_publickey.h"
429 #include "pkix_pl_bytearray.h"
430 #include "pkix_pl_date.h"
431 @@ -57,19 +59,21 @@
432 #include "pkix_pl_crldp.h"
433 #include "pkix_pl_crl.h"
434 #include "pkix_pl_crlentry.h"
435 #include "pkix_pl_nameconstraints.h"
436 #include "pkix_pl_ocsprequest.h"
437 #include "pkix_pl_ocspresponse.h"
438 #include "pkix_pl_pk11certstore.h"
439 #include "pkix_pl_socket.h"
440 +#ifndef NSS_PKIX_NO_LDAP
441 #include "pkix_pl_ldapcertstore.h"
442 #include "pkix_pl_ldaprequest.h"
443 #include "pkix_pl_ldapresponse.h"
444 +#endif /* !NSS_PKIX_NO_LDAP */
445 #include "pkix_pl_nsscontext.h"
446 #include "pkix_pl_httpcertstore.h"
447 #include "pkix_pl_httpdefaultclient.h"
448 #include "pkix_pl_infoaccess.h"
449 #include "pkix_sample_modules.h"
450
451 #define MAX_DIGITS_32 (PKIX_UInt32) 10
452
453 diff --git a/lib/libpkix/pkix_pl_nss/system/pkix_pl_lifecycle.c b/lib/libpkix/pk ix_pl_nss/system/pkix_pl_lifecycle.c
454 --- a/lib/libpkix/pkix_pl_nss/system/pkix_pl_lifecycle.c
455 +++ b/lib/libpkix/pkix_pl_nss/system/pkix_pl_lifecycle.c
456 @@ -199,19 +199,21 @@ PKIX_PL_Initialize(
457 pkix_BasicConstraintsCheckerState_RegisterSelf(plContext);
458 pkix_PolicyCheckerState_RegisterSelf(plContext);
459
460 pkix_pl_CollectionCertStoreContext_RegisterSelf(plContext); /* 41-50 */
461 pkix_CrlChecker_RegisterSelf(plContext);
462 pkix_ForwardBuilderState_RegisterSelf(plContext);
463 pkix_SignatureCheckerState_RegisterSelf(plContext);
464 pkix_NameConstraintsCheckerState_RegisterSelf(plContext);
465 +#ifndef NSS_PKIX_NO_LDAP
466 pkix_pl_LdapRequest_RegisterSelf(plContext);
467 pkix_pl_LdapResponse_RegisterSelf(plContext);
468 pkix_pl_LdapDefaultClient_RegisterSelf(plContext);
469 +#endif
470 pkix_pl_Socket_RegisterSelf(plContext);
471
472 pkix_ResourceLimits_RegisterSelf(plContext); /* 51-59 */
473 pkix_pl_MonitorLock_RegisterSelf(plContext);
474 pkix_pl_InfoAccess_RegisterSelf(plContext);
475 pkix_pl_AIAMgr_RegisterSelf(plContext);
476 pkix_OcspChecker_RegisterSelf(plContext);
477 pkix_pl_OcspCertID_RegisterSelf(plContext);
478 diff --git a/lib/libpkix/pkix_pl_nss/system/pkix_pl_lifecycle.h b/lib/libpkix/pk ix_pl_nss/system/pkix_pl_lifecycle.h
479 --- a/lib/libpkix/pkix_pl_nss/system/pkix_pl_lifecycle.h
480 +++ b/lib/libpkix/pkix_pl_nss/system/pkix_pl_lifecycle.h
481 @@ -28,20 +28,22 @@
482 #include "pkix_pl_date.h"
483 #include "pkix_pl_basicconstraints.h"
484 #include "pkix_pl_certpolicyinfo.h"
485 #include "pkix_pl_certpolicymap.h"
486 #include "pkix_pl_certpolicyqualifier.h"
487 #include "pkix_pl_crlentry.h"
488 #include "pkix_pl_crl.h"
489 #include "pkix_pl_colcertstore.h"
490 +#ifndef NSS_PKIX_NO_LDAP
491 #include "pkix_pl_ldapcertstore.h"
492 #include "pkix_pl_ldapdefaultclient.h"
493 #include "pkix_pl_ldaprequest.h"
494 #include "pkix_pl_ldapresponse.h"
495 +#endif /* !NSS_PKIX_NO_LDAP */
496 #include "pkix_pl_socket.h"
497 #include "pkix_pl_infoaccess.h"
498 #include "pkix_store.h"
499 #include "pkix_error.h"
500 #include "pkix_logger.h"
501 #include "pkix_list.h"
502 #include "pkix_trustanchor.h"
503 #include "pkix_procparams.h"
OLDNEW
« no previous file with comments | « nss/lib/util/nssutil.h ('k') | scripts/nss-checkout.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698