avoid using namespace std to prevent future compat problems

Signed-off-by: Tom Li <tomli@tomli.me>

README.md

@@ -3,6 +3,9 @@
 
 The post-quantum cryptography tool.
 
+Codecrypt is currently unmaintained, although I still successfully use it. If
+you are interested in developing/maintaining it, ping me.
+
 #### About
 
 This is a GnuPG-like unix program for encryption and signing that uses only
@@ -31,6 +34,10 @@ Go read http://pqcrypto.org/
  - Arch linux: see https://aur.archlinux.org/packages/codecrypt/
  - *Windows port* is maintained separately here: https://github.com/mike805/codecrypt-win32
 
+Language wrappers:
+
+ - Python bindings: https://github.com/mike805/codecrypt-python/
+
 #### Documentation
 
 There is a complete, UNIXy manual page supplied with the package. You can view

src/cube_hash.h

@@ -37,12 +37,14 @@ public:
 		state.init();
 
 		for (i = 0; i + B <= a.size(); i += B)
-			state.process_block (& (a[i]));
+			state.process_block (a.data() + i);
+
+		state.process_final_incomplete_block (a.data() + i,
+		                                      a.size() - i);
 
-		state.process_final_incomplete_block (& (a[i]), a.size() - i);
 		std::vector<byte> result;
 		result.resize (H, 0);
-		state.get_hash (& (result[0]));
+		state.get_hash (result.data());
 		return result;
 	}
 };
@@ -75,7 +77,7 @@ public:
 			}
 		}
 		while (apos + B <= asize) {
-			state.process_block (& (a[apos]));
+			state.process_block (a + apos);
 			apos += B;
 		}
 		for (; apos < asize; ++apos, ++bpos)
@@ -86,7 +88,7 @@ public:
 		state.process_final_incomplete_block (buf, bpos);
 		std::vector<byte> result;
 		result.resize (H, 0);
-		state.get_hash (& (result[0]));
+		state.get_hash (result.data());
 		return result;
 	}
 };

src/hash.h

@@ -48,7 +48,7 @@ public:
 	virtual ~hash_proc() {}
 
 	void eat (const std::vector<byte>&a) {
-		return eat (& (a[0]), & (a[a.size()]));
+		return eat (a.data(), a.data() + a.size());
 	}
 
 	typedef std::map<std::string, factoryof<hash_proc>*> suite_t;

src/hashfile.cpp

@@ -21,9 +21,7 @@
 #include "hashfile.h"
 
 #include <map>
-using namespace std;
+#include <cstdint>
-
-#include <stdint.h>
 
 #include "hash.h"
 #include "iohelpers.h"
@@ -72,7 +70,7 @@ public:
  * list of hash functions available
  */
 
-typedef map<string, instanceof<hash_proc> > hashmap;
+typedef std::map<std::string, instanceof<hash_proc> > hashmap;
 
 void fill_hashmap (hashmap&t)
 {
@@ -89,7 +87,7 @@ void fill_hashmap (hashmap&t)
 	t["SIZE64"] = new size64proc;
 }
 
-bool hashfile::create (istream&in)
+bool hashfile::create (std::istream&in)
 {
 	hashes.clear();
 
@@ -120,7 +118,7 @@ bool hashfile::create (istream&in)
 	}
 }
 
