rgw: include SSE-KMS headers in encrypted upload response

Fixes: http://tracker.ceph.com/issues/21576
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit a5b3db7acb4150d9d27ba42f72658e418dd444c0)

diff --git a/src/rgw/rgw_crypt.cc b/src/rgw/rgw_crypt.cc
index 4d5b00ff6baafd0edce91996d6e64c49bed9530c..b467d578cf180798d49cacf59fdf097dee1bda95 100644 (file)
--- 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;
     }