[arrow] branch master updated: PARQUET-1398: [C++] move iv_prefix to Algorithms

[we...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

wesm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git


The following commit(s) were added to refs/heads/master by this push:
     new 3ca916d  PARQUET-1398: [C++] move iv_prefix to Algorithms
3ca916d is described below

commit 3ca916dfedde6d844bde58721e6a9c69508beb75
Author: Gidon Gershinsky <gi...@il.ibm.com>
AuthorDate: Mon Sep 17 18:52:50 2018 -0400

    PARQUET-1398: [C++] move iv_prefix to Algorithms
    
    this thrift update is already merged in parquet-format
    
    Author: Gidon Gershinsky <gi...@il.ibm.com>
    
    Closes #2574 from ggershinsky/p1398-iv_prefix-split and squashes the following commits:
    
    fc822cf9f <Gidon Gershinsky> move iv_prefix to Algorithms
---
 cpp/src/parquet/parquet.thrift | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/cpp/src/parquet/parquet.thrift b/cpp/src/parquet/parquet.thrift
index 2a4efb9..f7708be 100644
--- a/cpp/src/parquet/parquet.thrift
+++ b/cpp/src/parquet/parquet.thrift
@@ -891,11 +891,21 @@ struct FileMetaData {
 struct AesGcmV1 {
   /** Retrieval metadata of AAD used for encryption of pages and structures **/
   1: optional binary aad_metadata
+
+  /** If file IVs are comprised of a fixed part, and variable parts
+   *  (e.g. counter), keep the fixed part here **/
+  2: optional binary iv_prefix
 }
 
 struct AesGcmCtrV1 {
   /** Retrieval metadata of AAD used for encryption of structures **/
   1: optional binary aad_metadata
+
+  /** If file IVs are comprised of a fixed part, and variable parts
+   *  (e.g. counter), keep the fixed part here **/
+  2: optional binary gcm_iv_prefix
+
+  3: optional binary ctr_iv_prefix
 }
 
 union EncryptionAlgorithm {
@@ -915,9 +925,4 @@ struct FileCryptoMetaData {
 
   /** Offset of Parquet footer (encrypted, or plaintext) **/
   4: required i64 footer_offset
-
-  /** If file IVs are comprised of a fixed part,
-   *  and variable parts (random or counter), keep the fixed
-   *  part here **/
-  5: optional binary iv_prefix
 }