-int hashfile::verify (istream&in)
+int hashfile::verify (std::istream&in)
 {
 	hashmap hm_all, hm;
 	fill_hashmap (hm_all);

src/keyring.cpp

@@ -43,8 +43,8 @@ std::string keyring::get_keyid (const std::string&pubkey)
 	cube256hash hf;
 	std::vector<byte> tmp =
 	    hf (std::vector<byte>
-	        (&pubkey[0],
+	        (pubkey.data(),
-	         &pubkey[pubkey.length()]));
+	         pubkey.data() + pubkey.length()));
 
 	r.resize (tmp.size() * 2, ' ');
 	for (size_t i = 0; i < tmp.size(); ++i) {

src/main.cpp

@@ -86,7 +86,7 @@ void print_help (char*pname)
 	out (" -n, --no-action    on import, only show what would be imported");
 	out (" -w, --with-lock    specify the symmetric key for (un)locking the secrets");
 	out (" -w @SPEC           ask for password and expand it to a symmetric key");
-	out("                     of type SPEC for (un)locking the secret");
+	out ("                     of type SPEC for (un)locking the secret");
 	outeol;
 	out (" With -S and -w, using `@' as the key file name will cause the program to");
 	out (" interactively ask for a password and derive the symmetric key from it.");
@@ -334,11 +334,11 @@ int main (int argc, char**argv)
 	fill_algorithm_suite (AS);
 
 	//default local user key from environment
-	if(user.empty()) {
+	if (user.empty()) {
-		const char*u=getenv("CCR_USER");
+		const char*u = getenv ("CCR_USER");
-		if(u) user=u;
+		if (u) user = u;
 	}
-		
+
 	/*
 	 * cin/cout redirection
 	 */

src/mce_qcmdpc.cpp

@@ -20,11 +20,12 @@
 
 #include "mce_qcmdpc.h"
 
-#include "fft.h"
+#include <list>
 #include <cmath>
 
+#include "fft.h"
+
 using namespace mce_qcmdpc;
-using namespace std;
 
 int mce_qcmdpc::generate (pubkey&pub, privkey&priv, prng&rng,
                           uint block_size, uint block_count, uint wi,
@@ -43,7 +44,7 @@ int mce_qcmdpc::generate (pubkey&pub, privkey&priv, prng&rng,
 	 * (1+x^n).
 	 */
 
-	vector<dcx> H_last_inv;
+	std::vector<dcx> H_last_inv;
 
 	for (;;) {
 		//retry generating the rightmost block until it is invertible
@@ -100,7 +101,7 @@ int mce_qcmdpc::generate (pubkey&pub, privkey&priv, prng&rng,
 		priv.H[i] = Hb;
 
 		//compute inv(H[last])*H[i]
-		vector<dcx> H;
+		std::vector<dcx> H;
 		fft (Hb, H);
 		for (j = 0; j < block_size; ++j)
 			H[j] *= H_last_inv[j];
@@ -152,7 +153,7 @@ int pubkey::encrypt (const bvector&in, bvector&out, const bvector&errors)
 		if (G[i].size() != bs) return 1; //prevent mangled keys
 
 	//first, the checksum part
-	vector<dcx> bcheck, Pd, Gd;
+	std::vector<dcx> bcheck, Pd, Gd;
 	bcheck.resize (bs, dcx (0, 0)); //initially zero
 	bvector block;
 
@@ -189,9 +190,6 @@ int privkey::decrypt (const bvector & in, bvector & out)
 	return decrypt (in, out, tmp_errors);
 }
 
-#include <vector>
-#include <list>
-
 int privkey::decrypt (const bvector & in_orig, bvector & out, bvector & errors)
 {
 	uint i, j;
@@ -208,7 +206,7 @@ int privkey::decrypt (const bvector & in_orig, bvector & out, bvector & errors)
 	 * probabilistic decoding!
 	 */
 
-	vector<dcx> synd_diag, tmp, Htmp;
+	std::vector<dcx> synd_diag, tmp, Htmp;
 	synd_diag.resize (bs, dcx (0, 0));
 
 	//precompute the syndrome
@@ -225,7 +223,7 @@ int privkey::decrypt (const bvector & in_orig, bvector & out, bvector & errors)
 	fft (synd_diag, syndrome);
 
 	//precompute sparse matrix indexes
-	vector<list<uint> > Hsp;
+	std::vector<std::list<uint> > Hsp;
 	Hsp.resize (blocks);
 	for (i = 0; i < blocks; ++i)
 		for (j = 0; j < bs; ++j)
@@ -242,7 +240,7 @@ int privkey::decrypt (const bvector & in_orig, bvector & out, bvector & errors)
 	 * FFT would be a cool candidate.
 	 */
 
-	vector<unsigned> unsat, round_unsat;
+	std::vector<unsigned> unsat, round_unsat;
 	unsat.resize (cs, 0);
 
 	for (uint blk = 0; blk < blocks; ++blk)

src/sc.h

@@ -50,7 +50,7 @@ public:
 	}
 
 	void load_key_vector (const std::vector<byte>&K) {
-		load_key (& (K[0]), & (K[K.size()]));
+		load_key (K.data(), K.data() + K.size());
 	}
 
 	typedef std::map<std::string, factoryof<streamcipher>*> suite_t;

src/str_match.cpp

@@ -22,7 +22,6 @@
 
 #include <algorithm>
 #include <cctype> //for tolower()
-using namespace std;
 
 bool algorithm_name_matches (const std::string& search,
                              const std::string&name)
@@ -34,7 +33,7 @@ bool algorithm_name_matches (const std::string& search,
 	return true;
 }
 
-bool matches_icase (string name, string s)
+bool matches_icase (std::string name, std::string s)
 {
 	transform (name.begin(), name.end(), name.begin(), ::tolower);
 	transform (s.begin(), s.end(), s.begin(), ::tolower);