diff options
| author | Jeffrey Walton <noloader@gmail.com> | 2015-07-30 17:35:58 -0400 |
|---|---|---|
| committer | Jeffrey Walton <noloader@gmail.com> | 2015-07-30 17:35:58 -0400 |
| commit | 22c3e411334041c8959055d1d104c3039f1e46b1 (patch) | |
| tree | 35981e23e21213d2a5add610ac579a0f6c20cf65 /fipsalgt.cpp | |
| parent | 2799132fd7c5f344c7685d0bc7903fb51ef7c2b3 (diff) | |
| download | cryptopp-git-22c3e411334041c8959055d1d104c3039f1e46b1.tar.gz | |
Removed USING_NAMESPACE(std). Changed cout → std::cout, cerr → std::cerr, ...
Diffstat (limited to 'fipsalgt.cpp')
| -rw-r--r-- | fipsalgt.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/fipsalgt.cpp b/fipsalgt.cpp index 08361ccd..1b7b2f38 100644 --- a/fipsalgt.cpp +++ b/fipsalgt.cpp @@ -15,7 +15,6 @@ #include "trap.h" USING_NAMESPACE(CryptoPP) -USING_NAMESPACE(std) class LineBreakParser : public AutoSignaling<Bufferless<Filter> > { @@ -787,7 +786,7 @@ protected: else if (m_bracketString == "L=64") pMAC.reset(new HMAC<SHA512>); else - throw Exception(Exception::OTHER_ERROR, "TestDataParser: unexpected HMAC bracket string: " + m_bracketString); + throw Exception(Exception::OTHER_ERROR, "TestDataParser: unexpected HMAC bracket std::string: " + m_bracketString); pMAC->SetKey(key, key.size()); int Tlen = atol(m_data["Tlen"].c_str()); @@ -1221,7 +1220,7 @@ int FIPS_140_AlgorithmTest(int argc, char **argv) if (algorithm == "auto") { - string algTable[] = {"AES", "ECDSA", "DSA", "HMAC", "RNG", "RSA", "TDES", "SKIPJACK", "SHA"}; // order is important here + std::string algTable[] = {"AES", "ECDSA", "DSA", "HMAC", "RNG", "RSA", "TDES", "SKIPJACK", "SHA"}; // order is important here for (i=0; i<COUNTOF(algTable); i++) { if (dirname.find(algTable[i]) != std::string::npos) @@ -1277,13 +1276,13 @@ int FIPS_140_AlgorithmTest(int argc, char **argv) pSink = new FileSink(outPathname.c_str(), false); } else - pSink = new FileSink(cout); + pSink = new FileSink(std::cout); FileSource(pathname.c_str(), true, new LineBreakParser(new TestDataParser(algorithm, test, mode, feedbackSize, encrypt, pSink)), false); } catch (...) { - cout << "file: " << filename << endl; + std::cout << "file: " << filename << std::endl; throw; } return 0; |