arne
/
cryptopp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

clarify error messages

pull/2/head
weidai 2009-03-13 02:03:27 +00:00
parent 2779fc6050
commit df9fe81ee0
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
authenc.cpp
View File

@ -62,7 +62,7 @@ void AuthenticatedSymmetricCipherBase::SetKey(const byte *userKey, size_t keylen
void AuthenticatedSymmetricCipherBase::Resynchronize(const byte *iv, int length) void AuthenticatedSymmetricCipherBase::Resynchronize(const byte *iv, int length)
{ {
if (m_state < State_KeySet) if (m_state < State_KeySet)
throw BadState(AlgorithmName(), "Resynchronize", "State_KeySet"); throw BadState(AlgorithmName(), "Resynchronize", "key is set");
m_bufferedDataLength = 0; m_bufferedDataLength = 0;
m_totalHeaderLength = m_totalMessageLength = m_totalFooterLength = 0; m_totalHeaderLength = m_totalMessageLength = m_totalFooterLength = 0;
@ -81,7 +81,7 @@ void AuthenticatedSymmetricCipherBase::Update(const byte *input, size_t length)
{ {
case State_Start: case State_Start:
case State_KeySet: case State_KeySet:
throw BadState(AlgorithmName(), "Update", "State_IVSet"); throw BadState(AlgorithmName(), "Update", "setting key and IV");
case State_IVSet: case State_IVSet:
AuthenticateData(input, length); AuthenticateData(input, length);
m_totalHeaderLength += length; m_totalHeaderLength += length;
@ -112,8 +112,9 @@ reswitch:
{ {
case State_Start: case State_Start:
case State_KeySet: case State_KeySet:
throw BadState(AlgorithmName(), "ProcessData", "setting key and IV");
case State_AuthFooter: case State_AuthFooter:
throw BadState(AlgorithmName(), "ProcessData", "State_IVSet or after State_AuthFooter"); throw BadState(AlgorithmName(), "ProcessData was called after footer input has started");
case State_IVSet: case State_IVSet:
AuthenticateLastHeaderBlock(); AuthenticateLastHeaderBlock();
m_bufferedDataLength = 0; m_bufferedDataLength = 0;
@ -140,7 +141,7 @@ void AuthenticatedSymmetricCipherBase::TruncatedFinal(byte *mac, size_t macSize)
if (m_totalFooterLength > MaxFooterLength()) if (m_totalFooterLength > MaxFooterLength())
{ {
if (MaxFooterLength() == 0) if (MaxFooterLength() == 0)
throw InvalidArgument(AlgorithmName() + ": unencrypted authenticated data cannot be input after encrypted data"); throw InvalidArgument(AlgorithmName() + ": additional authenticated data (AAD) cannot be input after data to be encrypted or decrypted");
else else
throw InvalidArgument(AlgorithmName() + ": footer length of " + IntToString(m_totalFooterLength) + " exceeds the maximum of " + IntToString(MaxFooterLength())); throw InvalidArgument(AlgorithmName() + ": footer length of " + IntToString(m_totalFooterLength) + " exceeds the maximum of " + IntToString(MaxFooterLength()));
} }
@ -149,7 +150,7 @@ void AuthenticatedSymmetricCipherBase::TruncatedFinal(byte *mac, size_t macSize)
{ {
case State_Start: case State_Start:
case State_KeySet: case State_KeySet:
throw BadState(AlgorithmName(), "TruncatedFinal", "State_IVSet"); throw BadState(AlgorithmName(), "TruncatedFinal", "setting key and IV");
case State_IVSet: case State_IVSet:
AuthenticateLastHeaderBlock(); AuthenticateLastHeaderBlock();

1
cryptlib.h
View File

@ -642,6 +642,7 @@ public:
class BadState : public Exception class BadState : public Exception
{ {
public: public:
explicit BadState(const std::string &name, const char *message) : Exception(OTHER_ERROR, name + ": " + message) {}
explicit BadState(const std::string &name, const char *function, const char *state) : Exception(OTHER_ERROR, name + ": " + function + " was called before " + state) {} explicit BadState(const std::string &name, const char *function, const char *state) : Exception(OTHER_ERROR, name + ": " + function + " was called before " + state) {}
}; };