Merge branch 'hotfix-2.4.3'

tsolomko · May 25, 2017 · 0226de2 · 0226de2
2 parents 5ba3593 + ff0a2fc
commit 0226de2
Show file tree

Hide file tree

Showing 69 changed files with 315 additions and 312 deletions.
diff --git a/.jazzy.yaml b/.jazzy.yaml
@@ -3,9 +3,9 @@ clean: true
 exclude: Tests/
 author: Timofey Solomko
 module: SWCompression
-module_version: 2.4.2
+module_version: 2.4.3
 copyright: '© 2017 Timofey Solomko'
 readme: README.md
 github_url: https://github.com/tsolomko/SWCompression
-github_file_prefix: https://github.com/tsolomko/SWCompression/tree/v2.4.2
+github_file_prefix: https://github.com/tsolomko/SWCompression/tree/v2.4.3
 theme: fullwidth
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,8 @@
 # Changelog
+v2.4.3
+----------------
+- Fixed incorrect calculation of header's checksum for GZip archives.
+
 v2.4.2
 ----------------
 - Fixed a problem, where ZipEntry.fileName was returning fileComment instead.

diff --git a/SWCompression.podspec b/SWCompression.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
   s.name         = "SWCompression"
-  s.version      = "2.4.2"
+  s.version      = "2.4.3"
   s.summary      = "Framework with implementations in Swift of different (de)compression algorithms"
 
   s.description  = <<-DESC

