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 DEV_H | 5 #ifndef DEV_H |
6 #include "dev.h" | 6 #include "dev.h" |
7 #endif /* DEV_H */ | 7 #endif /* DEV_H */ |
8 | 8 |
9 #ifndef PKIM_H | 9 #ifndef PKIM_H |
10 #include "pkim.h" | 10 #include "pkim.h" |
(...skipping 885 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
896 } | 896 } |
897 return PR_SUCCESS; | 897 return PR_SUCCESS; |
898 } | 898 } |
899 | 899 |
900 NSS_IMPLEMENT PRStatus | 900 NSS_IMPLEMENT PRStatus |
901 nssPKIObjectCollection_Traverse ( | 901 nssPKIObjectCollection_Traverse ( |
902 nssPKIObjectCollection *collection, | 902 nssPKIObjectCollection *collection, |
903 nssPKIObjectCallback *callback | 903 nssPKIObjectCallback *callback |
904 ) | 904 ) |
905 { | 905 { |
906 PRStatus status; | |
907 PRCList *link = PR_NEXT_LINK(&collection->head); | 906 PRCList *link = PR_NEXT_LINK(&collection->head); |
908 pkiObjectCollectionNode *node; | 907 pkiObjectCollectionNode *node; |
909 while (link != &collection->head) { | 908 while (link != &collection->head) { |
910 node = (pkiObjectCollectionNode *)link; | 909 node = (pkiObjectCollectionNode *)link; |
911 if (!node->haveObject) { | 910 if (!node->haveObject) { |
912 node->object = (*collection->createObject)(node->object); | 911 node->object = (*collection->createObject)(node->object); |
913 if (!node->object) { | 912 if (!node->object) { |
914 link = PR_NEXT_LINK(link); | 913 link = PR_NEXT_LINK(link); |
915 /*remove bogus object from list*/ | 914 /*remove bogus object from list*/ |
916 nssPKIObjectCollection_RemoveNode(collection,node); | 915 nssPKIObjectCollection_RemoveNode(collection,node); |
917 continue; | 916 continue; |
918 } | 917 } |
919 node->haveObject = PR_TRUE; | 918 node->haveObject = PR_TRUE; |
920 } | 919 } |
921 switch (collection->objectType) { | 920 switch (collection->objectType) { |
922 case pkiObjectType_Certificate: | 921 case pkiObjectType_Certificate: |
923 » status = (*callback->func.cert)((NSSCertificate *)node->object, | 922 » (void)(*callback->func.cert)((NSSCertificate *)node->object, |
924 callback->arg); | 923 callback->arg); |
925 break; | 924 break; |
926 case pkiObjectType_CRL: | 925 case pkiObjectType_CRL: |
927 » status = (*callback->func.crl)((NSSCRL *)node->object, | 926 » (void)(*callback->func.crl)((NSSCRL *)node->object, |
928 callback->arg); | 927 callback->arg); |
929 break; | 928 break; |
930 case pkiObjectType_PrivateKey: | 929 case pkiObjectType_PrivateKey: |
931 » status = (*callback->func.pvkey)((NSSPrivateKey *)node->object, | 930 » (void)(*callback->func.pvkey)((NSSPrivateKey *)node->object, |
932 callback->arg); | 931 callback->arg); |
933 break; | 932 break; |
934 case pkiObjectType_PublicKey: | 933 case pkiObjectType_PublicKey: |
935 » status = (*callback->func.pbkey)((NSSPublicKey *)node->object, | 934 » (void)(*callback->func.pbkey)((NSSPublicKey *)node->object, |
936 callback->arg); | 935 callback->arg); |
937 break; | 936 break; |
938 } | 937 } |
939 link = PR_NEXT_LINK(link); | 938 link = PR_NEXT_LINK(link); |
940 } | 939 } |
941 return PR_SUCCESS; | 940 return PR_SUCCESS; |
942 } | 941 } |
943 | 942 |
944 NSS_IMPLEMENT PRStatus | 943 NSS_IMPLEMENT PRStatus |
945 nssPKIObjectCollection_AddInstanceAsObject ( | 944 nssPKIObjectCollection_AddInstanceAsObject ( |
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1050 } | 1049 } |
1051 return (nssPKIObject *)cert; | 1050 return (nssPKIObject *)cert; |
1052 } | 1051 } |
1053 | 1052 |
1054 NSS_IMPLEMENT nssPKIObjectCollection * | 1053 NSS_IMPLEMENT nssPKIObjectCollection * |
1055 nssCertificateCollection_Create ( | 1054 nssCertificateCollection_Create ( |
1056 NSSTrustDomain *td, | 1055 NSSTrustDomain *td, |
1057 NSSCertificate **certsOpt | 1056 NSSCertificate **certsOpt |
1058 ) | 1057 ) |
1059 { | 1058 { |
1060 PRStatus status; | |
1061 nssPKIObjectCollection *collection; | 1059 nssPKIObjectCollection *collection; |
1062 collection = nssPKIObjectCollection_Create(td, NULL, nssPKIMonitor); | 1060 collection = nssPKIObjectCollection_Create(td, NULL, nssPKIMonitor); |
| 1061 if (!collection) { |
| 1062 return NULL; |
| 1063 } |
1063 collection->objectType = pkiObjectType_Certificate; | 1064 collection->objectType = pkiObjectType_Certificate; |
1064 collection->destroyObject = cert_destroyObject; | 1065 collection->destroyObject = cert_destroyObject; |
1065 collection->getUIDFromObject = cert_getUIDFromObject; | 1066 collection->getUIDFromObject = cert_getUIDFromObject; |
1066 collection->getUIDFromInstance = cert_getUIDFromInstance; | 1067 collection->getUIDFromInstance = cert_getUIDFromInstance; |
1067 collection->createObject = cert_createObject; | 1068 collection->createObject = cert_createObject; |
1068 if (certsOpt) { | 1069 if (certsOpt) { |
1069 for (; *certsOpt; certsOpt++) { | 1070 for (; *certsOpt; certsOpt++) { |
1070 nssPKIObject *object = (nssPKIObject *)(*certsOpt); | 1071 nssPKIObject *object = (nssPKIObject *)(*certsOpt); |
1071 » status = nssPKIObjectCollection_AddObject(collection, object); | 1072 » (void)nssPKIObjectCollection_AddObject(collection, object); |
1072 } | 1073 } |
1073 } | 1074 } |
1074 return collection; | 1075 return collection; |
1075 } | 1076 } |
1076 | 1077 |
1077 NSS_IMPLEMENT NSSCertificate ** | 1078 NSS_IMPLEMENT NSSCertificate ** |
1078 nssPKIObjectCollection_GetCertificates ( | 1079 nssPKIObjectCollection_GetCertificates ( |
1079 nssPKIObjectCollection *collection, | 1080 nssPKIObjectCollection *collection, |
1080 NSSCertificate **rvOpt, | 1081 NSSCertificate **rvOpt, |
1081 PRUint32 maximumOpt, | 1082 PRUint32 maximumOpt, |
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1157 { | 1158 { |
1158 return (nssPKIObject *)nssCRL_Create(o); | 1159 return (nssPKIObject *)nssCRL_Create(o); |
1159 } | 1160 } |
1160 | 1161 |
1161 NSS_IMPLEMENT nssPKIObjectCollection * | 1162 NSS_IMPLEMENT nssPKIObjectCollection * |
1162 nssCRLCollection_Create ( | 1163 nssCRLCollection_Create ( |
1163 NSSTrustDomain *td, | 1164 NSSTrustDomain *td, |
1164 NSSCRL **crlsOpt | 1165 NSSCRL **crlsOpt |
1165 ) | 1166 ) |
1166 { | 1167 { |
1167 PRStatus status; | |
1168 nssPKIObjectCollection *collection; | 1168 nssPKIObjectCollection *collection; |
1169 collection = nssPKIObjectCollection_Create(td, NULL, nssPKILock); | 1169 collection = nssPKIObjectCollection_Create(td, NULL, nssPKILock); |
| 1170 if (!collection) { |
| 1171 return NULL; |
| 1172 } |
1170 collection->objectType = pkiObjectType_CRL; | 1173 collection->objectType = pkiObjectType_CRL; |
1171 collection->destroyObject = crl_destroyObject; | 1174 collection->destroyObject = crl_destroyObject; |
1172 collection->getUIDFromObject = crl_getUIDFromObject; | 1175 collection->getUIDFromObject = crl_getUIDFromObject; |
1173 collection->getUIDFromInstance = crl_getUIDFromInstance; | 1176 collection->getUIDFromInstance = crl_getUIDFromInstance; |
1174 collection->createObject = crl_createObject; | 1177 collection->createObject = crl_createObject; |
1175 if (crlsOpt) { | 1178 if (crlsOpt) { |
1176 for (; *crlsOpt; crlsOpt++) { | 1179 for (; *crlsOpt; crlsOpt++) { |
1177 nssPKIObject *object = (nssPKIObject *)(*crlsOpt); | 1180 nssPKIObject *object = (nssPKIObject *)(*crlsOpt); |
1178 » status = nssPKIObjectCollection_AddObject(collection, object); | 1181 » (void)nssPKIObjectCollection_AddObject(collection, object); |
1179 } | 1182 } |
1180 } | 1183 } |
1181 return collection; | 1184 return collection; |
1182 } | 1185 } |
1183 | 1186 |
1184 NSS_IMPLEMENT NSSCRL ** | 1187 NSS_IMPLEMENT NSSCRL ** |
1185 nssPKIObjectCollection_GetCRLs ( | 1188 nssPKIObjectCollection_GetCRLs ( |
1186 nssPKIObjectCollection *collection, | 1189 nssPKIObjectCollection *collection, |
1187 NSSCRL **rvOpt, | 1190 NSSCRL **rvOpt, |
1188 PRUint32 maximumOpt, | 1191 PRUint32 maximumOpt, |
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1245 } | 1248 } |
1246 | 1249 |
1247 NSS_IMPLEMENT PRTime | 1250 NSS_IMPLEMENT PRTime |
1248 NSSTime_GetPRTime ( | 1251 NSSTime_GetPRTime ( |
1249 NSSTime *time | 1252 NSSTime *time |
1250 ) | 1253 ) |
1251 { | 1254 { |
1252 return time->prTime; | 1255 return time->prTime; |
1253 } | 1256 } |
1254 | 1257 |
OLD | NEW |