tweaks/fixes for 5.6

git-svn-id: svn://svn.code.sf.net/p/cryptopp/code/trunk/c5@435 57ff6487-cd31-0410-9ec3-f628ee90f5f0

1 files changed, 5 insertions, 5 deletions

diff --git a/ccm.h b/ccm.h
index aa39dc0..e84b45c 100644
--- a/ccm.h
+++ b/ccm.h
@@ -73,7 +73,7 @@ protected:
 };

 

 //! .

-template <class T_BlockCipher, int T_DefaultDigestBitSize, bool T_IsEncryption>

+template <class T_BlockCipher, int T_DefaultDigestSize, bool T_IsEncryption>

 class CCM_Final : public CCM_Base

 {

 public:

@@ -84,16 +84,16 @@ public:
 

 private:

 	BlockCipher & AccessBlockCipher() {return m_cipher;}

-	int DefaultDigestSize() const {return T_DefaultDigestBitSize/8;}

+	int DefaultDigestSize() const {return T_DefaultDigestSize;}

 	typename T_BlockCipher::Encryption m_cipher;

 };

 

 /// <a href="http://www.cryptolounge.org/wiki/CCM">CCM</a>

-template <class T_BlockCipher, int T_DefaultDigestBitSize = 128>

+template <class T_BlockCipher, int T_DefaultDigestSize = 16>

 struct CCM : public AuthenticatedSymmetricCipherDocumentation

 {

-	typedef CCM_Final<T_BlockCipher, T_DefaultDigestBitSize, true> Encryption;

-	typedef CCM_Final<T_BlockCipher, T_DefaultDigestBitSize, false> Decryption;

+	typedef CCM_Final<T_BlockCipher, T_DefaultDigestSize, true> Encryption;

+	typedef CCM_Final<T_BlockCipher, T_DefaultDigestSize, false> Decryption;

 };

 

 NAMESPACE_END