]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw/kms/vault - define attribute to store encryption context
authorMarcus Watts <mwatts@redhat.com>
Mon, 7 Dec 2020 22:53:05 +0000 (17:53 -0500)
committerMarcus Watts <mwatts@redhat.com>
Fri, 5 Mar 2021 22:35:27 +0000 (17:35 -0500)
For rgw sse:kms use, the aws s3 standard provides an attribute
to store the base-64 encoded canonical json "encryption context".
This should be used to vary the per-object keys used for the
actual object encryption.

Fixes: http://tracker.ceph.com/issues/48746
Signed-off-by: Marcus Watts <mwatts@redhat.com>
src/rgw/rgw_common.h

index 81308f655cc6ecfaab0c264774401081df90eae6..ae7083710bc6634f77c9d5af4892c6f948a43193 100644 (file)
@@ -140,6 +140,7 @@ using ceph::crypto::MD5;
 #define RGW_ATTR_CRYPT_KEYMD5   RGW_ATTR_CRYPT_PREFIX "keymd5"
 #define RGW_ATTR_CRYPT_KEYID    RGW_ATTR_CRYPT_PREFIX "keyid"
 #define RGW_ATTR_CRYPT_KEYSEL   RGW_ATTR_CRYPT_PREFIX "keysel"
+#define RGW_ATTR_CRYPT_CONTEXT  RGW_ATTR_CRYPT_PREFIX "context"
 
 
 #define RGW_FORMAT_PLAIN        0