 @@ -19,27 +19,29 @@
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include "config.h"
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/param.h>
 #include <sys/mman.h>
 #ifdef HAVE_OPENSSL_CAST_H
 #include <openssl/cast.h>
 #endif
 #include <netpgp.h>
 #include "packet.h"
 #include "packet-parse.h"
 #include "keyring.h"
 #include "errors.h"
 #include "packet-show.h"
 #include "create.h"
 @@ -148,69 +150,84 @@ psuccess(char *f, __ops_validation_t *re
 		       f,
 		       ctime(&results->valid_sigs[i].creation_time),
 		       __ops_show_pka(results->valid_sigs[i].key_algorithm),
 		       userid_to_id(results->valid_sigs[i].signer_id, id));
 		pubkey = __ops_keyring_find_key_by_id(pubring,
 						    (const unsigned char *)
 					  results->valid_sigs[i].signer_id);
 		__ops_print_public_keydata(pubkey);
+	}
+}
 /* sign a file, and put the signature in a separate file */
 static int
-sign_detached(__ops_secret_key_t *seckey, const char *hashstr, char *f,
+sign_detached(char *f, char *sigfile, __ops_secret_key_t *seckey,
-		char *sigfile)
+		const char *hashstr)
+{
 	__ops_create_signature_t	*sig;
 	__ops_hash_algorithm_t		 alg;
 	__ops_create_info_t		*info;
 	unsigned char	 		 keyid[OPS_KEY_ID_SIZE];
 	unsigned char			*mmapped;
 	struct stat			 st;
 	time_t				 t;
 	char				 fname[MAXPATHLEN];
 	int				 fd;
 	/* find out which hash algorithm to use */
 	alg = __ops_hash_algorithm_from_text(hashstr);
 	if (alg == OPS_HASH_UNKNOWN) {
 		(void) fprintf(stderr,"Unknown hash algorithm: %s\n", hashstr);
 		return 0;
+	}
 	/* create a new signature */
 	sig = __ops_create_signature_new();
 	__ops_signature_start_cleartext_signature(sig, seckey, alg,
 			OPS_SIG_BINARY);
 	/* read the contents of 'f' */
 	fd = open(f, O_RDONLY);
 	if (fd < 0) {
 		(void) fprintf(stderr, "can't open file \"%s\" to sign\n",
 			f);
 		return 0;
+	}
-	for (;;) {
+	/* attempt to mmap(2) the file - if that fails, fall back to
-		unsigned char	buf[8192];
+	 * standard read(2) */
-		int 		n;
+	mmapped = MAP_FAILED;
 	if (fstat(fd, &st) == 0) {
 		mmapped = mmap(NULL, (size_t)st.st_size, PROT_READ,
 					MAP_FILE | MAP_PRIVATE, fd, 0);
+	}
 	if (mmapped == MAP_FAILED) {
 		for (;;) {
 			unsigned char	buf[8192];
 			int 		n;
-		if ((n = read(fd, buf, sizeof(buf))) == 0) {
+			if ((n = read(fd, buf, sizeof(buf))) == 0) {
-			break;
+				break;
+			}
-		if (n < 0) {
+			if (n < 0) {
-			(void) fprintf(stderr, "short read \"%s\"\n", f);
+				(void) fprintf(stderr, "short read \"%s\"\n",
-			(void) close(fd);
+						f);
-			return 0;
+				(void) close(fd);
 				return 0;
+			}
 			__ops_signature_add_data(sig, buf, (unsigned)n);
+		}
-		__ops_signature_add_data(sig, buf, (unsigned)n);
+	} else {
 		__ops_signature_add_data(sig, mmapped, (unsigned)st.st_size);
 		(void) munmap(mmapped, (unsigned)st.st_size);
+	}
 	(void) close(fd);
 	/* calculate the signature */
 	t = time(NULL);
 	__ops_signature_add_creation_time(sig, t);
 	__ops_keyid(keyid, OPS_KEY_ID_SIZE, OPS_KEY_ID_SIZE,
 		&seckey->public_key);
 	__ops_signature_add_issuer_key_id(sig, keyid);
 	__ops_signature_hashed_subpackets_end(sig);
 	/* write the signature to the detached file */
 	if (sigfile == NULL) {
 @@ -453,27 +470,27 @@ netpgp_sign_file(netpgp_t *netpgp, char
 		/* get the passphrase */
 		get_pass_phrase(passphrase, sizeof(passphrase));
 		/* now decrypt key */
 		seckey = __ops_decrypt_secret_key_from_data(keypair,
 							passphrase);
 		if (seckey == NULL) {
 			(void) fprintf(stderr, "Bad passphrase\n");
+		}
 	} while (seckey == NULL);
 	/* sign file */
 	if (cleartext) {
 		__ops_sign_file_as_cleartext(f, out, seckey, true);
 	} else if (detached) {
-		sign_detached(seckey, "SHA1", f, out);
+		sign_detached(f, out, seckey, "SHA1");
 	} else {
 		__ops_sign_file(f, out, seckey, armored, true);
+	}
 	(void) memset(passphrase, 0x0, sizeof(passphrase));
 	return 1;
+}
 /* verify a file */
 int
 netpgp_verify_file(netpgp_t *netpgp, char *f, int armored)
+{
 	__ops_validation_t	result;