@@ -29,6 +29,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

     skip_existing = False

@@ -410,7 +410,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

@@ -483,6 +487,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

@@ -1751,6 +1751,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(      "--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 )")

     optparser.add_option(      "--verbatim", dest="urlencoding_mode", action="store_const", const="verbatim", help="Use the S3 name as given on the command line. No pre-processing, encoding, etc. Use with caution!")

@@ -325,12 +325,14 @@ Follow symbolic links as if they are regular files

 .TP

 \fB\-\-cache\-file\fR=FILE

 Cache FILE containing local source MD5 values

-

+.TP

+\fB\-\-server\-side\-encryption\fR

+Specifies that server-side encryption will be used when putting objects.

 .SH EXAMPLES

 One of the most powerful commands of \fIs3cmd\fR is \fBs3cmd sync\fR used for 

-synchronising complete directory trees to or from remote S3 storage. To some extent 

-\fBs3cmd put\fR and \fBs3cmd get\fR share a similar behaviour with \fBsync\fR.

+synchronizing complete directory trees to or from remote S3 storage. To some extent 

+\fBs3cmd put\fR and \fBs3cmd get\fR share a similar behavior with \fBsync\fR.

 .PP

 Basic usage common in backup scenarios is as simple as:

 .nf