exa/codecrypt
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

avoid using namespace std to prevent future compat problems

Browse source
This commit is contained in:
Mirek Kratochvil 2022-09-25 12:25:58 +02:00
parent 64585f261e
commit 08e8bd6f16
3 changed files with 14 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/hashfile.cpp
View file

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

20
src/mce_qcmdpc.cpp
View file

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

3
src/str_match.cpp
View file

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