OLD | NEW |
1 /* This Source Code Form is subject to the terms of the Mozilla Public | 1 /* This Source Code Form is subject to the terms of the Mozilla Public |
2 * License, v. 2.0. If a copy of the MPL was not distributed with this | 2 * License, v. 2.0. If a copy of the MPL was not distributed with this |
3 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ | 3 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ |
4 | 4 |
5 #ifndef DEVM_H | 5 #ifndef DEVM_H |
6 #include "devm.h" | 6 #include "devm.h" |
7 #endif /* DEVM_H */ | 7 #endif /* DEVM_H */ |
8 | 8 |
9 #ifndef CKHELPER_H | 9 #ifndef CKHELPER_H |
10 #include "ckhelper.h" | 10 #include "ckhelper.h" |
(...skipping 561 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
572 nssTokenSearchType_TokenForced, | 572 nssTokenSearchType_TokenForced, |
573 MAX_LOCAL_CACHE_OBJECTS, &status); | 573 MAX_LOCAL_CACHE_OBJECTS, &status); |
574 if (status != PR_SUCCESS) { | 574 if (status != PR_SUCCESS) { |
575 return status; | 575 return status; |
576 } | 576 } |
577 cache->objects[objectType] = create_object_array(objects, | 577 cache->objects[objectType] = create_object_array(objects, |
578 doIt, | 578 doIt, |
579 &numObjects, | 579 &numObjects, |
580 &status); | 580 &status); |
581 if (status != PR_SUCCESS) { | 581 if (status != PR_SUCCESS) { |
| 582 nss_ZFreeIf(objects); |
582 return status; | 583 return status; |
583 } | 584 } |
584 for (i=0; i<numObjects; i++) { | 585 for (i=0; i<numObjects; i++) { |
585 cache->objects[objectType][i] = create_object_of_type(objects[i], | 586 cache->objects[objectType][i] = create_object_of_type(objects[i], |
586 objectType, | 587 objectType, |
587 &status); | 588 &status); |
588 if (status != PR_SUCCESS) { | 589 if (status != PR_SUCCESS) { |
589 break; | 590 break; |
590 } | 591 } |
591 } | 592 } |
(...skipping 405 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
997 NSSAlgorithmAndParameters *rvAP = NULL; | 998 NSSAlgorithmAndParameters *rvAP = NULL; |
998 rvAP = nss_ZNEW(arenaOpt, NSSAlgorithmAndParameters); | 999 rvAP = nss_ZNEW(arenaOpt, NSSAlgorithmAndParameters); |
999 if (rvAP) { | 1000 if (rvAP) { |
1000 rvAP->mechanism.mechanism = CKM_MD5; | 1001 rvAP->mechanism.mechanism = CKM_MD5; |
1001 rvAP->mechanism.pParameter = NULL; | 1002 rvAP->mechanism.pParameter = NULL; |
1002 rvAP->mechanism.ulParameterLen = 0; | 1003 rvAP->mechanism.ulParameterLen = 0; |
1003 } | 1004 } |
1004 return rvAP; | 1005 return rvAP; |
1005 } | 1006 } |
1006 | 1007 |
OLD | NEW |