lib/protocol: Ensure correct blocksize on enc. fileinfo (ref #7861) (#7870)

2021-08-04 23:12:01 +02:00
parent e56e8b7aa1
commit 50aacdf1f0
3 changed files with 19 additions and 14 deletions
@@ -317,18 +317,20 @@ func encryptFileInfo(fi FileInfo, folderKey *[keySize]byte) FileInfo {
 		typ = FileInfoTypeDirectory
 	}
 	enc := FileInfo{
-		Name:         encryptName(fi.Name, folderKey),
-		Type:         typ,
-		Size:         offset, // new total file size
-		Permissions:  0644,
-		ModifiedS:    1234567890, // Sat Feb 14 00:31:30 CET 2009
-		Deleted:      fi.Deleted,
-		RawInvalid:   fi.IsInvalid(),
-		Version:      version,
-		Sequence:     fi.Sequence,
-		RawBlockSize: fi.RawBlockSize + blockOverhead,
-		Blocks:       blocks,
-		Encrypted:    encryptedFI,
+		Name:        encryptName(fi.Name, folderKey),
+		Type:        typ,
+		Permissions: 0644,
+		ModifiedS:   1234567890, // Sat Feb 14 00:31:30 CET 2009
+		Deleted:     fi.Deleted,
+		RawInvalid:  fi.IsInvalid(),
+		Version:     version,
+		Sequence:    fi.Sequence,
+		Encrypted:   encryptedFI,
+	}
+	if typ == FileInfoTypeFile {
+		enc.Size = offset // new total file size
+		enc.Blocks = blocks
+		enc.RawBlockSize = fi.BlockSize() + blockOverhead
 	}

 	return enc