Index: client/1.0/pkgr.eagle
==================================================================
--- client/1.0/pkgr.eagle
+++ client/1.0/pkgr.eagle
@@ -173,36 +173,48 @@
     }
   }
 
   #
   # NOTE: This procedure returns non-zero if the specified string value
-  #       looks like a Harpy (script) certificate.  The value argument
-  #       is the string to check.
+  #       looks like a Harpy (script) certificate.  The value argument is
+  #       the string to check.  The value 14 used within this procedure is
+  #       the length of the literal string "</Certificate>".
   #
   # <public>
   proc isHarpyCertificate { value } {
-    if {[string length $value] == 0 || ([string first [string trim {
+    set value [string trim $value]
+    set length [string length $value]
+
+    if {$length == 0 || ([string first [string trim {
       <?xml version="1.0" encoding="utf-8"?>
     }] $value] == 0 && [string first [string trim {
       <Certificate xmlns="https://eagle.to/2011/harpy"
-    }] $value] != -1)} then {
+    }] $value] != -1 && [string first [string trim {
+      </Certificate>
+    }] $value] == ($length - 14))} then {
       return true
     } else {
       return false
     }
   }
 
   #
   # NOTE: This procedure returns non-zero if the specified string value
-  #       looks like an OpenPGP signature.  The value argument is the
-  #       string to check.
+  #       looks like an OpenPGP signature.  The value argument is the string
+  #       to check.  The value 27 used within this procedure is the length
+  #       of the literal string "-----END PGP SIGNATURE-----".
   #
   # <public>
   proc isPgpSignature { value } {
-    if {[string length $value] == 0 || [string first [string trim {
+    set value [string trim $value]
+    set length [string length $value]
+
+    if {$length == 0 || ([string first [string trim {
       -----BEGIN PGP SIGNATURE-----
-    }] $value] == 0} then {
+    }] $value] == 0 && [string first [string trim {
+      -----END PGP SIGNATURE-----
+    }] $value] == ($length - 27))} then {
       return true
     } else {
       return false
     }
   }