m fixesHEAD3.1.2master

Signed-off-by: Mattias Andrée <m@maandree.se>

5 files changed, 22 insertions, 24 deletions

diff --git a/DEPENDENCIES b/DEPENDENCIES
index ee2bbd7..9f3e03b 100644
--- a/DEPENDENCIES
+++ b/DEPENDENCIES
@@ -4,17 +4,15 @@ RUNTIME DEPENDENCIES:
 	libpassphrase (opt-in)
 	libkeccak
 
-
 BUILD DEPENDENCIES:
 
 	coreutils
 	make
-	cc
+	c99
 	libc
 	libpassphrase (opt-in)
 	libkeccak
 
-
 INSTALL DEPENDENCIES:
 
 	coreutils
diff --git a/README b/README
index 3bf0ce5..9148f6f 100644
--- a/README
+++ b/README
@@ -5,17 +5,17 @@ SYNOPSIS
 	file2key [file]
 
 DESCRIPTION
-	file2key uses Keccak[] to create a hash as big as a
-	selected file and the prints the bitwise exclusive or
-	of the hash and the file making a key file from any
+	file2key uses Keccak[] to create a hash as big as the
+	selected file and then prints the bitwise exclusive OR
+	of the hash and the file, making a key file from any
 	normal file and a passphrase.
 
-	The idea is the reversed of steganography.
+	The idea is the reverse of steganography.
 
 	file2key can also be used to encrypt and decrypt files.
 
 RATIONALE
 	file2key cannot be configured. The idea behind this is
-	that you if it required configurations you run the risk
-	of losing all your keys if you lose your configurations.
+	that if it required configuration you would run the risk
+	of losing all your keys if you lost your configuration.
 	This must not happen.
diff --git a/config.mk b/config.mk
index c8ba750..1689582 100644
--- a/config.mk
+++ b/config.mk
@@ -1,10 +1,10 @@
 PREFIX    = /usr
 MANPREFIX = $(PREFIX)/share/man
 
-CC = cc
+CC = c99
 
 CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700
-CFLAGS   = -std=c99 -O2
+CFLAGS   = -O2
 LDFLAGS  = -s -lkeccak
 
 # To use libpassphrase, add -DWITH_LIBPASSPHRASE to CPPFLAGS and -lpassphrase to LDFLAGS
diff --git a/file2key.1 b/file2key.1
index fb05e0e..a41ffe6 100644
--- a/file2key.1
+++ b/file2key.1
@@ -1,4 +1,4 @@
-.TH FILE2KEY 1 file2key
+.TH FILE2KEY 1 FILE2KEY
 
 .SH NAME
 file2key - generates a key from a file and a passphrase
@@ -10,11 +10,11 @@ file2key - generates a key from a file and a passphrase
 .SH DESCRIPTION
 .B file2key
 uses Keccak[] to create a hash as big as a selected
-file and the prints the bitwise exclusive or of the
-hash and the file making a key file from any normal
+file and then prints the bitwise exclusive OR of the
+hash and the file, making a key file from any normal
 file and a passphrase.
 .PP
-The idea is the reversed of steganography.
+The idea is the reverse of steganography.
 .PP
 .B file2key
 can also be used to encrypt and decrypt files.
@@ -37,7 +37,7 @@ The file to generate a key from.
 .SH STDIN
 The
 .B file2key
-utility generate a key from the standard input is no
+utility generates a key from the standard input if no
 .I file
 is specified, or if the specified file is
 .RB \(dq - \(dq.
@@ -46,7 +46,7 @@ is specified, or if the specified file is
 The input file can be any file type.
 
 .SH ENVIRONMENT VARIABLES
-No environment variables affects the execution of
+No environment variables affect the execution of
 .BR file2key
 
 .SH ASYNCHRONOUS EVENTS
@@ -73,7 +73,7 @@ None.
 .SH EXIT STATUS
 If the
 .B file2key
-utility fails it will exit withone of the following statuses:
+utility fails it will exit with one of the following statuses:
 .TP
 0
 Successful completion.
@@ -95,9 +95,9 @@ None.
 
 .SH RATIONALE
 .B file2key
-cannot be configured. The idea behind this is that you
-if it required configurations you run the risk of losing
-all your keys if you lose your configurations. This must
+cannot be configured. The idea behind this is that if
+it required configuration you would run the risk of losing
+all your keys if you lost your configuration. This must
 not happen.
 
 .SH NOTES
diff --git a/file2key.c b/file2key.c
index 8781330..9e18ff8 100644
--- a/file2key.c
+++ b/file2key.c
@@ -154,9 +154,9 @@ hash_passphrase(const char *passphrase)
 	spec.output   = PASSPHRASE_KECCAK_OUTPUT;
 
 	if (libkeccak_spec_check(&spec) || PASSPHRASE_KECCAK_SQUEEZES <= 0) {
-		fprintf(stderr, "%s: bad passhprase hashing parameters, please recompile file2key with with "
-		                    "proper values on PASSPHRASE_KECCAK_RATE, PASSPHRASE_KECCAK_CAPACITY, "
-		                    "PASSPHRASE_KECCAK_OUTPUT and PASSPHRASE_KECCAK_SQUEEZES", argv0);
+		fprintf(stderr, "%s: bad passphrase hashing parameters, please recompile file2key with "
+		                    "proper values for PASSPHRASE_KECCAK_RATE, PASSPHRASE_KECCAK_CAPACITY, "
+		                    "PASSPHRASE_KECCAK_OUTPUT and PASSPHRASE_KECCAK_SQUEEZES\n", argv0);
 		return 1;
 	}