diff --git a/Sources/GzipArchive.swift b/Sources/GzipArchive.swift
@@ -92,7 +92,6 @@ public struct GzipHeader {
         - Throws: `GzipError`. It may indicate that either the data is damaged or
         it might not be compressed with gzip at all.
     */
-
     public init(archiveData: Data) throws {
         let pointerData = DataWithPointer(data: archiveData, bitOrder: .reversed)
         try self.init(pointerData)
@@ -144,9 +143,9 @@ public struct GzipHeader {
             var fnameBytes: [UInt8] = []
             while true {
                 let byte = pointerData.alignedByte()
+                headerBytes.append(byte)
                 guard byte != 0 else { break }
                 fnameBytes.append(byte)
-                headerBytes.append(byte)
             }
             self.originalFileName = String(data: Data(fnameBytes), encoding: .utf8)
         } else {
@@ -158,9 +157,9 @@ public struct GzipHeader {
             var fcommentBytes: [UInt8] = []
             while true {
                 let byte = pointerData.alignedByte()
+                headerBytes.append(byte)
                 guard byte != 0 else { break }
                 fcommentBytes.append(byte)
-                headerBytes.append(byte)
             }
             self.comment = String(data: Data(fcommentBytes), encoding: .utf8)
         } else {

diff --git a/Sources/Service/Info-iOS.plist b/Sources/Service/Info-iOS.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.4.2</string>
+	<string>2.4.3</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>

diff --git a/Sources/Service/Info-tvOS.plist b/Sources/Service/Info-tvOS.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.4.2</string>
+	<string>2.4.3</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>

diff --git a/Sources/Service/Info-watchOS.plist b/Sources/Service/Info-watchOS.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.4.2</string>
+	<string>2.4.3</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>

diff --git a/Sources/Service/Info.plist b/Sources/Service/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.4.2</string>
+	<string>2.4.3</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSHumanReadableCopyright</key>

diff --git a/docs/Classes.html b/docs/Classes.html
@@ -186,7 +186,7 @@ <h4>Declaration</h4>
                         </div>
                       </div>
                       <div class="slightly-smaller">
-                        <a href="https://github.com/tsolomko/SWCompression/tree/v2.4.2/Sources/LZMA2.swift#L38-L106">Show on GitHub</a>
+                        <a href="https://github.com/tsolomko/SWCompression/tree/v2.4.3/Sources/LZMA2.swift#L38-L106">Show on GitHub</a>
                       </div>
                     </section>
                   </div>
@@ -221,7 +221,7 @@ <h4>Declaration</h4>
                         </div>
                       </div>
                       <div class="slightly-smaller">
-                        <a href="https://github.com/tsolomko/SWCompression/tree/v2.4.2/Sources/GzipArchive.swift#L182-L268">Show on GitHub</a>
+                        <a href="https://github.com/tsolomko/SWCompression/tree/v2.4.3/Sources/GzipArchive.swift#L181-L267">Show on GitHub</a>
                       </div>
                     </section>
                   </div>
@@ -256,7 +256,7 @@ <h4>Declaration</h4>
                         </div>
                       </div>
                       <div class="slightly-smaller">
-                        <a href="https://github.com/tsolomko/SWCompression/tree/v2.4.2/Sources/ZipContainer.swift#L77-L236">Show on GitHub</a>
+                        <a href="https://github.com/tsolomko/SWCompression/tree/v2.4.3/Sources/ZipContainer.swift#L77-L236">Show on GitHub</a>
                       </div>
                     </section>
                   </div>
@@ -291,7 +291,7 @@ <h4>Declaration</h4>
                         </div>
                       </div>
                       <div class="slightly-smaller">
-                        <a href="https://github.com/tsolomko/SWCompression/tree/v2.4.2/Sources/LZMA.swift#L44-L90">Show on GitHub</a>
+                        <a href="https://github.com/tsolomko/SWCompression/tree/v2.4.3/Sources/LZMA.swift#L44-L90">Show on GitHub</a>
                       </div>
                     </section>
                   </div>
@@ -326,7 +326,7 @@ <h4>Declaration</h4>
                         </div>
                       </div>
                       <div class="slightly-smaller">
-                        <a href="https://github.com/tsolomko/SWCompression/tree/v2.4.2/Sources/ZlibArchive.swift#L125-L189">Show on GitHub</a>
+                        <a href="https://github.com/tsolomko/SWCompression/tree/v2.4.3/Sources/ZlibArchive.swift#L125-L189">Show on GitHub</a>
                       </div>
                     </section>
                   </div>
@@ -361,7 +361,7 @@ <h4>Declaration</h4>
                         </div>
                       </div>
                       <div class="slightly-smaller">
-                        <a href="https://github.com/tsolomko/SWCompression/tree/v2.4.2/Sources/Deflate.swift#L32-L518">Show on GitHub</a>
+                        <a href="https://github.com/tsolomko/SWCompression/tree/v2.4.3/Sources/Deflate.swift#L32-L518">Show on GitHub</a>
                       </div>
                     </section>
                   </div>
@@ -396,7 +396,7 @@ <h4>Declaration</h4>
                         </div>
                       </div>
                       <div class="slightly-smaller">
-                        <a href="https://github.com/tsolomko/SWCompression/tree/v2.4.2/Sources/BZip2.swift#L47-L277">Show on GitHub</a>
+                        <a href="https://github.com/tsolomko/SWCompression/tree/v2.4.3/Sources/BZip2.swift#L47-L277">Show on GitHub</a>
                       </div>
                     </section>
                   </div>
@@ -431,7 +431,7 @@ <h4>Declaration</h4>
                         </div>
                       </div>
                       <div class="slightly-smaller">
-                        <a href="https://github.com/tsolomko/SWCompression/tree/v2.4.2/Sources/XZArchive.swift#L58-L346">Show on GitHub</a>
+                        <a href="https://github.com/tsolomko/SWCompression/tree/v2.4.3/Sources/XZArchive.swift#L58-L346">Show on GitHub</a>
                       </div>
                     </section>
                   </div>
@@ -445,7 +445,7 @@ <h4>Declaration</h4>
     </div>
     <section class="footer">
       <p>© 2017 Timofey Solomko</p>
-      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.8.1</a>, a <a class="link" href="http://realm.io" target="_blank" rel="external">Realm</a> project.</p>
+      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.8.2</a>, a <a class="link" href="http://realm.io" target="_blank" rel="external">Realm</a> project.</p>
     </section>
   </body>
 </div>

diff --git a/docs/Classes/BZip2.html b/docs/Classes/BZip2.html
@@ -223,7 +223,7 @@ <h4>Return Value</h4>
                         <p>Decompressed data.</p>
                       </div>
                       <div class="slightly-smaller">
-                        <a href="https://github.com/tsolomko/SWCompression/tree/v2.4.2/Sources/BZip2.swift#L61-L97">Show on GitHub</a>
+                        <a href="https://github.com/tsolomko/SWCompression/tree/v2.4.3/Sources/BZip2.swift#L61-L97">Show on GitHub</a>
                       </div>
                     </section>
                   </div>
@@ -237,7 +237,7 @@ <h4>Return Value</h4>
     </div>
     <section class="footer">
       <p>© 2017 Timofey Solomko</p>
-      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.8.1</a>, a <a class="link" href="http://realm.io" target="_blank" rel="external">Realm</a> project.</p>
+      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.8.2</a>, a <a class="link" href="http://realm.io" target="_blank" rel="external">Realm</a> project.</p>
     </section>
   </body>
 </div>

diff --git a/docs/Classes/Deflate.html b/docs/Classes/Deflate.html
@@ -223,7 +223,7 @@ <h4>Return Value</h4>
                         <p>Decompressed data.</p>
                       </div>
                       <div class="slightly-smaller">
-                        <a href="https://github.com/tsolomko/SWCompression/tree/v2.4.2/Sources/Deflate.swift#L79-L83">Show on GitHub</a>
+                        <a href="https://github.com/tsolomko/SWCompression/tree/v2.4.3/Sources/Deflate.swift#L79-L83">Show on GitHub</a>
                       </div>
                     </section>
                   </div>
@@ -263,7 +263,7 @@ <h4>Declaration</h4>
                         </div>
                       </div>
                       <div class="slightly-smaller">
-                        <a href="https://github.com/tsolomko/SWCompression/tree/v2.4.2/Sources/Deflate.swift#L271-L327">Show on GitHub</a>
+                        <a href="https://github.com/tsolomko/SWCompression/tree/v2.4.3/Sources/Deflate.swift#L271-L327">Show on GitHub</a>
                       </div>
                     </section>
                   </div>
@@ -277,7 +277,7 @@ <h4>Declaration</h4>
     </div>
     <section class="footer">
       <p>© 2017 Timofey Solomko</p>
-      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.8.1</a>, a <a class="link" href="http://realm.io" target="_blank" rel="external">Realm</a> project.</p>
+      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.8.2</a>, a <a class="link" href="http://realm.io" target="_blank" rel="external">Realm</a> project.</p>
     </section>
   </body>
 </div>

diff --git a/docs/Classes/GzipArchive.html b/docs/Classes/GzipArchive.html
@@ -230,7 +230,7 @@ <h4>Return Value</h4>
                         <p>Unarchived data.</p>
                       </div>
                       <div class="slightly-smaller">
-                        <a href="https://github.com/tsolomko/SWCompression/tree/v2.4.2/Sources/GzipArchive.swift#L200-L221">Show on GitHub</a>
+                        <a href="https://github.com/tsolomko/SWCompression/tree/v2.4.3/Sources/GzipArchive.swift#L199-L220">Show on GitHub</a>
                       </div>
                     </section>
                   </div>
@@ -298,7 +298,7 @@ <h4>Return Value</h4>
                         <p>Data object with resulting archive.</p>
                       </div>
                       <div class="slightly-smaller">
-                        <a href="https://github.com/tsolomko/SWCompression/tree/v2.4.2/Sources/GzipArchive.swift#L239-L266">Show on GitHub</a>
+                        <a href="https://github.com/tsolomko/SWCompression/tree/v2.4.3/Sources/GzipArchive.swift#L238-L265">Show on GitHub</a>
                       </div>
                     </section>
                   </div>
@@ -312,7 +312,7 @@ <h4>Return Value</h4>
     </div>
     <section class="footer">
       <p>© 2017 Timofey Solomko</p>
-      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.8.1</a>, a <a class="link" href="http://realm.io" target="_blank" rel="external">Realm</a> project.</p>
+      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.8.2</a>, a <a class="link" href="http://realm.io" target="_blank" rel="external">Realm</a> project.</p>
     </section>
   </body>
 </div>

diff --git a/docs/Classes/LZMA.html b/docs/Classes/LZMA.html
@@ -223,7 +223,7 @@ <h4>Return Value</h4>
                         <p>Decompressed data.</p>
                       </div>
                       <div class="slightly-smaller">
-                        <a href="https://github.com/tsolomko/SWCompression/tree/v2.4.2/Sources/LZMA.swift#L58-L63">Show on GitHub</a>
+                        <a href="https://github.com/tsolomko/SWCompression/tree/v2.4.3/Sources/LZMA.swift#L58-L63">Show on GitHub</a>
                       </div>
                     </section>
                   </div>
@@ -237,7 +237,7 @@ <h4>Return Value</h4>
     </div>
     <section class="footer">
       <p>© 2017 Timofey Solomko</p>
-      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.8.1</a>, a <a class="link" href="http://realm.io" target="_blank" rel="external">Realm</a> project.</p>
+      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.8.2</a>, a <a class="link" href="http://realm.io" target="_blank" rel="external">Realm</a> project.</p>
     </section>
   </body>
 </div>

diff --git a/docs/Classes/LZMA2.html b/docs/Classes/LZMA2.html
@@ -223,7 +223,7 @@ <h4>Return Value</h4>
                         <p>Decompressed data.</p>
                       </div>
                       <div class="slightly-smaller">
-                        <a href="https://github.com/tsolomko/SWCompression/tree/v2.4.2/Sources/LZMA2.swift#L52-L59">Show on GitHub</a>
+                        <a href="https://github.com/tsolomko/SWCompression/tree/v2.4.3/Sources/LZMA2.swift#L52-L59">Show on GitHub</a>
                       </div>
                     </section>
                   </div>
@@ -237,7 +237,7 @@ <h4>Return Value</h4>
     </div>
     <section class="footer">
       <p>© 2017 Timofey Solomko</p>
-      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.8.1</a>, a <a class="link" href="http://realm.io" target="_blank" rel="external">Realm</a> project.</p>
+      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.8.2</a>, a <a class="link" href="http://realm.io" target="_blank" rel="external">Realm</a> project.</p>
     </section>
   </body>
 </div>

diff --git a/docs/Classes/XZArchive.html b/docs/Classes/XZArchive.html
@@ -227,7 +227,7 @@ <h4>Return Value</h4>
                         <p>Unarchived data.</p>
                       </div>
                       <div class="slightly-smaller">
-                        <a href="https://github.com/tsolomko/SWCompression/tree/v2.4.2/Sources/XZArchive.swift#L76-L143">Show on GitHub</a>
+                        <a href="https://github.com/tsolomko/SWCompression/tree/v2.4.3/Sources/XZArchive.swift#L76-L143">Show on GitHub</a>
                       </div>
                     </section>
                   </div>
@@ -241,7 +241,7 @@ <h4>Return Value</h4>
     </div>
     <section class="footer">
       <p>© 2017 Timofey Solomko</p>
-      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.8.1</a>, a <a class="link" href="http://realm.io" target="_blank" rel="external">Realm</a> project.</p>
+      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.8.2</a>, a <a class="link" href="http://realm.io" target="_blank" rel="external">Realm</a> project.</p>
     </section>
   </body>
 </div>

diff --git a/docs/Classes/ZipContainer.html b/docs/Classes/ZipContainer.html
@@ -192,7 +192,7 @@ <h4>Declaration</h4>
                         </div>
                       </div>
                       <div class="slightly-smaller">
-                        <a href="https://github.com/tsolomko/SWCompression/tree/v2.4.2/Sources/ZipContainer.swift#L82">Show on GitHub</a>
+                        <a href="https://github.com/tsolomko/SWCompression/tree/v2.4.3/Sources/ZipContainer.swift#L82">Show on GitHub</a>
                       </div>
                     </section>
                   </div>
@@ -267,7 +267,7 @@ <h4>Parameters</h4>
                         </table>
                       </div>
                       <div class="slightly-smaller">
-                        <a href="https://github.com/tsolomko/SWCompression/tree/v2.4.2/Sources/ZipContainer.swift#L103-L132">Show on GitHub</a>
+                        <a href="https://github.com/tsolomko/SWCompression/tree/v2.4.3/Sources/ZipContainer.swift#L103-L132">Show on GitHub</a>
                       </div>
                     </section>
                   </div>
@@ -328,7 +328,7 @@ <h4>Parameters</h4>
                         </table>
                       </div>
                       <div class="slightly-smaller">
-                        <a href="https://github.com/tsolomko/SWCompression/tree/v2.4.2/Sources/ZipContainer.swift#L145-L204">Show on GitHub</a>
+                        <a href="https://github.com/tsolomko/SWCompression/tree/v2.4.3/Sources/ZipContainer.swift#L145-L204">Show on GitHub</a>
                       </div>
                     </section>
                   </div>
@@ -407,7 +407,7 @@ <h4>Return Value</h4>
                         <p>Array of pairs (tuples) where first member is <code>entryName</code> and second member is <code>entryData</code>.</p>
                       </div>
                       <div class="slightly-smaller">
-                        <a href="https://github.com/tsolomko/SWCompression/tree/v2.4.2/Sources/ZipContainer.swift#L227-L234">Show on GitHub</a>
+                        <a href="https://github.com/tsolomko/SWCompression/tree/v2.4.3/Sources/ZipContainer.swift#L227-L234">Show on GitHub</a>
                       </div>
                     </section>
                   </div>
@@ -421,7 +421,7 @@ <h4>Return Value</h4>
     </div>
     <section class="footer">
       <p>© 2017 Timofey Solomko</p>
-      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.8.1</a>, a <a class="link" href="http://realm.io" target="_blank" rel="external">Realm</a> project.</p>
+      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.8.2</a>, a <a class="link" href="http://realm.io" target="_blank" rel="external">Realm</a> project.</p>
     </section>
   </body>
 </div>