From 0b3a974be7bb9cd1d25ee9c2b861f38ea721c66b Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Wed, 27 Sep 2017 14:26:25 -0400 Subject: [PATCH] rgw: include SSE-KMS headers in encrypted upload response Fixes: http://tracker.ceph.com/issues/21576 Signed-off-by: Casey Bodley (cherry picked from commit a5b3db7acb4150d9d27ba42f72658e418dd444c0) --- src/rgw/rgw_crypt.cc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/rgw/rgw_crypt.cc b/src/rgw/rgw_crypt.cc index 4d5b00ff6baa..b467d578cf18 100644 --- a/src/rgw/rgw_crypt.cc +++ b/src/rgw/rgw_crypt.cc @@ -1108,6 +1108,9 @@ int rgw_s3_prepare_encrypt(struct req_state* s, *block_crypt = std::move(aes); } actual_key.replace(0, actual_key.length(), actual_key.length(), '\000'); + + crypt_http_responses["x-amz-server-side-encryption"] = "aws:kms"; + crypt_http_responses["x-amz-server-side-encryption-aws-kms-key-id"] = key_id.to_string(); return 0; } -- 2.47.3