← Back to branch summary

~ubuntu-branches/ubuntu/raring/nss/raring-security

« back to all changes in this revision

Viewing changes to mozilla/security/nss/lib/libpkix/pkix/certsel/pkix_comcertselparams.c

  • Committer: Bazaar Package Importer
  • Author(s): Chris Coulson
  • Date: 2010-03-25 13:46:06 UTC
  • mfrom: (1.1.11 upstream)
  • Revision ID: james.westby@ubuntu.com-20100325134606-bl6liuok2w9l7snv
Tags: 3.12.6-0ubuntu1
* New upstream release 3.12.6 RTM (NSS_3_12_6_RTM)
  - fixes CVE-2009-3555 aka US-CERT VU#120541
* Adjust patches to changed upstream code base
  - update debian/patches/38_kbsd.patch
  - update debian/patches/38_mips64_build.patch
  - update debian/patches/85_security_load.patch
* Remove patches that are merged upstream
  - delete debian/patches/91_nonexec_stack.patch
  - update debian/patches/series
* Bump nspr dependency to 4.8
  - update debian/control
* Add new symbols for 3.12.6
  - update debian/libnss3-1d.symbols

Show diffs side-by-side

added added

removed removed

Lines of Context:
mozilla/security/nss/lib/libpkix/pkix/certsel/pkix_comcertselparams.c
192
192
                plContext,
193
193
                PKIX_OBJECTDUPLICATEFAILED);
194
194
 
 
195
        paramsDuplicate->leafCertFlag = params->leafCertFlag;
 
196
 
195
197
        *pNewObject = (PKIX_PL_Object *)paramsDuplicate;
196
198
 
197
199
cleanup:
219
221
pkix_ComCertSelParams_RegisterSelf(void *plContext)
220
222
{
221
223
        extern pkix_ClassTable_Entry systemClasses[PKIX_NUMTYPES];
222
 
        pkix_ClassTable_Entry entry;
 
224
        pkix_ClassTable_Entry* entry = &systemClasses[PKIX_COMCERTSELPARAMS_TYPE];
223
225
 
224
226
        PKIX_ENTER(COMCERTSELPARAMS, "pkix_ComCertSelParams_RegisterSelf");
225
227
 
226
 
        entry.description = "ComCertSelParams";
227
 
        entry.objCounter = 0;
228
 
        entry.typeObjectSize = sizeof(PKIX_ComCertSelParams);
229
 
        entry.destructor = pkix_ComCertSelParams_Destroy;
230
 
        entry.equalsFunction = NULL;
231
 
        entry.hashcodeFunction = NULL;
232
 
        entry.toStringFunction = NULL;
233
 
        entry.comparator = NULL;
234
 
        entry.duplicateFunction = pkix_ComCertSelParams_Duplicate;
235
 
 
236
 
        systemClasses[PKIX_COMCERTSELPARAMS_TYPE] = entry;
 
228
        entry->description = "ComCertSelParams";
 
229
        entry->typeObjectSize = sizeof(PKIX_ComCertSelParams);
 
230
        entry->destructor = pkix_ComCertSelParams_Destroy;
 
231
        entry->duplicateFunction = pkix_ComCertSelParams_Duplicate;
237
232
 
238
233
        PKIX_RETURN(COMCERTSELPARAMS);
239
234
}
283
278
        params->subjKeyId = NULL;
284
279
        params->subjPubKey = NULL;
285
280
        params->subjPKAlgId = NULL;
 
281
        params->leafCertFlag = PKIX_FALSE;
286
282
 
287
283
        *pParams = params;
288
284
 
1181
1177
 
1182
1178
        PKIX_RETURN(COMCERTSELPARAMS);
1183
1179
}
 
1180
 
 
1181
/*
 
1182
 * FUNCTION: PKIX_ComCertSelParams_GetLeafCertFlag
 
1183
 * (see comments in pkix_certsel.h)
 
1184
 */
 
1185
PKIX_Error*
 
1186
PKIX_ComCertSelParams_GetLeafCertFlag(
 
1187
        PKIX_ComCertSelParams *params,
 
1188
        PKIX_Boolean *pLeafFlag,
 
1189
        void *plContext)
 
1190
{
 
1191
        PKIX_ENTER(COMCERTSELPARAMS, "PKIX_ComCertSelParams_GetLeafCertFlag");
 
1192
        PKIX_NULLCHECK_TWO(params, pLeafFlag);
 
1193
 
 
1194
        *pLeafFlag = params->leafCertFlag;
 
1195
 
 
1196
        PKIX_RETURN(COMCERTSELPARAMS);
 
1197
}
 
1198
 
 
1199
/*
 
1200
 * FUNCTION: PKIX_ComCertSelParams_SetLeafCertFlag
 
1201
 * (see comments in pkix_certsel.h)
 
1202
 */
 
1203
PKIX_Error *
 
1204
PKIX_ComCertSelParams_SetLeafCertFlag(
 
1205
        PKIX_ComCertSelParams *params,
 
1206
        PKIX_Boolean leafFlag,
 
1207
        void *plContext)
 
1208
{
 
1209
        PKIX_ENTER(COMCERTSELPARAMS, "PKIX_ComCertSelParams_SetLeafCertFlag");
 
1210
        PKIX_NULLCHECK_ONE(params);
 
1211
 
 
1212
        params->leafCertFlag = leafFlag;
 
1213
 
 
1214
        PKIX_CHECK(PKIX_PL_Object_InvalidateCache
 
1215
                    ((PKIX_PL_Object *)params, plContext),
 
1216
                    PKIX_OBJECTINVALIDATECACHEFAILED);
 
1217
 
 
1218
cleanup:
 
1219
 
 
1220
        PKIX_RETURN(COMCERTSELPARAMS);
 
1221
}