Remove the "withAlgorithm" method, which doesn't really

make sense with our new approach to using 
MessageAuthenticationCode directly. 

Also a few random whitepace changes, brought to you by
.xemacs.

svn path=/trunk/kdesupport/qca/; revision=605535
This commit is contained in:
Brad Hards 2006-11-17 05:06:47 +00:00
parent b9bff57048
commit a60b281780
3 changed files with 17 additions and 31 deletions

View File

@ -233,7 +233,7 @@ class AES_CMAC: public QCA::MessageAuthenticationCode
public:
AES_CMAC(const QCA::SymmetricKey &key = QCA::SymmetricKey(),
const QString &provider = QString()):
QCA::MessageAuthenticationCode(QCA::MessageAuthenticationCode::withAlgorithm("cmac", "aes"), key, provider)
QCA::MessageAuthenticationCode( "cmac(aes)", key, provider)
{}
};

View File

@ -737,15 +737,6 @@ namespace QCA
*/
void setup(const SymmetricKey &key);
/**
* Construct the name of the algorithm
*
* You can use this to build a standard name string.
* You probably only need this method if you are
* creating a new subclass.
*/
static QString withAlgorithm(const QString &macType, const QString &algType);
private:
class Private;
Private *d;

View File

@ -338,11 +338,6 @@ void MessageAuthenticationCode::setup(const SymmetricKey &key)
clear();
}
QString MessageAuthenticationCode::withAlgorithm(const QString &macType, const QString &algType)
{
return (macType + '(' + algType + ')');
}
//----------------------------------------------------------------------------
// Key Derivation Function
//----------------------------------------------------------------------------