@@ -1142,15 +1142,15 @@ private long TestLocalHeader(ZipEntry entry, HeaderTest tests)
11421142 size = localExtraData . ReadLong ( ) ;
11431143 compressedSize = localExtraData . ReadLong ( ) ;
11441144
1145- if ( localFlags . Includes ( GeneralBitFlags . Descriptor ) )
1145+ if ( localFlags . HasAny ( GeneralBitFlags . Descriptor ) )
11461146 {
11471147 // These may be valid if patched later
1148- if ( ( size != - 1 ) && ( size != entry . Size ) )
1148+ if ( ( size > 0 ) && ( size != entry . Size ) )
11491149 {
11501150 throw new ZipException ( "Size invalid for descriptor" ) ;
11511151 }
11521152
1153- if ( ( compressedSize != - 1 ) && ( compressedSize != entry . CompressedSize ) )
1153+ if ( ( compressedSize > 0 ) && ( compressedSize != entry . CompressedSize ) )
11541154 {
11551155 throw new ZipException ( "Compressed size invalid for descriptor" ) ;
11561156 }
@@ -1181,9 +1181,7 @@ private long TestLocalHeader(ZipEntry entry, HeaderTest tests)
11811181 throw new ZipException ( $ "Version required to extract this entry not supported ({ extractVersion } )") ;
11821182 }
11831183
1184- const GeneralBitFlags notSupportedFlags = GeneralBitFlags . Patched | GeneralBitFlags . StrongEncryption |
1185- GeneralBitFlags . EnhancedCompress | GeneralBitFlags . HeaderMasked ;
1186- if ( localFlags . Includes ( notSupportedFlags ) )
1184+ if ( localFlags . HasAny ( GeneralBitFlags . Patched | GeneralBitFlags . StrongEncryption | GeneralBitFlags . EnhancedCompress | GeneralBitFlags . HeaderMasked ) )
11871185 {
11881186 throw new ZipException ( $ "The library does not support the zip features required to extract this entry ({ localFlags & notSupportedFlags : F} )") ;
11891187 }
@@ -1215,21 +1213,21 @@ private long TestLocalHeader(ZipEntry entry, HeaderTest tests)
12151213 var localEncoding = _stringCodec . ZipInputEncoding ( localFlags ) ;
12161214
12171215 // Local entry flags dont have reserved bit set on.
1218- if ( localFlags . Includes ( GeneralBitFlags . ReservedPKware4 | GeneralBitFlags . ReservedPkware14 | GeneralBitFlags . ReservedPkware15 ) )
1216+ if ( localFlags . HasAny ( GeneralBitFlags . ReservedPKware4 | GeneralBitFlags . ReservedPkware14 | GeneralBitFlags . ReservedPkware15 ) )
12191217 {
12201218 throw new ZipException ( "Reserved bit flags cannot be set." ) ;
12211219 }
12221220
12231221 // Encryption requires extract version >= 20
1224- if ( localFlags . Includes ( GeneralBitFlags . Encrypted ) && extractVersion < 20 )
1222+ if ( localFlags . HasAny ( GeneralBitFlags . Encrypted ) && extractVersion < 20 )
12251223 {
12261224 throw new ZipException ( $ "Version required to extract this entry is too low for encryption ({ extractVersion } )") ;
12271225 }
12281226
12291227 // Strong encryption requires encryption flag to be set and extract version >= 50.
1230- if ( localFlags . Includes ( GeneralBitFlags . StrongEncryption ) )
1228+ if ( localFlags . HasAny ( GeneralBitFlags . StrongEncryption ) )
12311229 {
1232- if ( ! localFlags . Includes ( GeneralBitFlags . Encrypted ) )
1230+ if ( ! localFlags . HasAny ( GeneralBitFlags . Encrypted ) )
12331231 {
12341232 throw new ZipException ( "Strong encryption flag set but encryption flag is not set" ) ;
12351233 }
@@ -1241,13 +1239,13 @@ private long TestLocalHeader(ZipEntry entry, HeaderTest tests)
12411239 }
12421240
12431241 // Patched entries require extract version >= 27
1244- if ( localFlags . Includes ( GeneralBitFlags . Patched ) && extractVersion < 27 )
1242+ if ( localFlags . HasAny ( GeneralBitFlags . Patched ) && extractVersion < 27 )
12451243 {
12461244 throw new ZipException ( $ "Patched data requires higher version than ({ extractVersion } )") ;
12471245 }
12481246
12491247 // Central header flags match local entry flags.
1250- if ( ! localFlags . Equals ( ( GeneralBitFlags ) entry . Flags ) )
1248+ if ( ( int ) localFlags != entry . Flags )
12511249 {
12521250 throw new ZipException ( $ "Central header/local header flags mismatch ({ ( GeneralBitFlags ) entry . Flags : F} vs { localFlags : F} )") ;
12531251 }
@@ -1264,23 +1262,23 @@ private long TestLocalHeader(ZipEntry entry, HeaderTest tests)
12641262 }
12651263
12661264 // Strong encryption and extract version match
1267- if ( localFlags . Includes ( GeneralBitFlags . StrongEncryption ) )
1265+ if ( localFlags . HasAny ( GeneralBitFlags . StrongEncryption ) )
12681266 {
12691267 if ( extractVersion < 62 )
12701268 {
12711269 throw new ZipException ( "Strong encryption flag set but version not high enough" ) ;
12721270 }
12731271 }
12741272
1275- if ( localFlags . Includes ( GeneralBitFlags . HeaderMasked ) )
1273+ if ( localFlags . HasAny ( GeneralBitFlags . HeaderMasked ) )
12761274 {
12771275 if ( fileTime != 0 || fileDate != 0 )
12781276 {
12791277 throw new ZipException ( "Header masked set but date/time values non-zero" ) ;
12801278 }
12811279 }
12821280
1283- if ( ! localFlags . Includes ( GeneralBitFlags . Descriptor ) )
1281+ if ( ! localFlags . HasAny ( GeneralBitFlags . Descriptor ) )
12841282 {
12851283 if ( crcValue != ( uint ) entry . Crc )
12861284 {
@@ -1350,7 +1348,7 @@ private long TestLocalHeader(ZipEntry entry, HeaderTest tests)
13501348
13511349 // Size can be verified only if it is known in the local header.
13521350 // it will always be known in the central header.
1353- if ( ! localFlags . Includes ( GeneralBitFlags . Descriptor ) ||
1351+ if ( ! localFlags . HasAny ( GeneralBitFlags . Descriptor ) ||
13541352 ( ( size > 0 || compressedSize > 0 ) && entry . Size > 0 ) )
13551353 {
13561354 if ( size != 0 && size != entry . Size )
@@ -2504,7 +2502,7 @@ private void CopyBytes(ZipUpdate update, Stream destination, Stream source,
25042502 /// <returns>The descriptor size, zero if there isn't one.</returns>
25052503 private static int GetDescriptorSize ( ZipUpdate update , bool includingSignature )
25062504 {
2507- if ( ! ( ( GeneralBitFlags ) update . Entry . Flags ) . HasFlag ( GeneralBitFlags . Descriptor ) )
2505+ if ( ! ( ( GeneralBitFlags ) update . Entry . Flags ) . HasAny ( GeneralBitFlags . Descriptor ) )
25082506 return 0 ;
25092507
25102508 var descriptorWithSignature = update . Entry . LocalHeaderRequiresZip64
0 commit comments