From b9948b3ae90bc47897071afdbf48f26ef67083a7 Mon Sep 17 00:00:00 2001
From: rhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58>
Date: Wed, 17 Dec 2008 16:27:50 +0000
Subject: createpkg: package signature; simplaret: enhanced signature checking

git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@669 04377dda-e619-0410-9926-eae83683ac58
---
 trunk/src/simplaret | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'trunk/src/simplaret')

diff --git a/trunk/src/simplaret b/trunk/src/simplaret
index 8611721..9519cfe 100755
--- a/trunk/src/simplaret
+++ b/trunk/src/simplaret
@@ -674,12 +674,18 @@ function simplaret_get {
           # echo $folder/$candidate
           silent="--silent"
         fi
-        if [ -f "$folder/$candidate.asc" ] || [ "$SIGNATURE_CHECKING" == "1" ]; then
+        if [ -f "$folder/$candidate.asc" ] || [ "$SIGNATURE_CHECKING" == "$on" ]; then
           gpg --verify $folder/$candidate.asc $folder/$candidate
+          if [ "$?" != "0" ]; then
+            echo "Package signature does not match. Removing package."
+            rm -f $folder/$candidate.asc $folder/$candidate
+            LAST_DOWNLOADED_PACKAGE=""
+            return 1
+          fi
         fi
         # generate the patches FILE_LIST and PACKAGES.TXT if needed
         if [ "$generate_patches" == "1" ]; then
-          gen_patches_filelst $folder
+          gen_patches_filelist $folder
           gen_packages_txt $folder
           gen_md5_checksums $folder
         fi
-- 
cgit v1.2.3