ソースを参照

lib: Correctly handle encrypted trailer size (fixes #8556) (#8563)

Simon Frei 2 年 前
コミット
da72df6ffc

+ 1 - 0
lib/model/folder_sendrecv.go

@@ -1251,6 +1251,7 @@ func (f *sendReceiveFolder) shortcutFile(file protocol.FileInfo, dbUpdateChan ch
 			}
 			defer fd.Close()
 			trailerSize, err := writeEncryptionTrailer(file, fd)
+			file.EncryptionTrailerSize = int(trailerSize)
 			if err != nil {
 				return err
 			}

+ 4 - 0
lib/model/indexhandler.go

@@ -357,6 +357,10 @@ func prepareFileInfoForIndex(f protocol.FileInfo) protocol.FileInfo {
 	if f.IsReceiveOnlyChanged() {
 		f.Version = protocol.Vector{}
 	}
+	// The trailer with the encrypted fileinfo is device local, don't send info
+	// about that to remotes
+	f.Size -= int64(f.EncryptionTrailerSize)
+	f.EncryptionTrailerSize = 0
 	// never sent externally
 	f.LocalFlags = 0
 	f.VersionHash = nil

+ 234 - 200
lib/protocol/bep.pb.go

@@ -517,9 +517,12 @@ type FileInfo struct {
 	// The time when the inode was last changed (i.e., permissions, xattrs
 	// etc changed). This is host-local, not sent over the wire.
 	InodeChangeNs int64 `protobuf:"varint,1002,opt,name=inode_change_ns,json=inodeChangeNs,proto3" json:"inodeChangeNs" xml:"inodeChangeNs"`
-	Deleted       bool  `protobuf:"varint,6,opt,name=deleted,proto3" json:"deleted" xml:"deleted"`
-	RawInvalid    bool  `protobuf:"varint,7,opt,name=invalid,proto3" json:"invalid" xml:"invalid"`
-	NoPermissions bool  `protobuf:"varint,8,opt,name=no_permissions,json=noPermissions,proto3" json:"noPermissions" xml:"noPermissions"`
+	// The size of the data appended to the encrypted file on disk. This is
+	// host-local, not sent over the wire.
+	EncryptionTrailerSize int  `protobuf:"varint,1003,opt,name=encryption_trailer_size,json=encryptionTrailerSize,proto3,casttype=int" json:"encryptionTrailerSize" xml:"encryptionTrailerSize"`
+	Deleted               bool `protobuf:"varint,6,opt,name=deleted,proto3" json:"deleted" xml:"deleted"`
+	RawInvalid            bool `protobuf:"varint,7,opt,name=invalid,proto3" json:"invalid" xml:"invalid"`
+	NoPermissions         bool `protobuf:"varint,8,opt,name=no_permissions,json=noPermissions,proto3" json:"noPermissions" xml:"noPermissions"`
 }
 
 func (m *FileInfo) Reset()      { *m = FileInfo{} }
@@ -1139,203 +1142,205 @@ func init() {
 func init() { proto.RegisterFile("lib/protocol/bep.proto", fileDescriptor_311ef540e10d9705) }
 
 var fileDescriptor_311ef540e10d9705 = []byte{
-	// 3122 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x5a, 0x4f, 0x6c, 0x1b, 0xc7,
-	0xb9, 0x17, 0xc5, 0x3f, 0xa2, 0x46, 0xb2, 0x4d, 0x8d, 0xff, 0x31, 0xb4, 0xad, 0xe5, 0x9b, 0x38,
-	0xef, 0x29, 0xca, 0x8b, 0x9d, 0x28, 0x7f, 0x5e, 0x5e, 0x9c, 0xe7, 0x40, 0x14, 0x29, 0x99, 0xb1,
-	0x4c, 0x2a, 0x43, 0xd9, 0x8e, 0x8d, 0x57, 0x10, 0x2b, 0xee, 0x88, 0x5a, 0x98, 0xdc, 0x65, 0x77,
-	0x49, 0xfd, 0x09, 0x7a, 0x69, 0x03, 0x14, 0x81, 0x50, 0x14, 0x45, 0x4e, 0x45, 0x51, 0xa1, 0x41,
-	0x2f, 0xbd, 0x15, 0xe8, 0xa1, 0x97, 0x9c, 0x7a, 0xf4, 0xd1, 0x08, 0x50, 0xa0, 0xe8, 0x61, 0x81,
-	0xd8, 0x97, 0x96, 0x47, 0x1e, 0x7b, 0x2a, 0xe6, 0x9b, 0xd9, 0xd9, 0x59, 0xc9, 0x4a, 0xe5, 0xe4,
-	0xd0, 0x93, 0xf9, 0xfd, 0xbe, 0xdf, 0xf7, 0xed, 0xec, 0xcc, 0xf7, 0x6f, 0x56, 0x46, 0x17, 0x3a,
-	0xf6, 0xc6, 0xf5, 0x9e, 0xe7, 0xf6, 0xdd, 0x96, 0xdb, 0xb9, 0xbe, 0xc1, 0x7a, 0xd7, 0x40, 0xc0,
-	0xd9, 0x10, 0x2b, 0x4c, 0xb2, 0xdd, 0xbe, 0x00, 0x0b, 0x2f, 0x7b, 0xac, 0xe7, 0xfa, 0x82, 0xbe,
-	0x31, 0xd8, 0xbc, 0xde, 0x76, 0xdb, 0x2e, 0x08, 0xf0, 0x4b, 0x90, 0xc8, 0xd3, 0x04, 0x4a, 0xdf,
-	0x62, 0x9d, 0x8e, 0x8b, 0x97, 0xd0, 0x94, 0xc5, 0xb6, 0xed, 0x16, 0x6b, 0x3a, 0x66, 0x97, 0xe5,
-	0x13, 0xc5, 0xc4, 0xdc, 0x64, 0x89, 0x0c, 0x03, 0x03, 0x09, 0xb8, 0x66, 0x76, 0xd9, 0x28, 0x30,
-	0x72, 0xbb, 0xdd, 0xce, 0xfb, 0x24, 0x82, 0x08, 0xd5, 0xf4, 0xdc, 0x49, 0xab, 0x63, 0x33, 0xa7,
-	0x2f, 0x9c, 0x8c, 0x47, 0x4e, 0x04, 0x1c, 0x73, 0x12, 0x41, 0x84, 0x6a, 0x7a, 0x5c, 0x47, 0xa7,
-	0xa5, 0x93, 0x6d, 0xe6, 0xf9, 0xb6, 0xeb, 0xe4, 0x93, 0xe0, 0x67, 0x6e, 0x18, 0x18, 0xa7, 0x84,
-	0xe6, 0x9e, 0x50, 0x8c, 0x02, 0xe3, 0xac, 0xe6, 0x4a, 0xa2, 0x84, 0xc6, 0x59, 0xe4, 0x0f, 0x09,
-	0x94, 0xb9, 0xc5, 0x4c, 0x8b, 0x79, 0x78, 0x11, 0xa5, 0xfa, 0x7b, 0x3d, 0xf1, 0x7a, 0xa7, 0x17,
-	0xce, 0x5f, 0x0b, 0x37, 0xee, 0xda, 0x1d, 0xe6, 0xfb, 0x66, 0x9b, 0xad, 0xef, 0xf5, 0x58, 0xe9,
-	0xc2, 0x30, 0x30, 0x80, 0x36, 0x0a, 0x0c, 0x04, 0xfe, 0xb9, 0x40, 0x28, 0x60, 0xd8, 0x42, 0x53,
-	0x2d, 0xb7, 0xdb, 0xf3, 0x98, 0x0f, 0x6b, 0x1b, 0x07, 0x4f, 0x97, 0x8f, 0x78, 0x5a, 0x8a, 0x38,
-	0xa5, 0xab, 0xc3, 0xc0, 0xd0, 0x8d, 0x46, 0x81, 0x31, 0x23, 0xd6, 0x1d, 0x61, 0x84, 0xea, 0x0c,
-	0xf2, 0xff, 0xe8, 0xd4, 0x52, 0x67, 0xe0, 0xf7, 0x99, 0xb7, 0xe4, 0x3a, 0x9b, 0x76, 0x1b, 0xdf,
-	0x46, 0x13, 0x9b, 0x6e, 0xc7, 0x62, 0x9e, 0x9f, 0x4f, 0x14, 0x93, 0x73, 0x53, 0x0b, 0xb9, 0xe8,
-	0x91, 0xcb, 0xa0, 0x28, 0x19, 0x8f, 0x03, 0x63, 0x6c, 0x18, 0x18, 0x21, 0x71, 0x14, 0x18, 0xd3,
-	0xf0, 0x18, 0x21, 0x13, 0x1a, 0x2a, 0xc8, 0x57, 0x29, 0x94, 0x11, 0x46, 0xf8, 0x1a, 0x1a, 0xb7,
-	0x2d, 0x79, 0xdc, 0xb3, 0x4f, 0x03, 0x63, 0xbc, 0x5a, 0x1e, 0x06, 0xc6, 0xb8, 0x6d, 0x8d, 0x02,
-	0x23, 0x0b, 0xd6, 0xb6, 0x45, 0xbe, 0x78, 0x72, 0x75, 0xbc, 0x5a, 0xa6, 0xe3, 0xb6, 0x85, 0xaf,
-	0xa1, 0x74, 0xc7, 0xdc, 0x60, 0x1d, 0x79, 0xb8, 0xf9, 0x61, 0x60, 0x08, 0x60, 0x14, 0x18, 0x53,
-	0xc0, 0x07, 0x89, 0x50, 0x81, 0xe2, 0x1b, 0x68, 0xd2, 0x63, 0xa6, 0xd5, 0x74, 0x9d, 0xce, 0x1e,
-	0x1c, 0x64, 0xb6, 0x34, 0x3b, 0x0c, 0x8c, 0x2c, 0x07, 0xeb, 0x4e, 0x67, 0x6f, 0x14, 0x18, 0xa7,
-	0xc1, 0x2c, 0x04, 0x08, 0x55, 0x3a, 0xdc, 0x44, 0xd8, 0x6e, 0x3b, 0xae, 0xc7, 0x9a, 0x3d, 0xe6,
-	0x75, 0x6d, 0xd8, 0x1a, 0x3f, 0x9f, 0x02, 0x2f, 0x6f, 0x0c, 0x03, 0x63, 0x46, 0x68, 0xd7, 0x22,
-	0xe5, 0x28, 0x30, 0x2e, 0x8a, 0x55, 0x1f, 0xd6, 0x10, 0x7a, 0x94, 0x8d, 0x6f, 0xa3, 0x53, 0xf2,
-	0x01, 0x16, 0xeb, 0xb0, 0x3e, 0xcb, 0xa7, 0xc1, 0xf7, 0x7f, 0x0e, 0x03, 0x63, 0x5a, 0x28, 0xca,
-	0x80, 0x8f, 0x02, 0x03, 0x6b, 0x6e, 0x05, 0x48, 0x68, 0x8c, 0x83, 0x2d, 0x74, 0xce, 0xb2, 0x7d,
-	0x73, 0xa3, 0xc3, 0x9a, 0x7d, 0xd6, 0xed, 0x35, 0x6d, 0xc7, 0x62, 0xbb, 0xcc, 0xcf, 0x67, 0xc0,
-	0xe7, 0xc2, 0x30, 0x30, 0xb0, 0xd4, 0xaf, 0xb3, 0x6e, 0xaf, 0x2a, 0xb4, 0xa3, 0xc0, 0xc8, 0x8b,
-	0x9c, 0x3a, 0xa2, 0x22, 0xf4, 0x39, 0x7c, 0xbc, 0x80, 0x32, 0x3d, 0x73, 0xe0, 0x33, 0x2b, 0x3f,
-	0x01, 0x7e, 0x0b, 0xc3, 0xc0, 0x90, 0x88, 0x3a, 0x70, 0x21, 0x12, 0x2a, 0x71, 0x1e, 0x3c, 0x22,
-	0x4b, 0xfd, 0x7c, 0xee, 0x70, 0xf0, 0x94, 0x41, 0x11, 0x05, 0x8f, 0x24, 0x2a, 0x5f, 0x42, 0x26,
-	0x34, 0x54, 0x90, 0x3f, 0x65, 0x50, 0x46, 0x18, 0xe1, 0x92, 0x0a, 0x9e, 0xe9, 0xd2, 0x02, 0x77,
-	0xf0, 0xd7, 0xc0, 0xc8, 0x0a, 0x5d, 0xb5, 0x7c, 0x5c, 0x30, 0x7d, 0xfe, 0xe4, 0x6a, 0x42, 0x0b,
-	0xa8, 0x79, 0x94, 0xd2, 0x8a, 0x05, 0xe4, 0x9e, 0x23, 0xca, 0x84, 0xc8, 0x3d, 0x07, 0x0a, 0x04,
-	0x60, 0xf8, 0x03, 0x34, 0x69, 0x5a, 0x16, 0xcf, 0x11, 0xe6, 0xe7, 0x93, 0xc5, 0x24, 0x8f, 0xd9,
-	0x61, 0x60, 0x44, 0xe0, 0x28, 0x30, 0x4e, 0x81, 0x95, 0x44, 0x08, 0x8d, 0x74, 0xf8, 0x07, 0xf1,
-	0xcc, 0x4d, 0x1d, 0xae, 0x01, 0xdf, 0x2f, 0x65, 0x79, 0xa4, 0xb7, 0x98, 0x27, 0x4b, 0x5f, 0x5a,
-	0x24, 0x14, 0x8f, 0x74, 0x0e, 0xca, 0xc2, 0x27, 0x22, 0x3d, 0x04, 0x08, 0x55, 0x3a, 0xbc, 0x82,
-	0xa6, 0xbb, 0xe6, 0x6e, 0xd3, 0x67, 0x3f, 0x1c, 0x30, 0xa7, 0xc5, 0x20, 0x66, 0x92, 0x62, 0x15,
-	0x5d, 0x73, 0xb7, 0x21, 0x61, 0xb5, 0x0a, 0x0d, 0x23, 0x54, 0x67, 0xe0, 0x12, 0x42, 0xb6, 0xd3,
-	0xf7, 0x5c, 0x6b, 0xd0, 0x62, 0x9e, 0x0c, 0x11, 0xa8, 0xc0, 0x11, 0xaa, 0x2a, 0x70, 0x04, 0x11,
-	0xaa, 0xe9, 0x71, 0x1b, 0x65, 0x21, 0x76, 0x9b, 0xb6, 0x95, 0xcf, 0x16, 0x13, 0x73, 0xa9, 0xd2,
-	0xaa, 0x3c, 0xdc, 0x09, 0x88, 0x42, 0x38, 0xdb, 0xf0, 0x27, 0x8f, 0x19, 0x60, 0x57, 0x2d, 0xb5,
-	0xfb, 0x52, 0xe6, 0x75, 0x23, 0xa4, 0xfd, 0x2a, 0xfa, 0x49, 0x43, 0x3e, 0xfe, 0x11, 0x2a, 0xf8,
-	0x8f, 0x6c, 0x9e, 0x29, 0xe2, 0xd9, 0x7d, 0xdb, 0x75, 0x9a, 0x1e, 0xeb, 0xba, 0xdb, 0x66, 0xc7,
-	0xcf, 0x4f, 0xc2, 0xe2, 0x6f, 0x0e, 0x03, 0x23, 0xcf, 0x59, 0x55, 0x8d, 0x44, 0x25, 0x67, 0x14,
-	0x18, 0xb3, 0xf0, 0xc4, 0xe3, 0x08, 0x84, 0x1e, 0x6b, 0x8b, 0x77, 0xd1, 0x4b, 0xcc, 0x69, 0x79,
-	0x7b, 0x3d, 0x78, 0x6c, 0xcf, 0xf4, 0xfd, 0x1d, 0xd7, 0xb3, 0x9a, 0x7d, 0xf7, 0x11, 0x73, 0xf2,
-	0x08, 0x82, 0xfa, 0x83, 0x61, 0x60, 0x5c, 0x8c, 0x48, 0x6b, 0x92, 0xb3, 0xce, 0x29, 0xa3, 0xc0,
-	0xb8, 0x02, 0xcf, 0x3e, 0x46, 0x4f, 0xe8, 0x71, 0x96, 0xe4, 0x27, 0x09, 0x94, 0x86, 0xcd, 0xe0,
-	0xd9, 0x2c, 0x8a, 0xb2, 0x2c, 0xc1, 0x90, 0xcd, 0x02, 0x39, 0x52, 0xbe, 0x25, 0x8e, 0x2b, 0x28,
-	0xbd, 0x69, 0x77, 0x98, 0x9f, 0x1f, 0x87, 0x5c, 0xc6, 0x5a, 0x23, 0xb0, 0x3b, 0xac, 0xea, 0x6c,
-	0xba, 0xa5, 0x4b, 0x32, 0x9b, 0x05, 0x51, 0xe5, 0x12, 0x97, 0x08, 0x15, 0x20, 0xf9, 0x3c, 0x81,
-	0xa6, 0x60, 0x11, 0x77, 0x7b, 0x96, 0xd9, 0x67, 0xff, 0xce, 0xa5, 0xfc, 0x6c, 0x1a, 0x65, 0x43,
-	0x03, 0x55, 0x10, 0x12, 0x27, 0x28, 0x08, 0xf3, 0x28, 0xe5, 0xdb, 0x9f, 0x32, 0x68, 0x2c, 0x49,
-	0xc1, 0xe5, 0xb2, 0xe2, 0x72, 0x81, 0x50, 0xc0, 0xf0, 0x87, 0x08, 0x75, 0x5d, 0xcb, 0xde, 0xb4,
-	0x99, 0xd5, 0xf4, 0x21, 0x41, 0x93, 0xa5, 0x22, 0xaf, 0x1e, 0x21, 0xda, 0x18, 0x05, 0xc6, 0x19,
-	0x91, 0x5e, 0x21, 0x42, 0x68, 0xa4, 0xe5, 0xf5, 0x43, 0x39, 0xd8, 0xd8, 0xcb, 0x4f, 0x43, 0x66,
-	0x7c, 0x10, 0x66, 0x46, 0x63, 0xcb, 0xf5, 0xfa, 0x90, 0x0e, 0xea, 0x31, 0xa5, 0x3d, 0x95, 0x6a,
-	0x11, 0x44, 0x78, 0x26, 0x48, 0x32, 0xd5, 0xa8, 0x78, 0x15, 0x4d, 0x84, 0x03, 0x0f, 0x8f, 0xfc,
-	0x58, 0x91, 0xbe, 0xc7, 0x5a, 0x7d, 0xd7, 0x2b, 0x15, 0xc3, 0x22, 0xbd, 0xad, 0x06, 0x20, 0x91,
-	0x70, 0xdb, 0xe1, 0xe8, 0x13, 0x6a, 0xf0, 0xfb, 0x28, 0xab, 0x8a, 0x09, 0x82, 0x77, 0x85, 0x62,
-	0xe4, 0x47, 0x95, 0x44, 0x14, 0x23, 0x5f, 0x95, 0x11, 0xa5, 0xc3, 0x1f, 0xa1, 0xcc, 0x46, 0xc7,
-	0x6d, 0x3d, 0x0a, 0xbb, 0xc5, 0xd9, 0x68, 0x21, 0x25, 0x8e, 0xc3, 0xb9, 0x5e, 0x91, 0x6b, 0x91,
-	0x54, 0xd5, 0xfe, 0x41, 0x24, 0x54, 0xc2, 0x7c, 0x9a, 0xf3, 0xf7, 0xba, 0x1d, 0xdb, 0x79, 0xd4,
-	0xec, 0x9b, 0x5e, 0x9b, 0xf5, 0xf3, 0x33, 0xd1, 0x34, 0x27, 0x35, 0xeb, 0xa0, 0x50, 0xd3, 0x5c,
-	0x0c, 0x25, 0x34, 0xce, 0xe2, 0x33, 0xa6, 0x70, 0xdd, 0xdc, 0x32, 0xfd, 0xad, 0x3c, 0x86, 0x3c,
-	0x85, 0x0a, 0x27, 0xe0, 0x5b, 0xa6, 0xbf, 0xa5, 0xb6, 0x3d, 0x82, 0x08, 0xd5, 0xf4, 0xf8, 0x26,
-	0x9a, 0x94, 0xb9, 0xc9, 0xac, 0xfc, 0x59, 0x70, 0x01, 0xa1, 0xa0, 0x40, 0x15, 0x0a, 0x0a, 0x21,
-	0x34, 0xd2, 0xe2, 0x92, 0x9c, 0x23, 0xc5, 0xf4, 0x77, 0xe1, 0x68, 0xd8, 0x9f, 0x60, 0x90, 0x5c,
-	0x46, 0x53, 0x87, 0xa7, 0x9a, 0x53, 0xa2, 0xe2, 0xf7, 0x62, 0xf3, 0x8c, 0xa8, 0xf8, 0x3d, 0x7d,
-	0x92, 0xd1, 0x19, 0xf8, 0x23, 0x2d, 0x2c, 0x1d, 0x3f, 0x3f, 0x55, 0x4c, 0xcc, 0xa5, 0x4b, 0xaf,
-	0xea, 0x71, 0x58, 0xf3, 0x8f, 0xc4, 0x61, 0xcd, 0x27, 0xff, 0x08, 0x8c, 0xa4, 0xed, 0xf4, 0xa9,
-	0x46, 0xc3, 0x9b, 0x48, 0xec, 0x52, 0x13, 0xb2, 0xea, 0x14, 0xb8, 0x5a, 0x79, 0x1a, 0x18, 0xd3,
-	0xd4, 0xdc, 0x81, 0xa3, 0x6f, 0xd8, 0x9f, 0x32, 0xbe, 0x51, 0x1b, 0xa1, 0xa0, 0x36, 0x4a, 0x21,
-	0xa1, 0xe3, 0x2f, 0x9e, 0x5c, 0x8d, 0x99, 0xd1, 0xc8, 0x08, 0xdf, 0x43, 0xd9, 0x5e, 0xc7, 0xec,
-	0x6f, 0xba, 0x5e, 0x37, 0x7f, 0x1a, 0x82, 0x5d, 0xdb, 0xc3, 0x35, 0xa9, 0x29, 0x9b, 0x7d, 0xb3,
-	0x44, 0x64, 0x98, 0x29, 0xbe, 0x8a, 0xdc, 0x10, 0x20, 0x54, 0xe9, 0x70, 0x19, 0x4d, 0x75, 0xdc,
-	0x96, 0xd9, 0x69, 0x6e, 0x76, 0xcc, 0xb6, 0x9f, 0xff, 0xdb, 0x04, 0x6c, 0x2a, 0x44, 0x07, 0xe0,
-	0xcb, 0x1c, 0x56, 0x9b, 0x11, 0x41, 0x84, 0x6a, 0x7a, 0x7c, 0x0b, 0x4d, 0xcb, 0x34, 0x12, 0x31,
-	0xf6, 0xf7, 0x09, 0x88, 0x10, 0x38, 0x1b, 0xa9, 0x90, 0x51, 0x36, 0xa3, 0x67, 0x9f, 0x08, 0x33,
-	0x9d, 0x81, 0x3f, 0x46, 0x67, 0x6c, 0xc7, 0xb5, 0x58, 0xb3, 0xb5, 0x65, 0x3a, 0x6d, 0xc6, 0xcf,
-	0x67, 0x38, 0x01, 0xd9, 0x08, 0xf1, 0x0f, 0xba, 0x25, 0x50, 0xc1, 0x19, 0x9d, 0x95, 0xdd, 0x53,
-	0x43, 0x09, 0x8d, 0xb3, 0xf0, 0xbb, 0x7c, 0x96, 0xe3, 0xf3, 0xa6, 0x25, 0x07, 0xcb, 0xcb, 0x62,
-	0x6a, 0x03, 0x48, 0x15, 0x04, 0x29, 0xc3, 0xd8, 0x06, 0xbf, 0x30, 0x45, 0x13, 0xb6, 0xb3, 0x6d,
-	0x76, 0xec, 0x70, 0x70, 0x7c, 0xef, 0x69, 0x60, 0x20, 0x6a, 0xee, 0x54, 0x05, 0x2a, 0xfa, 0x38,
-	0xfc, 0xd4, 0xfa, 0x38, 0xc8, 0xbc, 0x8f, 0x6b, 0x4c, 0x1a, 0xf2, 0x78, 0x72, 0x3b, 0x6e, 0x6c,
-	0x36, 0xcf, 0x82, 0x6b, 0x78, 0x39, 0xc7, 0x8d, 0xcf, 0xe5, 0xe2, 0xe5, 0x62, 0x28, 0xa1, 0x71,
-	0xd6, 0xfb, 0xa9, 0x5f, 0x7e, 0x69, 0x8c, 0x91, 0x6f, 0x12, 0x68, 0x52, 0x15, 0x1a, 0x5e, 0xe3,
-	0xe1, 0x14, 0x92, 0x70, 0x08, 0x90, 0x53, 0x5b, 0x62, 0xf7, 0x45, 0x4e, 0x6d, 0xc1, 0xb6, 0x03,
-	0xc6, 0x7b, 0x98, 0xbb, 0xb9, 0xe9, 0xb3, 0x3e, 0x74, 0x8f, 0xa4, 0xe8, 0x61, 0x02, 0x51, 0x3d,
-	0x4c, 0x88, 0x84, 0x4a, 0x1c, 0xbf, 0x29, 0x7b, 0xc8, 0x38, 0x44, 0xfb, 0x95, 0xe7, 0xf7, 0x90,
-	0x30, 0x59, 0x44, 0x2b, 0xb9, 0x81, 0x26, 0x77, 0x98, 0xf9, 0x48, 0x44, 0x87, 0x48, 0x5c, 0xa8,
-	0xae, 0x1c, 0x94, 0x91, 0x21, 0x62, 0x34, 0x04, 0x08, 0x55, 0x3a, 0xf9, 0x8e, 0x0f, 0x51, 0x46,
-	0x14, 0x75, 0xbc, 0x86, 0xb2, 0x2d, 0x77, 0xe0, 0xf4, 0xa3, 0xab, 0xdd, 0x8c, 0x3e, 0x93, 0x82,
-	0xa6, 0xf4, 0x1f, 0x61, 0x1a, 0x84, 0x54, 0x75, 0x46, 0x12, 0xe0, 0xc3, 0xa4, 0x54, 0x91, 0xcf,
-	0x12, 0x68, 0x42, 0x1a, 0xe2, 0x5b, 0x6a, 0x44, 0x4f, 0x95, 0xde, 0x3b, 0xd4, 0xab, 0xbe, 0xfd,
-	0xba, 0xa7, 0xf7, 0x29, 0x79, 0xf3, 0xdb, 0x36, 0x3b, 0x03, 0xb1, 0x51, 0x29, 0x71, 0xf3, 0x03,
-	0x40, 0x95, 0x7e, 0x90, 0x08, 0x15, 0x28, 0xf9, 0x2c, 0x85, 0xa6, 0xf5, 0x54, 0xe6, 0x45, 0x73,
-	0xe0, 0xd8, 0xbb, 0xb0, 0x98, 0xd8, 0xac, 0x70, 0xd7, 0xb1, 0x77, 0x21, 0xd9, 0x0b, 0x8f, 0x03,
-	0x23, 0xc1, 0x0f, 0x80, 0xf3, 0xd4, 0x01, 0x70, 0x81, 0x50, 0xc0, 0xf0, 0xc7, 0x68, 0x62, 0xc7,
-	0x76, 0x2c, 0x77, 0xc7, 0x87, 0x65, 0x4c, 0xe9, 0xf3, 0xfb, 0x7d, 0xa1, 0x00, 0x4f, 0x45, 0xe9,
-	0x29, 0x64, 0xab, 0xed, 0x92, 0x32, 0xa1, 0xa1, 0x06, 0xaf, 0xa0, 0x74, 0xc7, 0x76, 0x06, 0xbb,
-	0x10, 0x60, 0xb1, 0x66, 0xf7, 0x89, 0xd9, 0xef, 0x7b, 0xe0, 0xee, 0xb2, 0x74, 0x27, 0x98, 0xd1,
-	0x55, 0x97, 0x4b, 0xfc, 0xaa, 0xcb, 0xff, 0xc5, 0xb7, 0x51, 0xc6, 0x32, 0xbd, 0x1d, 0x5b, 0x5c,
-	0x2d, 0x8e, 0xf1, 0x34, 0x2b, 0x3d, 0x49, 0x6a, 0x74, 0xcd, 0x02, 0x91, 0x50, 0x89, 0x63, 0x86,
-	0x26, 0x36, 0x3d, 0xc6, 0x36, 0x7c, 0x0b, 0x46, 0x95, 0x63, 0xbc, 0xbd, 0xcb, 0xbd, 0xf1, 0x61,
-	0x7c, 0xd9, 0x63, 0xac, 0xd4, 0x80, 0x61, 0x5c, 0x9a, 0xa9, 0x37, 0x96, 0x32, 0x0c, 0xe3, 0x92,
-	0x46, 0x43, 0x12, 0x6e, 0xa2, 0x8c, 0xc3, 0xfa, 0xfc, 0x29, 0x99, 0xe3, 0x9f, 0xb2, 0x20, 0x9f,
-	0x92, 0xa9, 0xb1, 0xbe, 0x78, 0x88, 0x34, 0x52, 0xab, 0x17, 0x22, 0x7f, 0x84, 0xe4, 0x50, 0xc9,
-	0x20, 0x3f, 0x1d, 0x47, 0xd9, 0xf0, 0x7c, 0xf9, 0x08, 0xe6, 0xee, 0x38, 0xcc, 0xd3, 0xbf, 0x31,
-	0x41, 0xdf, 0x05, 0x54, 0x5e, 0x92, 0x44, 0x3b, 0x51, 0x08, 0xa1, 0x91, 0x96, 0x3b, 0x68, 0x7b,
-	0xee, 0xa0, 0xa7, 0x7f, 0x5f, 0x02, 0x07, 0x80, 0xc6, 0x1c, 0x28, 0x84, 0xd0, 0x48, 0x8b, 0x6f,
-	0xa0, 0xe4, 0xc0, 0xb6, 0xe0, 0xa8, 0xd3, 0xa5, 0x57, 0x9f, 0x06, 0x46, 0xf2, 0x2e, 0x64, 0x00,
-	0x47, 0x47, 0x81, 0x31, 0x29, 0x02, 0xce, 0xb6, 0xb4, 0x26, 0xc6, 0x19, 0x94, 0xeb, 0xb9, 0x71,
-	0xdb, 0xb6, 0xe0, 0x74, 0xa5, 0xf1, 0x8a, 0x30, 0x6e, 0x6b, 0xc6, 0xed, 0xb8, 0xf1, 0x0a, 0x37,
-	0xe6, 0xd8, 0xaf, 0x13, 0x68, 0x4a, 0x8b, 0xd0, 0xef, 0xbf, 0x17, 0xab, 0xe8, 0xb4, 0x70, 0x60,
-	0xfb, 0x4d, 0x78, 0x41, 0xd8, 0x0f, 0xf9, 0xf1, 0x02, 0x34, 0x55, 0x7f, 0x85, 0xe3, 0xea, 0xe3,
-	0x85, 0x0e, 0x12, 0x1a, 0xe3, 0x90, 0x06, 0x9a, 0x54, 0x07, 0x8e, 0x97, 0x51, 0x66, 0x97, 0x0b,
-	0x61, 0x41, 0x3a, 0x73, 0x28, 0x2a, 0xa2, 0xe1, 0x4f, 0xd0, 0x54, 0x42, 0x80, 0x48, 0xa8, 0x84,
-	0x49, 0x0b, 0xa5, 0x81, 0xff, 0x42, 0x33, 0x7d, 0xac, 0xce, 0x4c, 0xff, 0xeb, 0x3a, 0xf3, 0xe3,
-	0x14, 0x9a, 0xa0, 0x7c, 0x74, 0xf5, 0xfb, 0xf8, 0x1d, 0x55, 0xed, 0xd2, 0xa5, 0x57, 0x8e, 0x2b,
-	0x6f, 0xd1, 0xe9, 0x84, 0xdf, 0x20, 0xa2, 0xab, 0xcf, 0xf8, 0x89, 0xaf, 0x3e, 0xe1, 0x2b, 0x25,
-	0x4f, 0xf0, 0x4a, 0x51, 0x5b, 0x4a, 0xbd, 0x70, 0x5b, 0x4a, 0x9f, 0xbc, 0x2d, 0x85, 0x9d, 0x32,
-	0x73, 0x82, 0x4e, 0x59, 0x47, 0xa7, 0x37, 0x3d, 0xb7, 0x0b, 0x5f, 0xaa, 0x5c, 0xcf, 0xf4, 0xf6,
-	0xe4, 0x54, 0x00, 0xad, 0x9b, 0x6b, 0xd6, 0x43, 0x85, 0x6a, 0xdd, 0x31, 0x94, 0xd0, 0x38, 0x2b,
-	0xde, 0x13, 0xb3, 0x2f, 0xd6, 0x13, 0xf1, 0x4d, 0x94, 0x15, 0x73, 0xa7, 0xe3, 0xc2, 0xe5, 0x27,
-	0x5d, 0x7a, 0x99, 0x97, 0x32, 0xc0, 0x6a, 0xae, 0x2a, 0x65, 0x52, 0x56, 0xaf, 0x1d, 0x12, 0xc8,
-	0xef, 0x13, 0x28, 0x4b, 0x99, 0xdf, 0x73, 0x1d, 0x9f, 0x7d, 0xd7, 0x20, 0x98, 0x47, 0x29, 0xcb,
-	0xec, 0x9b, 0x32, 0xec, 0x60, 0xf7, 0xb8, 0xac, 0x76, 0x8f, 0x0b, 0x84, 0x02, 0x86, 0x3f, 0x44,
-	0xa9, 0x96, 0x6b, 0x89, 0xc3, 0x3f, 0xad, 0x17, 0xcd, 0x8a, 0xe7, 0xb9, 0xde, 0x92, 0x6b, 0xc9,
-	0xe1, 0x9f, 0x93, 0x94, 0x03, 0x2e, 0x10, 0x0a, 0x18, 0xf9, 0x5d, 0x02, 0xe5, 0xca, 0xee, 0x8e,
-	0xd3, 0x71, 0x4d, 0x6b, 0xcd, 0x73, 0xdb, 0x1e, 0xf3, 0xfd, 0xef, 0x74, 0x03, 0x6f, 0xa2, 0x89,
-	0x01, 0xdc, 0xdf, 0xc3, 0x3b, 0xf8, 0xd5, 0xf8, 0x65, 0xe4, 0xf0, 0x43, 0xc4, 0x65, 0x3f, 0xfa,
-	0xdc, 0x27, 0x8d, 0x95, 0x7f, 0x21, 0x13, 0x1a, 0x2a, 0xc8, 0x6f, 0x93, 0xa8, 0x70, 0xbc, 0x23,
-	0xdc, 0x45, 0x53, 0x82, 0xd9, 0xd4, 0x3e, 0xac, 0xcf, 0x9d, 0x64, 0x0d, 0x70, 0x45, 0x82, 0xd1,
-	0x7c, 0xa0, 0x64, 0x35, 0x9a, 0x47, 0x10, 0xa1, 0x9a, 0xfe, 0x85, 0xbe, 0x16, 0x6a, 0x17, 0xea,
-	0xe4, 0xf7, 0xbf, 0x50, 0x37, 0xd0, 0x29, 0x11, 0xa2, 0xe1, 0x67, 0xdd, 0x54, 0x31, 0x39, 0x97,
-	0x2e, 0x5d, 0xe3, 0xd5, 0x76, 0x43, 0x0c, 0xab, 0xe1, 0x07, 0xdd, 0x99, 0x28, 0x58, 0x05, 0x18,
-	0x46, 0x5b, 0x6e, 0x8c, 0xc6, 0xb8, 0x78, 0x39, 0x76, 0xdf, 0x12, 0xa9, 0xfe, 0x5f, 0x27, 0xbc,
-	0x5f, 0x69, 0xf7, 0x29, 0x92, 0x41, 0xa9, 0x35, 0xdb, 0x69, 0x93, 0x1b, 0x28, 0xbd, 0xd4, 0x71,
-	0x7d, 0xa8, 0x38, 0x1e, 0x33, 0x7d, 0xd7, 0xd1, 0x43, 0x49, 0x20, 0xea, 0xa8, 0x85, 0x48, 0xa8,
-	0xc4, 0xe7, 0xbf, 0x4a, 0xa2, 0x29, 0xed, 0xef, 0x20, 0xf8, 0xff, 0xd0, 0xa5, 0x3b, 0x95, 0x46,
-	0x63, 0x71, 0xa5, 0xd2, 0x5c, 0x7f, 0xb0, 0x56, 0x69, 0x2e, 0xad, 0xde, 0x6d, 0xac, 0x57, 0x68,
-	0x73, 0xa9, 0x5e, 0x5b, 0xae, 0xae, 0xe4, 0xc6, 0x0a, 0x97, 0xf7, 0x0f, 0x8a, 0x79, 0xcd, 0x22,
-	0xfe, 0x17, 0x8b, 0xff, 0x46, 0x38, 0x66, 0x5e, 0xad, 0x95, 0x2b, 0x9f, 0xe4, 0x12, 0x85, 0x73,
-	0xfb, 0x07, 0xc5, 0x9c, 0x66, 0x25, 0x3e, 0x84, 0xfd, 0x2f, 0x7a, 0xe9, 0x28, 0xbb, 0x79, 0x77,
-	0xad, 0xbc, 0xb8, 0x5e, 0xc9, 0x8d, 0x17, 0x0a, 0xfb, 0x07, 0xc5, 0x0b, 0x87, 0x8d, 0x64, 0x08,
-	0xbe, 0x81, 0xce, 0xc5, 0x4c, 0x69, 0xe5, 0xe3, 0xbb, 0x95, 0xc6, 0x7a, 0x2e, 0x59, 0xb8, 0xb0,
-	0x7f, 0x50, 0xc4, 0x9a, 0x55, 0xd8, 0x26, 0x16, 0xd0, 0xf9, 0x43, 0x16, 0x8d, 0xb5, 0x7a, 0xad,
-	0x51, 0xc9, 0xa5, 0x0a, 0x17, 0xf7, 0x0f, 0x8a, 0x67, 0x63, 0x26, 0xb2, 0xaa, 0x2c, 0xa1, 0xd9,
-	0x98, 0x4d, 0xb9, 0x7e, 0xbf, 0xb6, 0x5a, 0x5f, 0x2c, 0x37, 0xd7, 0x68, 0x7d, 0x85, 0x56, 0x1a,
-	0x8d, 0x5c, 0xba, 0x60, 0xec, 0x1f, 0x14, 0x2f, 0x69, 0xc6, 0x47, 0x32, 0x7c, 0x1e, 0xcd, 0xc4,
-	0x9c, 0xac, 0x55, 0x6b, 0x2b, 0xb9, 0x4c, 0xe1, 0xec, 0xfe, 0x41, 0xf1, 0x8c, 0x66, 0xc7, 0xcf,
-	0xf2, 0xc8, 0xfe, 0x2d, 0xad, 0xd6, 0x1b, 0x95, 0xdc, 0xc4, 0x91, 0xfd, 0x83, 0x03, 0x9f, 0xff,
-	0x4d, 0x02, 0xe1, 0xa3, 0x7f, 0x7a, 0xc2, 0xef, 0xa1, 0x7c, 0xe8, 0x64, 0xa9, 0x7e, 0x67, 0x8d,
-	0xaf, 0xb3, 0x5a, 0xaf, 0x35, 0x6b, 0xf5, 0x5a, 0x25, 0x37, 0x16, 0xdb, 0x55, 0xcd, 0xaa, 0xe6,
-	0x3a, 0x0c, 0xd7, 0xd1, 0xc5, 0xe7, 0x59, 0xae, 0x3e, 0x7c, 0x3b, 0x97, 0x28, 0x2c, 0xec, 0x1f,
-	0x14, 0xcf, 0x1f, 0x35, 0x5c, 0x7d, 0xf8, 0xf6, 0xd7, 0x3f, 0x7f, 0xe5, 0xf9, 0x8a, 0x79, 0x3e,
-	0x00, 0xe9, 0x4b, 0x7b, 0x13, 0x9d, 0xd3, 0x1d, 0xdf, 0xa9, 0xac, 0x2f, 0x96, 0x17, 0xd7, 0x17,
-	0x73, 0x63, 0xe2, 0x0c, 0x34, 0xea, 0x1d, 0xd6, 0x37, 0xa1, 0xec, 0xbe, 0x86, 0x66, 0x62, 0x6f,
-	0x51, 0xb9, 0x57, 0xa1, 0x61, 0x44, 0xe9, 0xeb, 0x67, 0xdb, 0xcc, 0xc3, 0xaf, 0x23, 0xac, 0x93,
-	0x17, 0x57, 0xef, 0x2f, 0x3e, 0x68, 0xe4, 0xc6, 0x0b, 0xe7, 0xf7, 0x0f, 0x8a, 0x33, 0x1a, 0x7b,
-	0xb1, 0xb3, 0x63, 0xee, 0xf9, 0xf3, 0x7f, 0x1c, 0x47, 0xd3, 0xfa, 0xd7, 0x1b, 0xfc, 0x3a, 0x3a,
-	0xbb, 0x5c, 0x5d, 0xe5, 0x91, 0xb8, 0x5c, 0x17, 0x27, 0xc0, 0xc5, 0xdc, 0x98, 0x78, 0x9c, 0x4e,
-	0xe5, 0xbf, 0xf1, 0xff, 0xa0, 0xfc, 0x21, 0x7a, 0xb9, 0x4a, 0x2b, 0x4b, 0xeb, 0x75, 0xfa, 0x20,
-	0x97, 0x28, 0xbc, 0xc4, 0x37, 0x4c, 0xb7, 0x29, 0xdb, 0x1e, 0x94, 0xa0, 0x3d, 0x7c, 0x13, 0x5d,
-	0x3a, 0x64, 0xd8, 0x78, 0x70, 0x67, 0xb5, 0x5a, 0xbb, 0x2d, 0x9e, 0x37, 0x5e, 0xb8, 0xb2, 0x7f,
-	0x50, 0xbc, 0xa8, 0xdb, 0x36, 0xc4, 0x07, 0x31, 0x0e, 0x65, 0x13, 0xf8, 0x16, 0x2a, 0x1e, 0x63,
-	0x1f, 0x2d, 0x20, 0x59, 0x20, 0xfb, 0x07, 0xc5, 0xcb, 0xcf, 0x71, 0xa2, 0xd6, 0x91, 0x4d, 0xe0,
-	0xb7, 0xd0, 0x85, 0xe7, 0x7b, 0x0a, 0xf3, 0xe2, 0x39, 0xf6, 0xf3, 0x7f, 0x4e, 0xa0, 0x49, 0xd5,
-	0xf5, 0xf8, 0xa6, 0x55, 0x28, 0xad, 0xf3, 0x22, 0x51, 0xae, 0x34, 0x6b, 0xf5, 0x26, 0x48, 0xe1,
-	0xa6, 0x29, 0x5e, 0xcd, 0x85, 0x9f, 0x3c, 0xc6, 0x35, 0xfa, 0x4a, 0xa5, 0x56, 0xa1, 0xd5, 0xa5,
-	0xf0, 0x44, 0x15, 0x7b, 0x85, 0x39, 0xcc, 0xb3, 0x5b, 0xf8, 0x6d, 0x74, 0x31, 0xee, 0xbc, 0x71,
-	0x77, 0xe9, 0x56, 0xb8, 0x4b, 0xb0, 0x40, 0xed, 0x01, 0x8d, 0x41, 0x6b, 0x0b, 0x0e, 0xe6, 0x9d,
-	0x98, 0x55, 0xb5, 0x76, 0x6f, 0x71, 0xb5, 0x5a, 0x16, 0x56, 0xc9, 0x42, 0x7e, 0xff, 0xa0, 0x78,
-	0x4e, 0x59, 0xc9, 0x0f, 0x1c, 0xdc, 0x6c, 0xfe, 0xeb, 0x04, 0x9a, 0xfd, 0xf6, 0xe6, 0x85, 0xef,
-	0xa3, 0x57, 0x61, 0xbf, 0x8e, 0x94, 0x02, 0x59, 0xb7, 0xc4, 0x1e, 0x2e, 0xae, 0xad, 0x55, 0x6a,
-	0xe5, 0xdc, 0x58, 0x61, 0x6e, 0xff, 0xa0, 0x78, 0xf5, 0xdb, 0x5d, 0x2e, 0xf6, 0x7a, 0xcc, 0xb1,
-	0x4e, 0xe8, 0x78, 0xb9, 0x4e, 0x57, 0x2a, 0xeb, 0xb9, 0xc4, 0x49, 0x1c, 0x2f, 0xbb, 0x5e, 0x9b,
-	0xf5, 0x4b, 0x77, 0x1e, 0x7f, 0x33, 0x3b, 0xf6, 0xe4, 0x9b, 0xd9, 0xb1, 0xc7, 0x4f, 0x67, 0x13,
-	0x4f, 0x9e, 0xce, 0x26, 0x7e, 0xf1, 0x6c, 0x76, 0xec, 0xcb, 0x67, 0xb3, 0x89, 0x27, 0xcf, 0x66,
-	0xc7, 0xfe, 0xf2, 0x6c, 0x76, 0xec, 0xe1, 0x6b, 0x6d, 0xbb, 0xbf, 0x35, 0xd8, 0xb8, 0xd6, 0x72,
-	0xbb, 0xd7, 0xfd, 0x3d, 0xa7, 0xd5, 0xdf, 0xb2, 0x9d, 0xb6, 0xf6, 0x4b, 0xff, 0x2f, 0x08, 0x1b,
-	0x19, 0xf8, 0xf5, 0xd6, 0x3f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x4c, 0xc3, 0x32, 0x75, 0x99, 0x20,
-	0x00, 0x00,
+	// 3163 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x5a, 0x4d, 0x6c, 0x1b, 0xc7,
+	0xbd, 0x17, 0xc5, 0x0f, 0x51, 0x23, 0xc9, 0xa6, 0xc6, 0x5f, 0x0c, 0x6d, 0x6b, 0xf9, 0x26, 0xce,
+	0x7b, 0x8a, 0xf2, 0x62, 0x27, 0xca, 0xc7, 0xcb, 0x8b, 0xf3, 0x1c, 0x88, 0x22, 0x25, 0x33, 0x96,
+	0x49, 0x65, 0x28, 0xdb, 0xb1, 0xf1, 0x1e, 0x88, 0x15, 0x77, 0x44, 0x2d, 0x4c, 0xee, 0xf2, 0xed,
+	0x52, 0x5f, 0x41, 0x2f, 0x6d, 0x80, 0x20, 0xd0, 0xa1, 0x28, 0x72, 0x2a, 0x8a, 0x0a, 0x0d, 0x7a,
+	0xe9, 0xad, 0x40, 0x0f, 0xbd, 0xe4, 0xd4, 0xa3, 0x8f, 0x46, 0x80, 0x02, 0x45, 0x0f, 0x0b, 0xc4,
+	0xbe, 0xb4, 0xec, 0x8d, 0xc7, 0x9e, 0x8a, 0xf9, 0xcf, 0xec, 0xec, 0xac, 0x3e, 0x52, 0x39, 0x39,
+	0xf4, 0x64, 0xfe, 0x7f, 0xff, 0xdf, 0xff, 0xbf, 0xb3, 0xf3, 0xff, 0x9a, 0x59, 0x19, 0x5d, 0xec,
+	0xd8, 0xeb, 0x37, 0x7a, 0x9e, 0xdb, 0x77, 0x5b, 0x6e, 0xe7, 0xc6, 0x3a, 0xeb, 0x5d, 0x07, 0x01,
+	0x67, 0x43, 0xac, 0x30, 0xce, 0x76, 0xfb, 0x02, 0x2c, 0xbc, 0xec, 0xb1, 0x9e, 0xeb, 0x0b, 0xfa,
+	0xfa, 0xd6, 0xc6, 0x8d, 0xb6, 0xdb, 0x76, 0x41, 0x80, 0x5f, 0x82, 0x44, 0x9e, 0x25, 0x50, 0xfa,
+	0x36, 0xeb, 0x74, 0x5c, 0xbc, 0x88, 0x26, 0x2c, 0xb6, 0x6d, 0xb7, 0x58, 0xd3, 0x31, 0xbb, 0x2c,
+	0x9f, 0x28, 0x26, 0x66, 0xc7, 0x4b, 0x64, 0x10, 0x18, 0x48, 0xc0, 0x35, 0xb3, 0xcb, 0x86, 0x81,
+	0x91, 0xdb, 0xed, 0x76, 0xde, 0x27, 0x11, 0x44, 0xa8, 0xa6, 0xe7, 0x4e, 0x5a, 0x1d, 0x9b, 0x39,
+	0x7d, 0xe1, 0x64, 0x34, 0x72, 0x22, 0xe0, 0x98, 0x93, 0x08, 0x22, 0x54, 0xd3, 0xe3, 0x3a, 0x3a,
+	0x23, 0x9d, 0x6c, 0x33, 0xcf, 0xb7, 0x5d, 0x27, 0x9f, 0x04, 0x3f, 0xb3, 0x83, 0xc0, 0x98, 0x12,
+	0x9a, 0xfb, 0x42, 0x31, 0x0c, 0x8c, 0x73, 0x9a, 0x2b, 0x89, 0x12, 0x1a, 0x67, 0x91, 0xdf, 0x25,
+	0x50, 0xe6, 0x36, 0x33, 0x2d, 0xe6, 0xe1, 0x05, 0x94, 0xea, 0xef, 0xf5, 0xc4, 0xeb, 0x9d, 0x99,
+	0xbf, 0x70, 0x3d, 0xdc, 0xb8, 0xeb, 0x77, 0x99, 0xef, 0x9b, 0x6d, 0xb6, 0xb6, 0xd7, 0x63, 0xa5,
+	0x8b, 0x83, 0xc0, 0x00, 0xda, 0x30, 0x30, 0x10, 0xf8, 0xe7, 0x02, 0xa1, 0x80, 0x61, 0x0b, 0x4d,
+	0xb4, 0xdc, 0x6e, 0xcf, 0x63, 0x3e, 0xac, 0x6d, 0x14, 0x3c, 0x5d, 0x39, 0xe2, 0x69, 0x31, 0xe2,
+	0x94, 0xae, 0x0d, 0x02, 0x43, 0x37, 0x1a, 0x06, 0xc6, 0xb4, 0x58, 0x77, 0x84, 0x11, 0xaa, 0x33,
+	0xc8, 0xff, 0xa2, 0xa9, 0xc5, 0xce, 0x96, 0xdf, 0x67, 0xde, 0xa2, 0xeb, 0x6c, 0xd8, 0x6d, 0x7c,
+	0x07, 0x8d, 0x6d, 0xb8, 0x1d, 0x8b, 0x79, 0x7e, 0x3e, 0x51, 0x4c, 0xce, 0x4e, 0xcc, 0xe7, 0xa2,
+	0x47, 0x2e, 0x81, 0xa2, 0x64, 0x3c, 0x09, 0x8c, 0x91, 0x41, 0x60, 0x84, 0xc4, 0x61, 0x60, 0x4c,
+	0xc2, 0x63, 0x84, 0x4c, 0x68, 0xa8, 0x20, 0x5f, 0xa7, 0x50, 0x46, 0x18, 0xe1, 0xeb, 0x68, 0xd4,
+	0xb6, 0x64, 0xb8, 0x67, 0x9e, 0x05, 0xc6, 0x68, 0xb5, 0x3c, 0x08, 0x8c, 0x51, 0xdb, 0x1a, 0x06,
+	0x46, 0x16, 0xac, 0x6d, 0x8b, 0x7c, 0xf9, 0xf4, 0xda, 0x68, 0xb5, 0x4c, 0x47, 0x6d, 0x0b, 0x5f,
+	0x47, 0xe9, 0x8e, 0xb9, 0xce, 0x3a, 0x32, 0xb8, 0xf9, 0x41, 0x60, 0x08, 0x60, 0x18, 0x18, 0x13,
+	0xc0, 0x07, 0x89, 0x50, 0x81, 0xe2, 0x9b, 0x68, 0xdc, 0x63, 0xa6, 0xd5, 0x74, 0x9d, 0xce, 0x1e,
+	0x04, 0x32, 0x5b, 0x9a, 0x19, 0x04, 0x46, 0x96, 0x83, 0x75, 0xa7, 0xb3, 0x37, 0x0c, 0x8c, 0x33,
+	0x60, 0x16, 0x02, 0x84, 0x2a, 0x1d, 0x6e, 0x22, 0x6c, 0xb7, 0x1d, 0xd7, 0x63, 0xcd, 0x1e, 0xf3,
+	0xba, 0x36, 0x6c, 0x8d, 0x9f, 0x4f, 0x81, 0x97, 0x37, 0x06, 0x81, 0x31, 0x2d, 0xb4, 0xab, 0x91,
+	0x72, 0x18, 0x18, 0x97, 0xc4, 0xaa, 0x0f, 0x6b, 0x08, 0x3d, 0xca, 0xc6, 0x77, 0xd0, 0x94, 0x7c,
+	0x80, 0xc5, 0x3a, 0xac, 0xcf, 0xf2, 0x69, 0xf0, 0xfd, 0xef, 0x83, 0xc0, 0x98, 0x14, 0x8a, 0x32,
+	0xe0, 0xc3, 0xc0, 0xc0, 0x9a, 0x5b, 0x01, 0x12, 0x1a, 0xe3, 0x60, 0x0b, 0x9d, 0xb7, 0x6c, 0xdf,
+	0x5c, 0xef, 0xb0, 0x66, 0x9f, 0x75, 0x7b, 0x4d, 0xdb, 0xb1, 0xd8, 0x2e, 0xf3, 0xf3, 0x19, 0xf0,
+	0x39, 0x3f, 0x08, 0x0c, 0x2c, 0xf5, 0x6b, 0xac, 0xdb, 0xab, 0x0a, 0xed, 0x30, 0x30, 0xf2, 0xa2,
+	0xa6, 0x8e, 0xa8, 0x08, 0x3d, 0x86, 0x8f, 0xe7, 0x51, 0xa6, 0x67, 0x6e, 0xf9, 0xcc, 0xca, 0x8f,
+	0x81, 0xdf, 0xc2, 0x20, 0x30, 0x24, 0xa2, 0x02, 0x2e, 0x44, 0x42, 0x25, 0xce, 0x93, 0x47, 0x54,
+	0xa9, 0x9f, 0xcf, 0x1d, 0x4e, 0x9e, 0x32, 0x28, 0xa2, 0xe4, 0x91, 0x44, 0xe5, 0x4b, 0xc8, 0x84,
+	0x86, 0x0a, 0xf2, 0x87, 0x0c, 0xca, 0x08, 0x23, 0x5c, 0x52, 0xc9, 0x33, 0x59, 0x9a, 0xe7, 0x0e,
+	0xfe, 0x1c, 0x18, 0x59, 0xa1, 0xab, 0x96, 0x4f, 0x4a, 0xa6, 0x2f, 0x9e, 0x5e, 0x4b, 0x68, 0x09,
+	0x35, 0x87, 0x52, 0x5a, 0xb3, 0x80, 0xda, 0x73, 0x44, 0x9b, 0x10, 0xb5, 0xe7, 0x40, 0x83, 0x00,
+	0x0c, 0x7f, 0x80, 0xc6, 0x4d, 0xcb, 0xe2, 0x35, 0xc2, 0xfc, 0x7c, 0xb2, 0x98, 0xe4, 0x39, 0x3b,
+	0x08, 0x8c, 0x08, 0x1c, 0x06, 0xc6, 0x14, 0x58, 0x49, 0x84, 0xd0, 0x48, 0x87, 0xff, 0x2f, 0x5e,
+	0xb9, 0xa9, 0xc3, 0x3d, 0xe0, 0x87, 0x95, 0x2c, 0xcf, 0xf4, 0x16, 0xf3, 0x64, 0xeb, 0x4b, 0x8b,
+	0x82, 0xe2, 0x99, 0xce, 0x41, 0xd9, 0xf8, 0x44, 0xa6, 0x87, 0x00, 0xa1, 0x4a, 0x87, 0x97, 0xd1,
+	0x64, 0xd7, 0xdc, 0x6d, 0xfa, 0xec, 0xff, 0xb7, 0x98, 0xd3, 0x62, 0x90, 0x33, 0x49, 0xb1, 0x8a,
+	0xae, 0xb9, 0xdb, 0x90, 0xb0, 0x5a, 0x85, 0x86, 0x11, 0xaa, 0x33, 0x70, 0x09, 0x21, 0xdb, 0xe9,
+	0x7b, 0xae, 0xb5, 0xd5, 0x62, 0x9e, 0x4c, 0x11, 0xe8, 0xc0, 0x11, 0xaa, 0x3a, 0x70, 0x04, 0x11,
+	0xaa, 0xe9, 0x71, 0x1b, 0x65, 0x21, 0x77, 0x9b, 0xb6, 0x95, 0xcf, 0x16, 0x13, 0xb3, 0xa9, 0xd2,
+	0x8a, 0x0c, 0xee, 0x18, 0x64, 0x21, 0xc4, 0x36, 0xfc, 0xc9, 0x73, 0x06, 0xd8, 0x55, 0x4b, 0xed,
+	0xbe, 0x94, 0x79, 0xdf, 0x08, 0x69, 0xbf, 0x88, 0x7e, 0xd2, 0x90, 0x8f, 0x7f, 0x84, 0x0a, 0xfe,
+	0x63, 0x9b, 0x57, 0x8a, 0x78, 0x76, 0xdf, 0x76, 0x9d, 0xa6, 0xc7, 0xba, 0xee, 0xb6, 0xd9, 0xf1,
+	0xf3, 0xe3, 0xb0, 0xf8, 0x5b, 0x83, 0xc0, 0xc8, 0x73, 0x56, 0x55, 0x23, 0x51, 0xc9, 0x19, 0x06,
+	0xc6, 0x0c, 0x3c, 0xf1, 0x24, 0x02, 0xa1, 0x27, 0xda, 0xe2, 0x5d, 0xf4, 0x12, 0x73, 0x5a, 0xde,
+	0x5e, 0x0f, 0x1e, 0xdb, 0x33, 0x7d, 0x7f, 0xc7, 0xf5, 0xac, 0x66, 0xdf, 0x7d, 0xcc, 0x9c, 0x3c,
+	0x82, 0xa4, 0xfe, 0x60, 0x10, 0x18, 0x97, 0x22, 0xd2, 0xaa, 0xe4, 0xac, 0x71, 0xca, 0x30, 0x30,
+	0xae, 0xc2, 0xb3, 0x4f, 0xd0, 0x13, 0x7a, 0x92, 0x25, 0xf9, 0x49, 0x02, 0xa5, 0x61, 0x33, 0x78,
+	0x35, 0x8b, 0xa6, 0x2c, 0x5b, 0x30, 0x54, 0xb3, 0x40, 0x8e, 0xb4, 0x6f, 0x89, 0xe3, 0x0a, 0x4a,
+	0x6f, 0xd8, 0x1d, 0xe6, 0xe7, 0x47, 0xa1, 0x96, 0xb1, 0x36, 0x08, 0xec, 0x0e, 0xab, 0x3a, 0x1b,
+	0x6e, 0xe9, 0xb2, 0xac, 0x66, 0x41, 0x54, 0xb5, 0xc4, 0x25, 0x42, 0x05, 0x48, 0xbe, 0x48, 0xa0,
+	0x09, 0x58, 0xc4, 0xbd, 0x9e, 0x65, 0xf6, 0xd9, 0xbf, 0x72, 0x29, 0x9f, 0x4f, 0xa1, 0x6c, 0x68,
+	0xa0, 0x1a, 0x42, 0xe2, 0x14, 0x0d, 0x61, 0x0e, 0xa5, 0x7c, 0xfb, 0x53, 0x06, 0x83, 0x25, 0x29,
+	0xb8, 0x5c, 0x56, 0x5c, 0x2e, 0x10, 0x0a, 0x18, 0xfe, 0x10, 0xa1, 0xae, 0x6b, 0xd9, 0x1b, 0x36,
+	0xb3, 0x9a, 0x3e, 0x14, 0x68, 0xb2, 0x54, 0xe4, 0xdd, 0x23, 0x44, 0x1b, 0xc3, 0xc0, 0x38, 0x2b,
+	0xca, 0x2b, 0x44, 0x08, 0x8d, 0xb4, 0xbc, 0x7f, 0x28, 0x07, 0xeb, 0x7b, 0xf9, 0x49, 0xa8, 0x8c,
+	0x0f, 0xc2, 0xca, 0x68, 0x6c, 0xba, 0x5e, 0x1f, 0xca, 0x41, 0x3d, 0xa6, 0xb4, 0xa7, 0x4a, 0x2d,
+	0x82, 0x08, 0xaf, 0x04, 0x49, 0xa6, 0x1a, 0x15, 0xaf, 0xa0, 0xb1, 0xf0, 0xc0, 0xc3, 0x33, 0x3f,
+	0xd6, 0xa4, 0xef, 0xb3, 0x56, 0xdf, 0xf5, 0x4a, 0xc5, 0xb0, 0x49, 0x6f, 0xab, 0x03, 0x90, 0x28,
+	0xb8, 0xed, 0xf0, 0xe8, 0x13, 0x6a, 0xf0, 0xfb, 0x28, 0xab, 0x9a, 0x09, 0x82, 0x77, 0x85, 0x66,
+	0xe4, 0x47, 0x9d, 0x44, 0x34, 0x23, 0x5f, 0xb5, 0x11, 0xa5, 0xc3, 0x1f, 0xa1, 0xcc, 0x7a, 0xc7,
+	0x6d, 0x3d, 0x0e, 0xa7, 0xc5, 0xb9, 0x68, 0x21, 0x25, 0x8e, 0x43, 0x5c, 0xaf, 0xca, 0xb5, 0x48,
+	0xaa, 0x1a, 0xff, 0x20, 0x12, 0x2a, 0x61, 0x7e, 0x9a, 0xf3, 0xf7, 0xba, 0x1d, 0xdb, 0x79, 0xdc,
+	0xec, 0x9b, 0x5e, 0x9b, 0xf5, 0xf3, 0xd3, 0xd1, 0x69, 0x4e, 0x6a, 0xd6, 0x40, 0xa1, 0x4e, 0x73,
+	0x31, 0x94, 0xd0, 0x38, 0x8b, 0x9f, 0x31, 0x85, 0xeb, 0xe6, 0xa6, 0xe9, 0x6f, 0xe6, 0x31, 0xd4,
+	0x29, 0x74, 0x38, 0x01, 0xdf, 0x36, 0xfd, 0x4d, 0xb5, 0xed, 0x11, 0x44, 0xa8, 0xa6, 0xc7, 0xb7,
+	0xd0, 0xb8, 0xac, 0x4d, 0x66, 0xe5, 0xcf, 0x81, 0x0b, 0x48, 0x05, 0x05, 0xaa, 0x54, 0x50, 0x08,
+	0xa1, 0x91, 0x16, 0x97, 0xe4, 0x39, 0x52, 0x9c, 0xfe, 0x2e, 0x1e, 0x4d, 0xfb, 0x53, 0x1c, 0x24,
+	0x97, 0xd0, 0xc4, 0xe1, 0x53, 0xcd, 0x94, 0xe8, 0xf8, 0xbd, 0xd8, 0x79, 0x46, 0x74, 0xfc, 0x9e,
+	0x7e, 0x92, 0xd1, 0x19, 0xf8, 0x23, 0x2d, 0x2d, 0x1d, 0x3f, 0x3f, 0x51, 0x4c, 0xcc, 0xa6, 0x4b,
+	0xaf, 0xea, 0x79, 0x58, 0xf3, 0x8f, 0xe4, 0x61, 0xcd, 0x27, 0x7f, 0x0f, 0x8c, 0xa4, 0xed, 0xf4,
+	0xa9, 0x46, 0xc3, 0x1b, 0x48, 0xec, 0x52, 0x13, 0xaa, 0x6a, 0x0a, 0x5c, 0x2d, 0x3f, 0x0b, 0x8c,
+	0x49, 0x6a, 0xee, 0x40, 0xe8, 0x1b, 0xf6, 0xa7, 0x8c, 0x6f, 0xd4, 0x7a, 0x28, 0xa8, 0x8d, 0x52,
+	0x48, 0xe8, 0xf8, 0xcb, 0xa7, 0xd7, 0x62, 0x66, 0x34, 0x32, 0xc2, 0xf7, 0x51, 0xb6, 0xd7, 0x31,
+	0xfb, 0x1b, 0xae, 0xd7, 0xcd, 0x9f, 0x81, 0x64, 0xd7, 0xf6, 0x70, 0x55, 0x6a, 0xca, 0x66, 0xdf,
+	0x2c, 0x11, 0x99, 0x66, 0x8a, 0xaf, 0x32, 0x37, 0x04, 0x08, 0x55, 0x3a, 0x5c, 0x46, 0x13, 0x1d,
+	0xb7, 0x65, 0x76, 0x9a, 0x1b, 0x1d, 0xb3, 0xed, 0xe7, 0xff, 0x32, 0x06, 0x9b, 0x0a, 0xd9, 0x01,
+	0xf8, 0x12, 0x87, 0xd5, 0x66, 0x44, 0x10, 0xa1, 0x9a, 0x1e, 0xdf, 0x46, 0x93, 0xb2, 0x8c, 0x44,
+	0x8e, 0xfd, 0x75, 0x0c, 0x32, 0x04, 0x62, 0x23, 0x15, 0x32, 0xcb, 0xa6, 0xf5, 0xea, 0x13, 0x69,
+	0xa6, 0x33, 0xf0, 0xc7, 0xe8, 0xac, 0xed, 0xb8, 0x16, 0x6b, 0xb6, 0x36, 0x4d, 0xa7, 0xcd, 0x78,
+	0x7c, 0x06, 0x63, 0x50, 0x8d, 0x90, 0xff, 0xa0, 0x5b, 0x04, 0x15, 0xc4, 0xe8, 0x9c, 0x9c, 0x9e,
+	0x1a, 0x4a, 0x68, 0x9c, 0x85, 0x77, 0x91, 0x36, 0x56, 0x9a, 0x7d, 0xcf, 0xb4, 0x3b, 0xcc, 0x13,
+	0xf1, 0xfa, 0xdb, 0x18, 0x04, 0xec, 0xc3, 0x41, 0x60, 0x5c, 0x88, 0x38, 0x6b, 0x82, 0x22, 0x83,
+	0x75, 0xf9, 0xd0, 0xc8, 0xd2, 0xb4, 0x2a, 0x23, 0x8e, 0x37, 0xc6, 0xef, 0xf2, 0x53, 0x24, 0x3f,
+	0xe9, 0x5a, 0xf2, 0x48, 0x7b, 0x45, 0x9c, 0x17, 0x01, 0x52, 0xad, 0x48, 0xca, 0x70, 0x60, 0x84,
+	0x5f, 0x98, 0xa2, 0x31, 0xdb, 0xd9, 0x36, 0x3b, 0x76, 0x78, 0x64, 0x7d, 0xef, 0x59, 0x60, 0x20,
+	0x6a, 0xee, 0x54, 0x05, 0x2a, 0x4e, 0x10, 0xf0, 0x53, 0x3b, 0x41, 0x80, 0xcc, 0x4f, 0x10, 0x1a,
+	0x93, 0x86, 0x3c, 0xde, 0x56, 0x1c, 0x37, 0x76, 0x2b, 0xc8, 0x82, 0x6b, 0xd8, 0x56, 0xc7, 0x8d,
+	0xdf, 0x08, 0xc4, 0xb6, 0xc6, 0x50, 0x42, 0xe3, 0xac, 0xf7, 0x53, 0x3f, 0xff, 0xca, 0x18, 0x21,
+	0xdf, 0x26, 0xd0, 0xb8, 0x6a, 0x71, 0x7c, 0xba, 0x40, 0xfc, 0x93, 0x10, 0x7e, 0xa8, 0xe6, 0x4d,
+	0x11, 0x77, 0x51, 0xcd, 0x9b, 0x10, 0x70, 0xc0, 0xf8, 0xf4, 0x74, 0x37, 0x36, 0x7c, 0xd6, 0x87,
+	0xb9, 0x95, 0x14, 0xd3, 0x53, 0x20, 0x6a, 0x7a, 0x0a, 0x91, 0x50, 0x89, 0xe3, 0x37, 0xe5, 0xf4,
+	0x1a, 0x85, 0xb0, 0x5d, 0x3d, 0x7e, 0x7a, 0x85, 0x41, 0x11, 0x43, 0xec, 0x26, 0x1a, 0xdf, 0x61,
+	0xe6, 0x63, 0x91, 0x97, 0xa2, 0x65, 0x40, 0x5f, 0xe7, 0xa0, 0xcc, 0x49, 0x51, 0x1d, 0x21, 0x40,
+	0xa8, 0xd2, 0xc9, 0x77, 0x7c, 0x84, 0x32, 0x62, 0x9c, 0xe0, 0x55, 0x94, 0x6d, 0xb9, 0x5b, 0x4e,
+	0x3f, 0xba, 0x54, 0x4e, 0xeb, 0xa7, 0x61, 0xd0, 0x94, 0xfe, 0x2d, 0x2c, 0xc0, 0x90, 0xaa, 0x62,
+	0x24, 0x01, 0x7e, 0x8c, 0x95, 0x2a, 0xf2, 0x59, 0x02, 0x8d, 0x49, 0x43, 0x7c, 0x5b, 0x5d, 0x0e,
+	0x52, 0xa5, 0xf7, 0x0e, 0x4d, 0xc9, 0xef, 0xbe, 0x68, 0xea, 0x13, 0x52, 0xde, 0x39, 0xb7, 0xcd,
+	0xce, 0x96, 0xd8, 0xa8, 0x94, 0xb8, 0x73, 0x02, 0xa0, 0x86, 0x0e, 0x48, 0x84, 0x0a, 0x94, 0x7c,
+	0x96, 0x42, 0x93, 0x7a, 0x13, 0xe1, 0xed, 0x7a, 0xcb, 0xb1, 0x77, 0x61, 0x31, 0xb1, 0x53, 0xca,
+	0x3d, 0xc7, 0xde, 0x85, 0x36, 0x53, 0x78, 0x12, 0x18, 0x09, 0x1e, 0x00, 0xce, 0x53, 0x01, 0xe0,
+	0x02, 0xa1, 0x80, 0xe1, 0x8f, 0xd1, 0xd8, 0x8e, 0xed, 0x58, 0xee, 0x8e, 0x0f, 0xcb, 0x98, 0xd0,
+	0x6f, 0x0e, 0x0f, 0x84, 0x02, 0x3c, 0x15, 0xa5, 0xa7, 0x90, 0xad, 0xb6, 0x4b, 0xca, 0x84, 0x86,
+	0x1a, 0xbc, 0x8c, 0xd2, 0x1d, 0xdb, 0xd9, 0xda, 0x85, 0x04, 0x8b, 0x8d, 0xd9, 0x4f, 0xcc, 0x7e,
+	0xdf, 0x03, 0x77, 0x57, 0xa4, 0x3b, 0xc1, 0x8c, 0x2e, 0xd9, 0x5c, 0xe2, 0x97, 0x6c, 0xfe, 0x2f,
+	0xbe, 0x83, 0x32, 0x96, 0xe9, 0xed, 0xd8, 0xe2, 0x52, 0x73, 0x82, 0xa7, 0x19, 0xe9, 0x49, 0x52,
+	0xa3, 0x0b, 0x1e, 0x88, 0x84, 0x4a, 0x1c, 0x33, 0x34, 0xb6, 0xe1, 0x31, 0xb6, 0xee, 0x5b, 0x70,
+	0x48, 0x3a, 0xc1, 0xdb, 0xbb, 0xdc, 0x1b, 0xbf, 0x06, 0x2c, 0x79, 0x8c, 0x95, 0x1a, 0x70, 0x0d,
+	0x90, 0x66, 0xea, 0x8d, 0xa5, 0x0c, 0xd7, 0x00, 0x49, 0xa3, 0x21, 0x09, 0x37, 0x51, 0xc6, 0x61,
+	0x7d, 0xfe, 0x94, 0xcc, 0xc9, 0x4f, 0x99, 0x97, 0x4f, 0xc9, 0xd4, 0x58, 0x5f, 0x3c, 0x44, 0x1a,
+	0xa9, 0xd5, 0x0b, 0x91, 0x3f, 0x42, 0x72, 0xa8, 0x64, 0x90, 0xcf, 0x47, 0x51, 0x36, 0x8c, 0x2f,
+	0x3f, 0xfc, 0xb9, 0x3b, 0x0e, 0xf3, 0xf4, 0xaf, 0x5b, 0x30, 0xf1, 0x01, 0x95, 0xd7, 0x33, 0x31,
+	0xc8, 0x14, 0x42, 0x68, 0xa4, 0xe5, 0x0e, 0xda, 0x9e, 0xbb, 0xd5, 0xd3, 0xbf, 0x6c, 0x81, 0x03,
+	0x40, 0x63, 0x0e, 0x14, 0x42, 0x68, 0xa4, 0xc5, 0x37, 0x51, 0x72, 0xcb, 0xb6, 0x20, 0xd4, 0xe9,
+	0xd2, 0xab, 0xcf, 0x02, 0x23, 0x79, 0x0f, 0x2a, 0x80, 0xa3, 0xc3, 0xc0, 0x18, 0x17, 0x09, 0x67,
+	0x5b, 0xda, 0xf8, 0xe4, 0x0c, 0xca, 0xf5, 0xdc, 0xb8, 0x6d, 0x5b, 0x10, 0x5d, 0x69, 0xbc, 0x2c,
+	0x8c, 0xdb, 0x9a, 0x71, 0x3b, 0x6e, 0xbc, 0xcc, 0x8d, 0x39, 0xf6, 0xcb, 0x04, 0x9a, 0xd0, 0x32,
+	0xf4, 0x87, 0xef, 0xc5, 0x0a, 0x3a, 0x23, 0x1c, 0xd8, 0x7e, 0x13, 0x5e, 0x10, 0xf6, 0x43, 0x7e,
+	0x36, 0x01, 0x4d, 0xd5, 0x5f, 0xe6, 0xb8, 0xfa, 0x6c, 0xa2, 0x83, 0x84, 0xc6, 0x38, 0xa4, 0x81,
+	0xc6, 0x55, 0xc0, 0xf1, 0x12, 0xca, 0xec, 0x72, 0x21, 0x6c, 0x48, 0x67, 0x0f, 0x65, 0x45, 0x74,
+	0xec, 0x14, 0x34, 0x55, 0x10, 0x20, 0x12, 0x2a, 0x61, 0xd2, 0x42, 0x69, 0xe0, 0xbf, 0xd0, 0x6d,
+	0x22, 0xd6, 0x67, 0x26, 0xff, 0x79, 0x9f, 0xf9, 0x71, 0x0a, 0x8d, 0x51, 0x7e, 0x68, 0xf6, 0xfb,
+	0xf8, 0x1d, 0xd5, 0xed, 0xd2, 0xa5, 0x57, 0x4e, 0x6a, 0x6f, 0x51, 0x74, 0xc2, 0xaf, 0x1f, 0xd1,
+	0xa5, 0x6b, 0xf4, 0xd4, 0x97, 0xae, 0xf0, 0x95, 0x92, 0xa7, 0x78, 0xa5, 0x68, 0x2c, 0xa5, 0x5e,
+	0x78, 0x2c, 0xa5, 0x4f, 0x3f, 0x96, 0xc2, 0x49, 0x99, 0x39, 0xc5, 0xa4, 0xac, 0xa3, 0x33, 0x1b,
+	0x9e, 0xdb, 0x85, 0x6f, 0x64, 0xae, 0x67, 0x7a, 0x7b, 0xf2, 0x54, 0x00, 0xa3, 0x9b, 0x6b, 0xd6,
+	0x42, 0x85, 0x1a, 0xdd, 0x31, 0x94, 0xd0, 0x38, 0x2b, 0x3e, 0x13, 0xb3, 0x2f, 0x36, 0x13, 0xf1,
+	0x2d, 0x94, 0x15, 0x27, 0x5e, 0xc7, 0x85, 0x6b, 0x57, 0xba, 0xf4, 0x32, 0x6f, 0x65, 0x80, 0xd5,
+	0x5c, 0xd5, 0xca, 0xa4, 0xac, 0x5e, 0x3b, 0x24, 0x90, 0xdf, 0x26, 0x50, 0x96, 0x32, 0xbf, 0xe7,
+	0x3a, 0x3e, 0xfb, 0xbe, 0x49, 0x30, 0x87, 0x52, 0x96, 0xd9, 0x37, 0x65, 0xda, 0xc1, 0xee, 0x71,
+	0x59, 0xed, 0x1e, 0x17, 0x08, 0x05, 0x0c, 0x7f, 0x88, 0x52, 0x2d, 0xd7, 0x12, 0xc1, 0x3f, 0xa3,
+	0x37, 0xcd, 0x8a, 0xe7, 0xb9, 0xde, 0xa2, 0x6b, 0xc9, 0x6b, 0x07, 0x27, 0x29, 0x07, 0x5c, 0x20,
+	0x14, 0x30, 0xf2, 0x9b, 0x04, 0xca, 0x95, 0xdd, 0x1d, 0xa7, 0xe3, 0x9a, 0xd6, 0xaa, 0xe7, 0xb6,
+	0x3d, 0xe6, 0xfb, 0xdf, 0xeb, 0xee, 0xdf, 0x44, 0x63, 0x5b, 0xf0, 0xe5, 0x20, 0xbc, 0xfd, 0x5f,
+	0x8b, 0x5f, 0x83, 0x0e, 0x3f, 0x44, 0x7c, 0x66, 0x88, 0x3e, 0x34, 0x4a, 0x63, 0xe5, 0x5f, 0xc8,
+	0x84, 0x86, 0x0a, 0xf2, 0xeb, 0x24, 0x2a, 0x9c, 0xec, 0x08, 0x77, 0xd1, 0x84, 0x60, 0x36, 0xb5,
+	0x4f, 0xfa, 0xb3, 0xa7, 0x59, 0x03, 0x5c, 0xce, 0xe0, 0x52, 0xb0, 0xa5, 0x64, 0x75, 0x29, 0x88,
+	0x20, 0x42, 0x35, 0xfd, 0x0b, 0x7d, 0xa7, 0xd4, 0xae, 0xf2, 0xc9, 0x1f, 0x7e, 0x95, 0x6f, 0xa0,
+	0x29, 0x91, 0xa2, 0xe1, 0x07, 0xe5, 0x54, 0x31, 0x39, 0x9b, 0x2e, 0x5d, 0xe7, 0xdd, 0x76, 0x5d,
+	0x1c, 0x56, 0xc3, 0x4f, 0xc9, 0xd3, 0x51, 0xb2, 0x0a, 0x30, 0xcc, 0xb6, 0xdc, 0x08, 0x8d, 0x71,
+	0xf1, 0x52, 0xec, 0xa6, 0x27, 0x4a, 0xfd, 0x3f, 0x4e, 0x79, 0xb3, 0xd3, 0x6e, 0x72, 0x24, 0x83,
+	0x52, 0xab, 0xb6, 0xd3, 0x26, 0x37, 0x51, 0x7a, 0xb1, 0xe3, 0xfa, 0xd0, 0x71, 0x3c, 0x66, 0xfa,
+	0xae, 0xa3, 0xa7, 0x92, 0x40, 0x54, 0xa8, 0x85, 0x48, 0xa8, 0xc4, 0xe7, 0xbe, 0x4e, 0xa2, 0x09,
+	0xed, 0x2f, 0x30, 0xf8, 0x7f, 0xd0, 0xe5, 0xbb, 0x95, 0x46, 0x63, 0x61, 0xb9, 0xd2, 0x5c, 0x7b,
+	0xb8, 0x5a, 0x69, 0x2e, 0xae, 0xdc, 0x6b, 0xac, 0x55, 0x68, 0x73, 0xb1, 0x5e, 0x5b, 0xaa, 0x2e,
+	0xe7, 0x46, 0x0a, 0x57, 0xf6, 0x0f, 0x8a, 0x79, 0xcd, 0x22, 0xfe, 0xb7, 0x92, 0xff, 0x44, 0x38,
+	0x66, 0x5e, 0xad, 0x95, 0x2b, 0x9f, 0xe4, 0x12, 0x85, 0xf3, 0xfb, 0x07, 0xc5, 0x9c, 0x66, 0x25,
+	0x3e, 0xc1, 0xfd, 0x37, 0x7a, 0xe9, 0x28, 0xbb, 0x79, 0x6f, 0xb5, 0xbc, 0xb0, 0x56, 0xc9, 0x8d,
+	0x16, 0x0a, 0xfb, 0x07, 0xc5, 0x8b, 0x87, 0x8d, 0x64, 0x0a, 0xbe, 0x81, 0xce, 0xc7, 0x4c, 0x69,
+	0xe5, 0xe3, 0x7b, 0x95, 0xc6, 0x5a, 0x2e, 0x59, 0xb8, 0xb8, 0x7f, 0x50, 0xc4, 0x9a, 0x55, 0x38,
+	0x26, 0xe6, 0xd1, 0x85, 0x43, 0x16, 0x8d, 0xd5, 0x7a, 0xad, 0x51, 0xc9, 0xa5, 0x0a, 0x97, 0xf6,
+	0x0f, 0x8a, 0xe7, 0x62, 0x26, 0xb2, 0xab, 0x2c, 0xa2, 0x99, 0x98, 0x4d, 0xb9, 0xfe, 0xa0, 0xb6,
+	0x52, 0x5f, 0x28, 0x37, 0x57, 0x69, 0x7d, 0x99, 0x56, 0x1a, 0x8d, 0x5c, 0xba, 0x60, 0xec, 0x1f,
+	0x14, 0x2f, 0x6b, 0xc6, 0x47, 0x2a, 0x7c, 0x0e, 0x4d, 0xc7, 0x9c, 0xac, 0x56, 0x6b, 0xcb, 0xb9,
+	0x4c, 0xe1, 0xdc, 0xfe, 0x41, 0xf1, 0xac, 0x66, 0xc7, 0x63, 0x79, 0x64, 0xff, 0x16, 0x57, 0xea,
+	0x8d, 0x4a, 0x6e, 0xec, 0xc8, 0xfe, 0x41, 0xc0, 0xe7, 0x7e, 0x95, 0x40, 0xf8, 0xe8, 0x1f, 0xbd,
+	0xf0, 0x7b, 0x28, 0x1f, 0x3a, 0x59, 0xac, 0xdf, 0x5d, 0xe5, 0xeb, 0xac, 0xd6, 0x6b, 0xcd, 0x5a,
+	0xbd, 0x56, 0xc9, 0x8d, 0xc4, 0x76, 0x55, 0xb3, 0xaa, 0xb9, 0x0e, 0xc3, 0x75, 0x74, 0xe9, 0x38,
+	0xcb, 0x95, 0x47, 0x6f, 0xe7, 0x12, 0x85, 0xf9, 0xfd, 0x83, 0xe2, 0x85, 0xa3, 0x86, 0x2b, 0x8f,
+	0xde, 0xfe, 0xe6, 0xa7, 0xaf, 0x1c, 0xaf, 0x98, 0xe3, 0x07, 0x20, 0x7d, 0x69, 0x6f, 0xa2, 0xf3,
+	0xba, 0xe3, 0xbb, 0x95, 0xb5, 0x85, 0xf2, 0xc2, 0xda, 0x42, 0x6e, 0x44, 0xc4, 0x40, 0xa3, 0xde,
+	0x65, 0x7d, 0x13, 0xda, 0xee, 0x6b, 0x68, 0x3a, 0xf6, 0x16, 0x95, 0xfb, 0x15, 0x1a, 0x66, 0x94,
+	0xbe, 0x7e, 0xb6, 0xcd, 0x3c, 0xfc, 0x3a, 0xc2, 0x3a, 0x79, 0x61, 0xe5, 0xc1, 0xc2, 0xc3, 0x46,
+	0x6e, 0xb4, 0x70, 0x61, 0xff, 0xa0, 0x38, 0xad, 0xb1, 0x17, 0x3a, 0x3b, 0xe6, 0x9e, 0x3f, 0xf7,
+	0xfb, 0x51, 0x34, 0xa9, 0x7f, 0x37, 0xc2, 0xaf, 0xa3, 0x73, 0x4b, 0xd5, 0x15, 0x9e, 0x89, 0x4b,
+	0x75, 0x11, 0x01, 0x2e, 0xe6, 0x46, 0xc4, 0xe3, 0x74, 0x2a, 0xff, 0x8d, 0xff, 0x0b, 0xe5, 0x0f,
+	0xd1, 0xcb, 0x55, 0x5a, 0x59, 0x5c, 0xab, 0xd3, 0x87, 0xb9, 0x44, 0xe1, 0x25, 0xbe, 0x61, 0xba,
+	0x4d, 0xd9, 0xf6, 0xa0, 0x05, 0xed, 0xe1, 0x5b, 0xe8, 0xf2, 0x21, 0xc3, 0xc6, 0xc3, 0xbb, 0x2b,
+	0xd5, 0xda, 0x1d, 0xf1, 0xbc, 0xd1, 0xc2, 0xd5, 0xfd, 0x83, 0xe2, 0x25, 0xdd, 0xb6, 0x21, 0x3e,
+	0xc5, 0x71, 0x28, 0x9b, 0xc0, 0xb7, 0x51, 0xf1, 0x04, 0xfb, 0x68, 0x01, 0xc9, 0x02, 0xd9, 0x3f,
+	0x28, 0x5e, 0x39, 0xc6, 0x89, 0x5a, 0x47, 0x36, 0x81, 0xdf, 0x42, 0x17, 0x8f, 0xf7, 0x14, 0xd6,
+	0xc5, 0x31, 0xf6, 0x73, 0x7f, 0x4c, 0xa0, 0x71, 0x35, 0xf5, 0xf8, 0xa6, 0x55, 0x28, 0xad, 0xf3,
+	0x26, 0x51, 0xae, 0x34, 0x6b, 0xf5, 0x26, 0x48, 0xe1, 0xa6, 0x29, 0x5e, 0xcd, 0x85, 0x9f, 0x3c,
+	0xc7, 0x35, 0xfa, 0x72, 0xa5, 0x56, 0xa1, 0xd5, 0xc5, 0x30, 0xa2, 0x8a, 0xbd, 0xcc, 0x1c, 0xe6,
+	0xd9, 0x2d, 0xfc, 0x36, 0xba, 0x14, 0x77, 0xde, 0xb8, 0xb7, 0x78, 0x3b, 0xdc, 0x25, 0x58, 0xa0,
+	0xf6, 0x80, 0xc6, 0x56, 0x6b, 0x13, 0x02, 0xf3, 0x4e, 0xcc, 0xaa, 0x5a, 0xbb, 0xbf, 0xb0, 0x52,
+	0x2d, 0x0b, 0xab, 0x64, 0x21, 0xbf, 0x7f, 0x50, 0x3c, 0xaf, 0xac, 0xe4, 0x07, 0x0e, 0x6e, 0x36,
+	0xf7, 0x4d, 0x02, 0xcd, 0x7c, 0xf7, 0xf0, 0xc2, 0x0f, 0xd0, 0xab, 0xb0, 0x5f, 0x47, 0x5a, 0x81,
+	0xec, 0x5b, 0x62, 0x0f, 0x17, 0x56, 0x57, 0x2b, 0xb5, 0x72, 0x6e, 0xa4, 0x30, 0xbb, 0x7f, 0x50,
+	0xbc, 0xf6, 0xdd, 0x2e, 0x17, 0x7a, 0x3d, 0xe6, 0x58, 0xa7, 0x74, 0xbc, 0x54, 0xa7, 0xcb, 0x95,
+	0xb5, 0x5c, 0xe2, 0x34, 0x8e, 0x97, 0x5c, 0xaf, 0xcd, 0xfa, 0xa5, 0xbb, 0x4f, 0xbe, 0x9d, 0x19,
+	0x79, 0xfa, 0xed, 0xcc, 0xc8, 0x93, 0x67, 0x33, 0x89, 0xa7, 0xcf, 0x66, 0x12, 0x3f, 0x7b, 0x3e,
+	0x33, 0xf2, 0xd5, 0xf3, 0x99, 0xc4, 0xd3, 0xe7, 0x33, 0x23, 0x7f, 0x7a, 0x3e, 0x33, 0xf2, 0xe8,
+	0xb5, 0xb6, 0xdd, 0xdf, 0xdc, 0x5a, 0xbf, 0xde, 0x72, 0xbb, 0x37, 0xfc, 0x3d, 0xa7, 0xd5, 0xdf,
+	0xb4, 0x9d, 0xb6, 0xf6, 0x4b, 0xff, 0xcf, 0x0f, 0xeb, 0x19, 0xf8, 0xf5, 0xd6, 0x3f, 0x02, 0x00,
+	0x00, 0xff, 0xff, 0x68, 0x4a, 0x6e, 0xeb, 0x13, 0x21, 0x00, 0x00,
 }
 
 func (m *Hello) Marshal() (dAtA []byte, err error) {
@@ -1761,6 +1766,13 @@ func (m *FileInfo) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	_ = i
 	var l int
 	_ = l
+	if m.EncryptionTrailerSize != 0 {
+		i = encodeVarintBep(dAtA, i, uint64(m.EncryptionTrailerSize))
+		i--
+		dAtA[i] = 0x3e
+		i--
+		dAtA[i] = 0xd8
+	}
 	if m.InodeChangeNs != 0 {
 		i = encodeVarintBep(dAtA, i, uint64(m.InodeChangeNs))
 		i--
@@ -2828,6 +2840,9 @@ func (m *FileInfo) ProtoSize() (n int) {
 	if m.InodeChangeNs != 0 {
 		n += 2 + sovBep(uint64(m.InodeChangeNs))
 	}
+	if m.EncryptionTrailerSize != 0 {
+		n += 2 + sovBep(uint64(m.EncryptionTrailerSize))
+	}
 	return n
 }
 
@@ -4771,6 +4786,25 @@ func (m *FileInfo) Unmarshal(dAtA []byte) error {
 					break
 				}
 			}
+		case 1003:
+			if wireType != 0 {
+				return fmt.Errorf("proto: wrong wireType = %d for field EncryptionTrailerSize", wireType)
+			}
+			m.EncryptionTrailerSize = 0
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowBep
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				m.EncryptionTrailerSize |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
 		default:
 			iNdEx = preIndex
 			skippy, err := skipBep(dAtA[iNdEx:])

+ 131 - 0
lib/syncthing/globalmigrations.go

@@ -0,0 +1,131 @@
+// Copyright (C) 2022 The Syncthing Authors.
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this file,
+// You can obtain one at https://mozilla.org/MPL/2.0/.
+
+package syncthing
+
+import (
+	"encoding/binary"
+	"io"
+
+	"github.com/syncthing/syncthing/lib/config"
+	"github.com/syncthing/syncthing/lib/db"
+	"github.com/syncthing/syncthing/lib/fs"
+	"github.com/syncthing/syncthing/lib/protocol"
+)
+
+const (
+	globalMigrationVersion = 1
+	globalMigrationDBKey   = "globalMigrationVersion"
+)
+
+func globalMigration(ll *db.Lowlevel, cfg config.Wrapper) error {
+	miscDB := db.NewMiscDataNamespace(ll)
+	prevVersion, _, err := miscDB.Int64(globalMigrationDBKey)
+	if err != nil {
+		return err
+	}
+
+	if prevVersion >= globalMigrationVersion {
+		return nil
+	}
+
+	if prevVersion < 1 {
+		return encryptionTrailerSizeMigration(ll, cfg)
+	}
+
+	return miscDB.PutInt64(globalMigrationDBKey, globalMigrationVersion)
+}
+
+func encryptionTrailerSizeMigration(ll *db.Lowlevel, cfg config.Wrapper) error {
+	encFolders := cfg.Folders()
+	for folderID, folderCfg := range cfg.Folders() {
+		if folderCfg.Type != config.FolderTypeReceiveEncrypted {
+			delete(encFolders, folderID)
+		}
+	}
+	if len(encFolders) == 0 {
+		return nil
+	}
+
+	l.Infoln("Running global migration to fix encryption file sizes")
+
+	// Trigger index re-transfer with fixed up sizes
+	db.DropDeltaIndexIDs(ll)
+
+	for folderID, folderCfg := range encFolders {
+		fset, err := db.NewFileSet(folderID, ll)
+		if err != nil {
+			return err
+		}
+		snap, err := fset.Snapshot()
+		if err != nil {
+			return err
+		}
+		batch := db.NewFileInfoBatch(func(files []protocol.FileInfo) error {
+			// As we can't touch the version, we need to first invalidate the
+			// files, and then re-add the modified valid files
+			invalidFiles := make([]protocol.FileInfo, len(files))
+			for i, f := range files {
+				f.SetUnsupported()
+				invalidFiles[i] = f
+			}
+			fset.Update(protocol.LocalDeviceID, invalidFiles)
+			fset.Update(protocol.LocalDeviceID, files)
+			return nil
+		})
+		filesystem := folderCfg.Filesystem(fset)
+		var innerErr error
+		snap.WithHave(protocol.LocalDeviceID, func(intf protocol.FileIntf) bool {
+			fi := intf.(protocol.FileInfo)
+			size, err := sizeOfEncryptedTrailer(filesystem, fi.Name)
+			if err != nil {
+				// Best effort: If we fail to read a file, it will show as
+				// locally changed on next scan.
+				return true
+			}
+			fi.EncryptionTrailerSize = size
+			batch.Append(fi)
+			err = batch.FlushIfFull()
+			if err != nil {
+				innerErr = err
+				return false
+			}
+			return true
+		})
+		snap.Release()
+		if innerErr != nil {
+			return innerErr
+		}
+		err = batch.Flush()
+		if err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
+// sizeOfEncryptedTrailer returns the size of the encrypted trailer on disk.
+// This amount of bytes should be subtracted from the file size to get the
+// original file size.
+func sizeOfEncryptedTrailer(fs fs.Filesystem, name string) (int, error) {
+	f, err := fs.Open(name)
+	if err != nil {
+		return 0, err
+	}
+	defer f.Close()
+	if _, err := f.Seek(-4, io.SeekEnd); err != nil {
+		return 0, err
+	}
+	var buf [4]byte
+	if _, err := io.ReadFull(f, buf[:]); err != nil {
+		return 0, err
+	}
+	// The stored size is the size of the encrypted data.
+	size := int(binary.BigEndian.Uint32(buf[:]))
+	// We add the size of the length word itself as well.
+	return size + 4, nil
+}

+ 5 - 0
lib/syncthing/syncthing.go

@@ -243,6 +243,11 @@ func (a *App) startup() error {
 		miscDB.PutString("prevVersion", build.Version)
 	}
 
+	if err := globalMigration(a.ll, a.cfg); err != nil {
+		l.Warnln("Global migration:", err)
+		return err
+	}
+
 	m := model.NewModel(a.cfg, a.myID, "syncthing", build.Version, a.ll, protectedFiles, a.evLogger)
 
 	if a.opts.DeadlockTimeoutS > 0 {

+ 4 - 0
proto/lib/protocol/bep.proto

@@ -123,6 +123,10 @@ message FileInfo {
     // etc changed). This is host-local, not sent over the wire.
     int64 inode_change_ns = 1002;
 
+    // The size of the data appended to the encrypted file on disk. This is
+    // host-local, not sent over the wire.
+    int32 encryption_trailer_size = 1003;
+
     bool deleted        = 6;
     bool invalid        = 7 [(ext.goname) = "RawInvalid"];
     bool no_permissions = 8;