use check-sig-dos twice

[fsf-keyring.git] / fsf-keyring.sh

diff --git a/fsf-keyring.sh b/fsf-keyring.sh
index e3644d62cba455aa1a56bbbff1a382823eb8f027..191742180b39409456ae00449d0113543d0fe13a 100755 (executable)
--- a/fsf-keyring.sh
+++ b/fsf-keyring.sh
@@ -36,6 +36,10 @@ refresh-gpg-key() {
   return $error
 }
 
+check-sig-dos() {
+  (( "$(stat -c %s "$1")" > "${dos_attack_bytes}" )) && echo -e "\n\nerror: keyring is very large. did we get a signature DoS attack?\n\n" && exit 1
+}
+
 refresh=true
 if [[ $1 == -r ]]; then
   refresh=false
@@ -56,6 +60,9 @@ KEYS+="5BE81180271798C6B4866C54598E4925C518D5DC " #davis
 KEYS+="2E0ECE75F8162B407D666767879738E6D6440D57 " #devinu
 KEYS+="D86097B5E291BA771FA64D357014A6BE08494155"  #odile
 
+check-sig-dos fsf-keyring.gpg
+gpg --import fsf-keyring.gpg
+
 rm -f /tmp/keys.asc ./fsf-keyring.gpg
 
 for KEY in $KEYS ; do
@@ -67,7 +74,7 @@ done
 
 gpg --armor --export $KEYS > key-export
 
-(( "$(stat -c %s key-export)" > "${dos_attack_bytes}" )) && echo -e "\n\nerror: keyring is very large. did we get a signature DoS attack?\n\n" && exit 1
+check-sig-dos key-export
 
 mv key-export fsf-keyring.gpg