opkg_verify_integrity: better logging and error conditions

[project/opkg-lede.git] / libopkg / opkg_install.c

diff --git a/libopkg/opkg_install.c b/libopkg/opkg_install.c
index d2d919a85651b9af41ca12c4bf518b1f143a9886..68fb9ea246f3c9321e726a7f2a0493cf6d8048c0 100644 (file)
--- a/libopkg/opkg_install.c
+++ b/libopkg/opkg_install.c
@@ -49,7 +49,7 @@ static int satisfy_dependencies_for(pkg_t * pkg)
        int ndepends;
 
        ndepends = pkg_hash_fetch_unsatisfied_dependencies(pkg, depends,
-                                                          &unresolved);
+                                                          &unresolved, 0);
 
        if (unresolved) {
                opkg_msg(ERROR,
@@ -244,8 +244,7 @@ static int unpack_pkg_control_files(pkg_t * pkg)
 
        tmp_unpack_dir = mkdtemp(tmp_unpack_dir);
        if (tmp_unpack_dir == NULL) {
-               opkg_perror(ERROR, "Failed to create temporary directory '%s'",
-                           tmp_unpack_dir);
+               opkg_perror(ERROR, "Failed to create temporary directory");
                return -1;
        }
 
@@ -1251,8 +1250,6 @@ int opkg_install_pkg(pkg_t * pkg, int from_upgrade)
        pkg_vec_t *replacees;
        abstract_pkg_t *ab_pkg = NULL;
        int old_state_flag;
-       char *file_md5, *pkg_md5;
-       char *file_sha256, *pkg_sha256;
        sigset_t newset, oldset;
        const char *local_filename;
        time_t now;
@@ -1366,47 +1363,17 @@ int opkg_install_pkg(pkg_t * pkg, int from_upgrade)
        }
 #endif
 
-       /* Check for md5 values */
-       pkg_md5 = pkg_get_md5(pkg);
-       if (pkg_md5) {
-               file_md5 = file_md5sum_alloc(local_filename);
-               if (file_md5 && strcmp(file_md5, pkg_md5)) {
-                       if (!conf->force_checksum) {
-                               opkg_msg(ERROR, "Package %s md5sum mismatch. "
-                                        "Either the opkg or the package index are corrupt. "
-                                        "Try 'opkg update'.\n", pkg->name);
-                               free(file_md5);
-                               return -1;
-                       } else {
-                               opkg_msg(NOTICE,
-                                        "Ignored %s md5sum mismatch.\n",
-                                        pkg->name);
-                       }
-               }
-               if (file_md5)
-                       free(file_md5);
+       /* Check integrity (size, checksums) */
+       err = opkg_verify_integrity(pkg, local_filename);
+       if (err && !conf->force_checksum) {
+               opkg_msg(ERROR, "Checksum or size mismatch for package %s. "
+                        "Either the opkg or the package index are corrupt. "
+                        "Try 'opkg update'.\n", pkg->name);
+               return -1;
        }
-
-       /* Check for sha256 value */
-       pkg_sha256 = pkg_get_sha256(pkg);
-       if (pkg_sha256) {
-               file_sha256 = file_sha256sum_alloc(local_filename);
-               if (file_sha256 && strcmp(file_sha256, pkg_sha256)) {
-                       if (!conf->force_checksum) {
-                               opkg_msg(ERROR,
-                                        "Package %s sha256sum mismatch. "
-                                        "Either the opkg or the package index are corrupt. "
-                                        "Try 'opkg update'.\n", pkg->name);
-                               free(file_sha256);
-                               return -1;
-                       } else {
-                               opkg_msg(NOTICE,
-                                        "Ignored %s sha256sum mismatch.\n",
-                                        pkg->name);
-                       }
-               }
-               if (file_sha256)
-                       free(file_sha256);
+       if (err && conf->force_checksum) {
+               opkg_msg(NOTICE, "Ignored %s checksum or size mismatch.\n",
+                       pkg->name);
        }
 
        if (conf->download_only) {