Update OCB ref to RFC, and add new test vectors

2 files changed, 100 insertions, 2 deletions

diff --git a/src/lib/modes/aead/ocb/ocb.h b/src/lib/modes/aead/ocb/ocb.h
index cac87ddb6..174812ee3 100644
--- a/src/lib/modes/aead/ocb/ocb.h
+++ b/src/lib/modes/aead/ocb/ocb.h
@@ -20,8 +20,8 @@ class L_computer;
 * OCB Mode (base class for OCB_Encryption and OCB_Decryption). Note
 * that OCB is patented, but is freely licensed in some circumstances.
 *
-* @see "The OCB Authenticated-Encryption Algorithm" internet draft
-        http://tools.ietf.org/html/draft-irtf-cfrg-ocb-03
+* @see "The OCB Authenticated-Encryption Algorithm" RFC 7253
+*      https://tools.ietf.org/html/rfc7253
 * @see Free Licenses http://www.cs.ucdavis.edu/~rogaway/ocb/license.htm
 * @see OCB home page http://www.cs.ucdavis.edu/~rogaway/ocb
 */
diff --git a/src/tests/data/aead/ocb.vec b/src/tests/data/aead/ocb.vec
index b8220d6bf..f0fbb3646 100644
--- a/src/tests/data/aead/ocb.vec
+++ b/src/tests/data/aead/ocb.vec
@@ -1,4 +1,102 @@
 [AES-128/OCB]
+
+# From RFC 7253
+Key = 000102030405060708090A0B0C0D0E0F
+Nonce = BBAA99887766554433221100
+In = 
+Out = 785407BFFFC8AD9EDCC5520AC9111EE6
+
+Key = 000102030405060708090A0B0C0D0E0F
+Nonce = BBAA99887766554433221101
+AD = 0001020304050607
+In = 0001020304050607
+Out = 6820B3657B6F615A5725BDA0D3B4EB3A257C9AF1F8F03009
+
+Key = 000102030405060708090A0B0C0D0E0F
+Nonce = BBAA99887766554433221102
+AD = 0001020304050607
+In =
+Out = 81017F8203F081277152FADE694A0A00
+
+Key = 000102030405060708090A0B0C0D0E0F
+Nonce = BBAA99887766554433221103
+AD =
+In = 0001020304050607
+Out = 45DD69F8F5AAE72414054CD1F35D82760B2CD00D2F99BFA9
+
+Key = 000102030405060708090A0B0C0D0E0F
+Nonce = BBAA99887766554433221104
+AD = 000102030405060708090A0B0C0D0E0F
+In = 000102030405060708090A0B0C0D0E0F
+Out = 571D535B60B277188BE5147170A9A22C3AD7A4FF3835B8C5701C1CCEC8FC3358
+
+Key = 000102030405060708090A0B0C0D0E0F
+Nonce = BBAA99887766554433221105
+AD = 000102030405060708090A0B0C0D0E0F
+In =
+Out = 8CF761B6902EF764462AD86498CA6B97
+
+Key = 000102030405060708090A0B0C0D0E0F
+Nonce = BBAA99887766554433221106
+AD =
+In = 000102030405060708090A0B0C0D0E0F
+Out = 5CE88EC2E0692706A915C00AEB8B2396F40E1C743F52436BDF06D8FA1ECA343D
+
+Key = 000102030405060708090A0B0C0D0E0F
+Nonce = BBAA99887766554433221107
+AD = 000102030405060708090A0B0C0D0E0F1011121314151617
+In = 000102030405060708090A0B0C0D0E0F1011121314151617
+Out = 1CA2207308C87C010756104D8840CE1952F09673A448A122C92C62241051F57356D7F3C90BB0E07F
+
+Key = 000102030405060708090A0B0C0D0E0F
+Nonce = BBAA99887766554433221108
+AD = 000102030405060708090A0B0C0D0E0F1011121314151617
+In =
+Out = 6DC225A071FC1B9F7C69F93B0F1E10DE
+
+Key = 000102030405060708090A0B0C0D0E0F
+Nonce = BBAA99887766554433221109
+AD =
+In = 000102030405060708090A0B0C0D0E0F1011121314151617
+Out = 221BD0DE7FA6FE993ECCD769460A0AF2D6CDED0C395B1C3CE725F32494B9F914D85C0B1EB38357FF
+
+Key = 000102030405060708090A0B0C0D0E0F
+Nonce = BBAA9988776655443322110A
+AD = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F
+In = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F
+Out = BD6F6C496201C69296C11EFD138A467ABD3C707924B964DEAFFC40319AF5A48540FBBA186C5553C68AD9F592A79A4240
+
+Key = 000102030405060708090A0B0C0D0E0F
+Nonce = BBAA9988776655443322110B
+AD = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F
+In =
+Out = FE80690BEE8A485D11F32965BC9D2A32
+
+Key = 000102030405060708090A0B0C0D0E0F
+Nonce = BBAA9988776655443322110C
+AD =
+In = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F
+Out = 2942BFC773BDA23CABC6ACFD9BFD5835BD300F0973792EF46040C53F1432BCDFB5E1DDE3BC18A5F840B52E653444D5DF
+
+Key = 000102030405060708090A0B0C0D0E0F
+Nonce = BBAA9988776655443322110D
+AD = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F2021222324252627
+In = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F2021222324252627
+Out = D5CA91748410C1751FF8A2F618255B68A0A12E093FF454606E59F9C1D0DDC54B65E8628E568BAD7AED07BA06A4A69483A7035490C5769E60
+
+Key = 000102030405060708090A0B0C0D0E0F
+Nonce = BBAA9988776655443322110E
+AD = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F2021222324252627
+In =
+Out = C5CD9D1850C141E358649994EE701B68
+
+Key = 000102030405060708090A0B0C0D0E0F
+Nonce = BBAA9988776655443322110F
+AD =
+In = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F2021222324252627
+Out = 4412923493C57D5DE0D700F753CCE0D1D2D95060122E9F15A5DDBFC5787E50B5CC55EE507BCB084E479AD363AC366B95A98CA5F3000B1479
+
+
 # From CFRG i-d 03
 Key = 000102030405060708090A0B0C0D0E0F
 Nonce = 000102030405060708090A0B