update to draft-01

TestVectors/vmac.txt

@@ -1,17 +1,59 @@
 AlgorithmType: MAC
-Name: VMAC(AES)-128
+Name: VMAC(AES)-64
-Source: Ted Krovetz's vmac.c Version: 0.01 (14 July 2006)
+Source: http://www.fastcrypto.org/vmac/draft-krovetz-vmac-01.txt
 Key: "abcdefghijklmnop"
-IV: "bcdefghi" r8 00
+IV: r8 00 "bcdefghi"
+Message: ""
+Digest: 2576BE1C56D8B81B
+Test: Verify
 Message: "abc"
-Digest: E5B10669E5B61668A11E3351CC1A7211
+Digest: 2D376CF5B1813CE5
 Test: Verify
 Message: r16 "abc"
-Digest: 12A64330F81D8B6407CE90667303FEE2
+Digest: E8421F61D573D298
 Test: Verify
 Message: r100 "abc"
-Digest: 10A63F27D4B292723739B4BB6F17A4C1
+Digest: 4492DF6C5CAC1BBE
 Test: Verify
 Message: r1000000 "abc"
-Digest: 22C65CC2CFE9BED72E485CA6EB8A48BE
+Digest: 09BA597DD7601113
 Test: Verify
+Message: r42 "abc" "ab"
+Digest: D638B73921F184DE
+Test: Verify
+Message: r170 "abc" "ab"
+Digest: 9DA310281E6FD0A0
+Test: Verify
+Message: "abc"
+Digest: 2D376CF5B1813CE0
+Test: NotVerify
+
+AlgorithmType: MAC
+Name: VMAC(AES)-128
+Source: http://www.fastcrypto.org/vmac/draft-krovetz-vmac-01.txt
+Key: "abcdefghijklmnop"
+IV: r8 00 "bcdefghi"
+Message: ""
+Digest: 472766C70F74ED23481D6D7DE4E80DAC
+Test: Verify
+Message: "abc"
+Digest: 4EE815A06A1D71EDD36FC75D51188A42
+Test: Verify
+Message: r16 "abc"
+Digest: 09F2C80C8E1007A0C12FAE19FE4504AE
+Test: Verify
+Message: r100 "abc"
+Digest: 66438817154850C61D8A412164803BCB
+Test: Verify
+Message: r1000000 "abc"
+Digest: 2B6B02288FFC461B75485DE893C629DC
+Test: Verify
+Message: r42 "abc" "ab"
+Digest: F7E95FE3DA8DB9E6BB973E65D0B4CEA5
+Test: Verify
+Message: r170 "abc" "ab"
+Digest: BF53B8D2D70C05A85880C2E21CAF1299
+Test: Verify
+Message: "abc"
+Digest: 4EE815A06A1D71EDD36FC75D51188A40
+Test: NotVerify

vmac.h

@@ -14,19 +14,21 @@ NAMESPACE_BEGIN(CryptoPP)
 #define CRYPTOPP_BLOCK_6(n, t, s) t* m_##n() {return (t *)(m_aggregate+SS5());} size_t SS6() {return SS5()+sizeof(t)*(s);} size_t m_##n##Size() {return (s);}
 #define CRYPTOPP_BLOCK_7(n, t, s) t* m_##n() {return (t *)(m_aggregate+SS6());} size_t SS7() {return SS6()+sizeof(t)*(s);} size_t m_##n##Size() {return (s);}
 #define CRYPTOPP_BLOCK_8(n, t, s) t* m_##n() {return (t *)(m_aggregate+SS7());} size_t SS8() {return SS7()+sizeof(t)*(s);} size_t m_##n##Size() {return (s);}
-#define CRYPTOPP_BLOCKS_END(i) size_t SST() {return SS##i();} void AllocateBlocks() {m_aggregate.New(SST());} SecByteBlock m_aggregate;
+#define CRYPTOPP_BLOCKS_END(i) size_t SST() {return SS##i();} void AllocateBlocks() {m_aggregate.New(SST());} AlignedSecByteBlock m_aggregate;
 
 /// .
-class VMAC_Base : public IteratedHash<word64, LittleEndian, 16, MessageAuthenticationCode>
+class VMAC_Base : public IteratedHashBase<word64, MessageAuthenticationCode>
 {
 public:
 	std::string AlgorithmName() const {return std::string("VMAC(") + GetCipher().AlgorithmName() + ")-" + IntToString(DigestSize()*8);}
 	unsigned int IVSize() const {return GetCipher().BlockSize();}
 	void Resynchronize(const byte *IV);
-	void GetNextIV(byte *IV);
+	void GetNextIV(RandomNumberGenerator &rng, byte *IV);
 	unsigned int DigestSize() const {return m_is128 ? 16 : 8;};
 	void UncheckedSetKey(const byte *userKey, unsigned int keylength, const NameValuePairs &params);
 	void TruncatedFinal(byte *mac, size_t size);
+	unsigned int BlockSize() const {return m_L1KeyLength;}
+	ByteOrder GetByteOrder() const {return LITTLE_ENDIAN_ORDER;}
 
 protected:
 	virtual BlockCipher & AccessCipher() =0;
@@ -34,21 +36,27 @@ protected:
 	const BlockCipher & GetCipher() const {return const_cast<VMAC_Base *>(this)->AccessCipher();}
 	void HashEndianCorrectedBlock(const word64 *data);
 	size_t HashMultipleBlocks(const word64 *input, size_t length);
-	void Init();
+	void Init() {}
 	word64* StateBuf() {return NULL;}
+	word64* DataBuf() {return (word64 *)m_data();}
 
-	CRYPTOPP_BLOCK_1(polyKey, word64, 2)
+	void VHASH_Update_SSE2(const word64 *data, size_t blocksRemainingInWord64, int tagPart);
-	CRYPTOPP_BLOCK_2(polyAccum, word64, 2)
+#if !(defined(_MSC_VER) && _MSC_VER < 1300)		// can't use function template here with VC6
-	CRYPTOPP_BLOCK_3(ipKey, word64, 2)
+	template <bool T_128BitTag>
-	CRYPTOPP_BLOCK_4(nhAccum, word64, 2*(m_is128+1))
+#endif
-	CRYPTOPP_BLOCK_5(nhKey, word64, m_L1KeyLength/sizeof(word64) + 2*m_is128)
+	void VHASH_Update_Template(const word64 *data, size_t blockRemainingInWord128);
-	CRYPTOPP_BLOCK_6(nonce, byte, IVSize())
+	void VHASH_Update(const word64 *data, size_t blocksRemainingInWord128);
-	CRYPTOPP_BLOCK_7(pad, byte, IVSize())
-	CRYPTOPP_BLOCKS_END(7)
 
+	CRYPTOPP_BLOCK_1(polyState, word64, 4*(m_is128+1))
+	CRYPTOPP_BLOCK_2(nhKey, word64, m_L1KeyLength/sizeof(word64) + 2*m_is128)
+	CRYPTOPP_BLOCK_3(data, byte, m_L1KeyLength)
+	CRYPTOPP_BLOCK_4(l3Key, word64, 2*(m_is128+1))
+	CRYPTOPP_BLOCK_5(nonce, byte, IVSize())
+	CRYPTOPP_BLOCK_6(pad, byte, IVSize())
+	CRYPTOPP_BLOCKS_END(6)
+
+	bool m_is128, m_padCached, m_isFirstBlock;
 	int m_L1KeyLength;
-	size_t m_nhCount;
-	bool m_is128, m_padCached;
 };
 
 /// <a href="http://www.cryptolounge.org/wiki/VMAC">VMAC</a>