1 files changed, 47 insertions, 17 deletions

diff --git a/vendor/github.com/aws/aws-sdk-go/service/s3/sse.go b/vendor/github.com/aws/aws-sdk-go/service/s3/sse.go
index 8010c4f..b71c835 100644
--- a/vendor/github.com/aws/aws-sdk-go/service/s3/sse.go
+++ b/vendor/github.com/aws/aws-sdk-go/service/s3/sse.go
@@ -3,6 +3,7 @@ package s3
 import (
         "crypto/md5"
         "encoding/base64"
+        "net/http"
 
         "github.com/aws/aws-sdk-go/aws/awserr"
         "github.com/aws/aws-sdk-go/aws/request"
@@ -30,25 +31,54 @@ func validateSSERequiresSSL(r *request.Request) {
         }
 }
 
-func computeSSEKeys(r *request.Request) {
-        headers := []string{
-                "x-amz-server-side-encryption-customer-key",
-                "x-amz-copy-source-server-side-encryption-customer-key",
+const (
+        sseKeyHeader    = "x-amz-server-side-encryption-customer-key"
+        sseKeyMD5Header = sseKeyHeader + "-md5"
+)
+
+func computeSSEKeyMD5(r *request.Request) {
+        var key string
+        if g, ok := r.Params.(sseCustomerKeyGetter); ok {
+                key = g.getSSECustomerKey()
+        }
+
+        computeKeyMD5(sseKeyHeader, sseKeyMD5Header, key, r.HTTPRequest)
+}
+
+const (
+        copySrcSSEKeyHeader    = "x-amz-copy-source-server-side-encryption-customer-key"
+        copySrcSSEKeyMD5Header = copySrcSSEKeyHeader + "-md5"
+)
+
+func computeCopySourceSSEKeyMD5(r *request.Request) {
+        var key string
+        if g, ok := r.Params.(copySourceSSECustomerKeyGetter); ok {
+                key = g.getCopySourceSSECustomerKey()
         }
 
-        for _, h := range headers {
-                md5h := h + "-md5"
-                if key := r.HTTPRequest.Header.Get(h); key != "" {
-                        // Base64-encode the value
-                        b64v := base64.StdEncoding.EncodeToString([]byte(key))
-                        r.HTTPRequest.Header.Set(h, b64v)
-
-                        // Add MD5 if it wasn't computed
-                        if r.HTTPRequest.Header.Get(md5h) == "" {
-                                sum := md5.Sum([]byte(key))
-                                b64sum := base64.StdEncoding.EncodeToString(sum[:])
-                                r.HTTPRequest.Header.Set(md5h, b64sum)
-                        }
+        computeKeyMD5(copySrcSSEKeyHeader, copySrcSSEKeyMD5Header, key, r.HTTPRequest)
+}
+
+func computeKeyMD5(keyHeader, keyMD5Header, key string, r *http.Request) {
+        if len(key) == 0 {
+                // Backwards compatiablity where user just set the header value instead
+                // of using the API parameter, or setting the header value for an
+                // operation without the parameters modeled.
+                key = r.Header.Get(keyHeader)
+                if len(key) == 0 {
+                        return
                 }
+
+                // In backwards compatiable, the header's value is not base64 encoded,
+                // and needs to be encoded and updated by the SDK's customizations.
+                b64Key := base64.StdEncoding.EncodeToString([]byte(key))
+                r.Header.Set(keyHeader, b64Key)
+        }
+
+        // Only update Key's MD5 if not already set.
+        if len(r.Header.Get(keyMD5Header)) == 0 {
+                sum := md5.Sum([]byte(key))
+                keyMD5 := base64.StdEncoding.EncodeToString(sum[:])
+                r.Header.Set(keyMD5Header, keyMD5)
         }
 }