Merge pull request #728 from smira/openpgp-leveldb-update

Update vendored deps, including AWS SDK, openpgp, ftp, ...
aptly-dev · Apr 10, 2018 · 5f96abc · 5f96abc
2 parents cef4fef + 0e6ee35
commit 5f96abc
Show file tree

Hide file tree

Showing 1,497 changed files with 482,105 additions and 99,418 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/s3/server_test.go b/s3/server_test.go
@@ -3,6 +3,7 @@ package s3
 import (
 	"bytes"
 	"crypto/md5"
+	"encoding/base64"
 	"encoding/hex"
 	"encoding/xml"
 	"fmt"
@@ -634,7 +635,7 @@ func (objr objectResource) put(a *action) interface{} {
 	var expectHash []byte
 	if c := a.req.Header.Get("Content-MD5"); c != "" {
 		var err error
-		expectHash, err = hex.DecodeString(c)
+		expectHash, err = base64.StdEncoding.DecodeString(c)
 		if err != nil || len(expectHash) != md5.Size {
 			fatalError(400, "InvalidDigest", "The Content-MD5 you specified was invalid")
 		}

diff --git a/vendor/github.com/aws/aws-sdk-go/.travis.yml b/vendor/github.com/aws/aws-sdk-go/.travis.yml
diff --git a/vendor/github.com/aws/aws-sdk-go/CHANGELOG.md b/vendor/github.com/aws/aws-sdk-go/CHANGELOG.md
diff --git a/vendor/github.com/aws/aws-sdk-go/CODE_OF_CONDUCT.md b/vendor/github.com/aws/aws-sdk-go/CODE_OF_CONDUCT.md
diff --git a/vendor/github.com/aws/aws-sdk-go/CONTRIBUTING.md b/vendor/github.com/aws/aws-sdk-go/CONTRIBUTING.md
diff --git a/vendor/github.com/aws/aws-sdk-go/README.md b/vendor/github.com/aws/aws-sdk-go/README.md