mirror of
https://github.com/rclone/rclone.git
synced 2024-11-25 09:41:44 +08:00
crypt: obey --ignore-checksum
Before this change the crypt backend would calculate and check upload checksums regardless of the setting of --ignore-checksum.
This commit is contained in:
parent
81ce5e4961
commit
ffeefe8a56
|
@ -396,6 +396,8 @@ type putFn func(ctx context.Context, in io.Reader, src fs.ObjectInfo, options ..
|
||||||
|
|
||||||
// put implements Put or PutStream
|
// put implements Put or PutStream
|
||||||
func (f *Fs) put(ctx context.Context, in io.Reader, src fs.ObjectInfo, options []fs.OpenOption, put putFn) (fs.Object, error) {
|
func (f *Fs) put(ctx context.Context, in io.Reader, src fs.ObjectInfo, options []fs.OpenOption, put putFn) (fs.Object, error) {
|
||||||
|
ci := fs.GetConfig(ctx)
|
||||||
|
|
||||||
if f.opt.NoDataEncryption {
|
if f.opt.NoDataEncryption {
|
||||||
o, err := put(ctx, in, f.newObjectInfo(src, nonce{}), options...)
|
o, err := put(ctx, in, f.newObjectInfo(src, nonce{}), options...)
|
||||||
if err == nil && o != nil {
|
if err == nil && o != nil {
|
||||||
|
@ -413,6 +415,9 @@ func (f *Fs) put(ctx context.Context, in io.Reader, src fs.ObjectInfo, options [
|
||||||
// Find a hash the destination supports to compute a hash of
|
// Find a hash the destination supports to compute a hash of
|
||||||
// the encrypted data
|
// the encrypted data
|
||||||
ht := f.Fs.Hashes().GetOne()
|
ht := f.Fs.Hashes().GetOne()
|
||||||
|
if ci.IgnoreChecksum {
|
||||||
|
ht = hash.None
|
||||||
|
}
|
||||||
var hasher *hash.MultiHasher
|
var hasher *hash.MultiHasher
|
||||||
if ht != hash.None {
|
if ht != hash.None {
|
||||||
hasher, err = hash.NewMultiHasherTypes(hash.NewHashSet(ht))
|
hasher, err = hash.NewMultiHasherTypes(hash.NewHashSet(ht))
|
||||||
|
|
Loading…
Reference in New Issue
Block a user