@@ -36,6 +36,7 @@ class Config(object):

     human_readable_sizes = False

     extra_headers = SortedDict(ignore_case = True)

     force = False

+    server_side_encryption = False

     enable = None

     get_continue = False

     put_continue = False

@@ -403,7 +403,11 @@ class S3(object):

         headers = SortedDict(ignore_case = True)

         if extra_headers:

             headers.update(extra_headers)

-

+        

+        ## Set server side encryption

+        if self.config.server_side_encryption:

+            headers["x-amz-server-side-encryption"] = "AES256"

+    

         ## MIME-type handling

         content_type = self.config.mime_type

         content_encoding = None

@@ -499,6 +503,11 @@ class S3(object):

             headers["x-amz-storage-class"] = "REDUCED_REDUNDANCY"

         # if extra_headers:

         #   headers.update(extra_headers)

+        

+        ## Set server side encryption

+        if self.config.server_side_encryption:

+            headers["x-amz-server-side-encryption"] = "AES256" 

+        

         request = self.create_request("OBJECT_PUT", uri = dst_uri, headers = headers)

         response = self.send_request(request)

         return response

@@ -626,6 +626,11 @@ def cmd_info(args):

                 except KeyError:

                     pass

                 output(u"   MD5 sum:   %s" % md5)

+                if 'x-amz-server-side-encryption' in info['headers']:

+                    output(u"   SSE:       %s" % info['headers']['x-amz-server-side-encryption'])

+                else:

+                    output(u"   SSE:       NONE")		

+

             else:

                 info = s3.bucket_info(uri)

                 output(u"%s (bucket):" % uri.uri())

@@ -1928,6 +1933,8 @@ def main():

     optparser.add_option(      "--add-header", dest="add_header", action="append", metavar="NAME:VALUE", help="Add a given HTTP header to the upload request. Can be used multiple times. For instance set 'Expires' or 'Cache-Control' headers (or both) using this options if you like.")

+    optparser.add_option(      "--server-side-encryption", dest="server_side_encryption", action="store_true", help="Specifies that server-side encryption will be used when putting objects.")

+

     optparser.add_option(      "--encoding", dest="encoding", metavar="ENCODING", help="Override autodetected terminal and filesystem encoding (character set). Autodetected: %s" % preferred_encoding)

     optparser.add_option(      "--disable-content-encoding", dest="add_content_encoding", action="store_false", help="Don't include a Content-encoding header to the the uploaded objects")

     optparser.add_option(      "--add-encoding-exts", dest="add_encoding_exts", metavar="EXTENSIONs", help="Add encoding to these comma delimited extensions i.e. (css,js,html) when uploading to S3 )")