commit dfa1c030e941cba4e66b362854d84b19298353c9
author Shawn Willden <swillden@google.com> Sat Feb 07 00:39:01 2015 -0700
committer Shawn Willden <swillden@google.com> Wed Mar 04 15:43:12 2015 -0700
tree 66e0aa89b59a14b9e51172027e941b28ce766134
parent 3b702e21e44df2dac32809a36e6a9c41227d798f

Add AAD support to AES OCB.

Also add OCB test vectors.

Change-Id: I33074bfea142aab334916c4567f92a6645fcab9f

aes_operation.cpp

diff --git a/aes_operation.cpp b/aes_operation.cpp
index ceebf34..701e55f 100644
--- a/aes_operation.cpp
+++ b/aes_operation.cpp
@@ -117,11 +117,10 @@
     if (*error != KM_ERROR_OK)
         return NULL;
 
-    keymaster_blob_t additional_data = {0, 0};
-    key.authorizations().GetTagValue(TAG_ASSOCIATED_DATA, &additional_data);
+    bool caller_nonce = key.authorizations().GetTagValue(TAG_CALLER_NONCE);
 
     Operation* op = new AesOcbOperation(purpose(), key.key_data(), key.key_data_size(),
-                                        chunk_length, tag_length, additional_data);
+                                        chunk_length, tag_length, caller_nonce);
     if (!op)
         *error = KM_ERROR_MEMORY_ALLOCATION_FAILED;
     return op;