trustbridge: cinst/mozilla.c comparison

comparison cinst/mozilla.c @ 279:cb5f082e90c5

Factor out the iteration over profiles and certs.

author	Sascha Wilde <wilde@intevation.de>
date	Wed, 02 Apr 2014 13:46:19 +0200
parents	539c856cb5da
children	6c4b3ff4a356

comparison

equal deleted inserted replaced

-:539c856cb5da
+:cb5f082e90c5
 else
 {
 DEBUGPRINTF("Could not open nss certificate store in %s!\n", pdir);
 }
 free(cert_name);
+return success;
+}
+/**
+* @brief Apply a function to a list of certificates and profiles
+*
+* The function must have the signature:
+*
+*   bool function(char *pdir, SECItem der_cert)
+*
+* where pdir is the path of an profile and der_cert is an raw DER
+* formatted certificate.  The function must return true on success
+* and false on failure.
+*
+* This function is intended wor use with the import_cert and
+* remove_cert functions.
+*
+* @param[in] fn the function to apply
+* @param[inout] certs a secitem list holding the certificates
+* the list will be change (emptied)!
+* @param[in] pdirs the NULL terminated list of profile directories
+* @returns true on success and false on failure
+*/
+bool
+apply_to_certs_and_profiles(bool fn(char *, SECItem *),
+seciteml_t **certs, char **pdirs)
+{
+SECItem *cert;
+bool success = true;
+while ((cert = seciteml_pop(certs)) != NULL)
+{
+for (int i=0; pdirs[i] != NULL; i++)
+{
+if (! (*fn)(pdirs[i], cert))
+success = false;
+}
+free(cert->data);
+free(cert);
+}
 return success;
 }
 /**
 * @brief Parse IPC commands from standard input.
 main ()
 {
 char **pdirs;
 seciteml_t *certs_to_remove = NULL;
 seciteml_t *certs_to_add = NULL;
-SECItem *secitemp;
 pdirs =
 get_all_profile_dirs();
 if (pdirs != NULL)
 {
 parse_commands(&certs_to_add, &certs_to_remove);
-while ((secitemp = seciteml_pop(&certs_to_remove)) != NULL)
+puts("OLD List of installed certs:");
-{
+for (int i=0; pdirs[i] != NULL; i++)
-for (int i=0; pdirs[i] != NULL; i++)
+nss_list_certs(pdirs[i]);
-{
-puts(pdirs[i]);
+if (! apply_to_certs_and_profiles(remove_cert, &certs_to_remove, pdirs))
-if (! remove_cert(pdirs[i], secitemp))
+return_code |= WARN_MOZ_COULD_NOT_REMOVE_CERT;
-return_code |= WARN_MOZ_COULD_NOT_REMOVE_CERT;
-puts("List of installed certs:");
+if (! apply_to_certs_and_profiles(import_cert, &certs_to_add, pdirs))
-nss_list_certs(pdirs[i]);
+return_code |= WARN_MOZ_COULD_NOT_ADD_CERT;
-}
-free(secitemp->data);
+puts("NEW List of installed certs:");
-free(secitemp);
+for (int i=0; pdirs[i] != NULL; i++)
-}
+nss_list_certs(pdirs[i]);
-while ((secitemp = seciteml_pop(&certs_to_add)) != NULL)
-{
-for (int i=0; pdirs[i] != NULL; i++)
-{
-puts(pdirs[i]);
-if (! import_cert(pdirs[i], secitemp))
-return_code |= WARN_MOZ_COULD_NOT_ADD_CERT;
-nss_list_certs(pdirs[i]);
-}
-free(secitemp->data);
-free(secitemp);
-}
 strv_free(pdirs);
 }
 exit(return_code);
 }

Mercurial > trustbridge

comparison cinst/mozilla.c @ 279:cb5f082e90c5