Wed Sep 11 14:10:05 2013 UTC ()

Fixed installation of signed packages. Some variables part of struct
signature_archive were not initialized properly, therefore randomly failing
in the verify_signature_read_cb() callback.

Partly closes PR pkg/48194; pkgsrc needs to be updated as well.

"please commit" agc@

XXX pull-up to netbsd-6


(khorben)

diff -r1.10 -r1.11 pkgsrc/pkgtools/pkg_install/files/lib/pkg_signature.c

--- pkgsrc/pkgtools/pkg_install/files/lib/pkg_signature.c 2010/02/20 04:40:03 1.10
+++ pkgsrc/pkgtools/pkg_install/files/lib/pkg_signature.c 2013/09/11 14:10:05 1.11

 @@ -1,23 +1,23 @@
-/*	$NetBSD: pkg_signature.c,v 1.10 2010/02/20 04:40:03 joerg Exp $	*/
+/*	$NetBSD: pkg_signature.c,v 1.11 2013/09/11 14:10:05 khorben Exp $	*/
 #if HAVE_CONFIG_H
 #include "config.h"
 #endif
 #include <nbcompat.h>
 #if HAVE_SYS_CDEFS_H
 #include <sys/cdefs.h>
 #endif
-__RCSID("$NetBSD: pkg_signature.c,v 1.10 2010/02/20 04:40:03 joerg Exp $");
+__RCSID("$NetBSD: pkg_signature.c,v 1.11 2013/09/11 14:10:05 khorben Exp $");
 /*-
  * Copyright (c) 2008 Joerg Sonnenberger <joerg@NetBSD.org>.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
+ *
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in
 @@ -315,30 +315,27 @@ cleanup:
 int
 pkg_verify_signature(const char *archive_name, struct archive **archive,
     struct archive_entry **entry, char **pkgname)
+{
 	struct signature_archive *state;
 	struct archive_entry *my_entry;
 	struct archive *a;
 	char *hash_file, *signature_file;
 	size_t hash_len, signature_len;
 	int r, has_sig;
 	*pkgname = NULL;
-	state = xmalloc(sizeof(*state));
+	state = xcalloc(sizeof(*state), 1);
 	state->sign_blocks = NULL;
 	state->sign_buf = NULL;
 	state->archive = NULL;
 	r = read_file_from_archive(archive_name, *archive, entry, HASH_FNAME,
 	    &hash_file, &hash_len);
 	if (r == -1) {
 		archive_read_finish(*archive);
 		*archive = NULL;
 		free(state);
 		goto no_valid_signature;
 	} else if (r == 1) {
 		free(state);
 		goto no_valid_signature;
+	}