Changed magic bytes to match the updated spec. Filename

suffix wasn't changed yet.

diff --git a/src/liblzma/common/auto_decoder.c b/src/liblzma/common/auto_decoder.c
index 05a9fbb..dd10832 100644 (file)
--- a/src/liblzma/common/auto_decoder.c
+++ b/src/liblzma/common/auto_decoder.c
@@ -52,10 +52,10 @@ auto_decode(lzma_coder *coder, lzma_allocator *allocator,
                coder->sequence = SEQ_CODE;
 
                // Detect the file format. For now this is simple, since if
-               // it doesn't start with 0xFF (the first magic byte of the
+               // it doesn't start with 0xFD (the first magic byte of the
                // new format), it has to be LZMA_Alone, or something that
                // we don't support at all.
-               if (in[*in_pos] == 0xFF) {
+               if (in[*in_pos] == 0xFD) {
                        return_if_error(lzma_stream_decoder_init(
                                        &coder->next, allocator,
                                        coder->memlimit, coder->flags));

diff --git a/src/liblzma/common/stream_flags_common.c b/src/liblzma/common/stream_flags_common.c
index 1f7220e..ae58771 100644 (file)
--- a/src/liblzma/common/stream_flags_common.c
+++ b/src/liblzma/common/stream_flags_common.c
@@ -20,7 +20,7 @@
 #include "stream_flags_common.h"
 
 
-const uint8_t lzma_header_magic[6] = { 0xFF, 0x4C, 0x5A, 0x4D, 0x41, 0x00 };
+const uint8_t lzma_header_magic[6] = { 0xFD, 0x37, 0x7A, 0x58, 0x5A, 0x00 };
 const uint8_t lzma_footer_magic[2] = { 0x59, 0x5A };
 
 

diff --git a/tests/files/bad-0-backward_size.lzma b/tests/files/bad-0-backward_size.lzma
index 07c4695..2b46fa9 100644 (file)
Binary files a/tests/files/bad-0-backward_size.lzma and b/tests/files/bad-0-backward_size.lzma differ

diff --git a/tests/files/bad-0-empty-truncated.lzma b/tests/files/bad-0-empty-truncated.lzma
index 15b6fe3..f879af8 100644 (file)
Binary files a/tests/files/bad-0-empty-truncated.lzma and b/tests/files/bad-0-empty-truncated.lzma differ

diff --git a/tests/files/bad-0-nonempty_index.lzma b/tests/files/bad-0-nonempty_index.lzma
index 2a612c6..ed6e81f 100644 (file)
Binary files a/tests/files/bad-0-nonempty_index.lzma and b/tests/files/bad-0-nonempty_index.lzma differ

diff --git a/tests/files/bad-0cat-alone.lzma b/tests/files/bad-0cat-alone.lzma
index 650c67f..a915a3a 100644 (file)
Binary files a/tests/files/bad-0cat-alone.lzma and b/tests/files/bad-0cat-alone.lzma differ

diff --git a/tests/files/bad-0catpad-empty.lzma b/tests/files/bad-0catpad-empty.lzma
index 33892a2..97c1330 100644 (file)
Binary files a/tests/files/bad-0catpad-empty.lzma and b/tests/files/bad-0catpad-empty.lzma differ

diff --git a/tests/files/bad-0pad-empty.lzma b/tests/files/bad-0pad-empty.lzma
index c5b985c..45e00b7 100644 (file)
Binary files a/tests/files/bad-0pad-empty.lzma and b/tests/files/bad-0pad-empty.lzma differ

diff --git a/tests/files/bad-1-block_header-1.lzma b/tests/files/bad-1-block_header-1.lzma
index a68119f..e126a41 100644 (file)
Binary files a/tests/files/bad-1-block_header-1.lzma and b/tests/files/bad-1-block_header-1.lzma differ

diff --git a/tests/files/bad-1-block_header-2.lzma b/tests/files/bad-1-block_header-2.lzma
index 7a2eb5e..e3e8166 100644 (file)
Binary files a/tests/files/bad-1-block_header-2.lzma and b/tests/files/bad-1-block_header-2.lzma differ

diff --git a/tests/files/bad-1-block_header-3.lzma b/tests/files/bad-1-block_header-3.lzma
index 801a05c..1795503 100644 (file)
Binary files a/tests/files/bad-1-block_header-3.lzma and b/tests/files/bad-1-block_header-3.lzma differ

diff --git a/tests/files/bad-1-block_header-4.lzma b/tests/files/bad-1-block_header-4.lzma
index 0d00545..be31ce0 100644 (file)
Binary files a/tests/files/bad-1-block_header-4.lzma and b/tests/files/bad-1-block_header-4.lzma differ

diff --git a/tests/files/bad-1-check-crc32.lzma b/tests/files/bad-1-check-crc32.lzma
index b82b659..f8ec7d6 100644 (file)
Binary files a/tests/files/bad-1-check-crc32.lzma and b/tests/files/bad-1-check-crc32.lzma differ

diff --git a/tests/files/bad-1-check-crc64.lzma b/tests/files/bad-1-check-crc64.lzma
index 5793892..eb406ce 100644 (file)
Binary files a/tests/files/bad-1-check-crc64.lzma and b/tests/files/bad-1-check-crc64.lzma differ

diff --git a/tests/files/bad-1-check-sha256.lzma b/tests/files/bad-1-check-sha256.lzma
index e47609c..e33cee8 100644 (file)
Binary files a/tests/files/bad-1-check-sha256.lzma and b/tests/files/bad-1-check-sha256.lzma differ

diff --git a/tests/files/bad-1-lzma2-1.lzma b/tests/files/bad-1-lzma2-1.lzma
index 0296e5f..f7ff6dd 100644 (file)
Binary files a/tests/files/bad-1-lzma2-1.lzma and b/tests/files/bad-1-lzma2-1.lzma differ

diff --git a/tests/files/bad-1-lzma2-2.lzma b/tests/files/bad-1-lzma2-2.lzma
index faefa1b..3b27919 100644 (file)
Binary files a/tests/files/bad-1-lzma2-2.lzma and b/tests/files/bad-1-lzma2-2.lzma differ

diff --git a/tests/files/bad-1-lzma2-3.lzma b/tests/files/bad-1-lzma2-3.lzma
index fbe3297..e1a2083 100644 (file)
Binary files a/tests/files/bad-1-lzma2-3.lzma and b/tests/files/bad-1-lzma2-3.lzma differ

diff --git a/tests/files/bad-1-lzma2-4.lzma b/tests/files/bad-1-lzma2-4.lzma
index ef0dc49..e0eb7aa 100644 (file)
Binary files a/tests/files/bad-1-lzma2-4.lzma and b/tests/files/bad-1-lzma2-4.lzma differ

diff --git a/tests/files/bad-1-lzma2-5.lzma b/tests/files/bad-1-lzma2-5.lzma
index 797b7d3..437aeed 100644 (file)
Binary files a/tests/files/bad-1-lzma2-5.lzma and b/tests/files/bad-1-lzma2-5.lzma differ

diff --git a/tests/files/bad-1-lzma2-6.lzma b/tests/files/bad-1-lzma2-6.lzma
index 73db5bf..f87cab6 100644 (file)
Binary files a/tests/files/bad-1-lzma2-6.lzma and b/tests/files/bad-1-lzma2-6.lzma differ

diff --git a/tests/files/bad-1-lzma2-7.lzma b/tests/files/bad-1-lzma2-7.lzma
index 845da22..1a487ca 100644 (file)
Binary files a/tests/files/bad-1-lzma2-7.lzma and b/tests/files/bad-1-lzma2-7.lzma differ

diff --git a/tests/files/bad-1-stream_flags-1.lzma b/tests/files/bad-1-stream_flags-1.lzma
index cd0d6f4..fd77d47 100644 (file)
Binary files a/tests/files/bad-1-stream_flags-1.lzma and b/tests/files/bad-1-stream_flags-1.lzma differ

diff --git a/tests/files/bad-1-stream_flags-2.lzma b/tests/files/bad-1-stream_flags-2.lzma
index 63dec85..a4a582a 100644 (file)
Binary files a/tests/files/bad-1-stream_flags-2.lzma and b/tests/files/bad-1-stream_flags-2.lzma differ

diff --git a/tests/files/bad-1-stream_flags-3.lzma b/tests/files/bad-1-stream_flags-3.lzma
index 3b306ff..f10b8d0 100644 (file)
Binary files a/tests/files/bad-1-stream_flags-3.lzma and b/tests/files/bad-1-stream_flags-3.lzma differ

diff --git a/tests/files/bad-1-vli-1.lzma b/tests/files/bad-1-vli-1.lzma
index 7bcdd56..e2a08b9 100644 (file)
Binary files a/tests/files/bad-1-vli-1.lzma and b/tests/files/bad-1-vli-1.lzma differ

diff --git a/tests/files/bad-1-vli-2.lzma b/tests/files/bad-1-vli-2.lzma
index af2b614..604e818 100644 (file)
Binary files a/tests/files/bad-1-vli-2.lzma and b/tests/files/bad-1-vli-2.lzma differ

diff --git a/tests/files/bad-2-compressed_data_padding.lzma b/tests/files/bad-2-compressed_data_padding.lzma
index c9de474..1d0f58b 100644 (file)
Binary files a/tests/files/bad-2-compressed_data_padding.lzma and b/tests/files/bad-2-compressed_data_padding.lzma differ

diff --git a/tests/files/bad-2-index-1.lzma b/tests/files/bad-2-index-1.lzma
index cc6ba6d..42efda0 100644 (file)
Binary files a/tests/files/bad-2-index-1.lzma and b/tests/files/bad-2-index-1.lzma differ

diff --git a/tests/files/bad-2-index-2.lzma b/tests/files/bad-2-index-2.lzma
index 8ce40b6..ee5e89c 100644 (file)
Binary files a/tests/files/bad-2-index-2.lzma and b/tests/files/bad-2-index-2.lzma differ

diff --git a/tests/files/bad-2-index-3.lzma b/tests/files/bad-2-index-3.lzma
index de27f55..f51eaad 100644 (file)
Binary files a/tests/files/bad-2-index-3.lzma and b/tests/files/bad-2-index-3.lzma differ

diff --git a/tests/files/bad-2-index-4.lzma b/tests/files/bad-2-index-4.lzma
index 0a27347..1b5b78e 100644 (file)
Binary files a/tests/files/bad-2-index-4.lzma and b/tests/files/bad-2-index-4.lzma differ

diff --git a/tests/files/good-0-empty.lzma b/tests/files/good-0-empty.lzma
index 3256fe1..83b95e0 100644 (file)
Binary files a/tests/files/good-0-empty.lzma and b/tests/files/good-0-empty.lzma differ

diff --git a/tests/files/good-0cat-empty.lzma b/tests/files/good-0cat-empty.lzma
index ef8e106..e6fc314 100644 (file)
Binary files a/tests/files/good-0cat-empty.lzma and b/tests/files/good-0cat-empty.lzma differ

diff --git a/tests/files/good-0catpad-empty.lzma b/tests/files/good-0catpad-empty.lzma
index 7e5a81d..4f86b7d 100644 (file)
Binary files a/tests/files/good-0catpad-empty.lzma and b/tests/files/good-0catpad-empty.lzma differ

diff --git a/tests/files/good-0pad-empty.lzma b/tests/files/good-0pad-empty.lzma
index 3bbc241..c51e3a6 100644 (file)
Binary files a/tests/files/good-0pad-empty.lzma and b/tests/files/good-0pad-empty.lzma differ

diff --git a/tests/files/good-1-3delta-lzma2.lzma b/tests/files/good-1-3delta-lzma2.lzma
index 2724ed4..3edb480 100644 (file)
Binary files a/tests/files/good-1-3delta-lzma2.lzma and b/tests/files/good-1-3delta-lzma2.lzma differ

diff --git a/tests/files/good-1-block_header-1.lzma b/tests/files/good-1-block_header-1.lzma
index 0eeaf46..c0cc720 100644 (file)
Binary files a/tests/files/good-1-block_header-1.lzma and b/tests/files/good-1-block_header-1.lzma differ

diff --git a/tests/files/good-1-block_header-2.lzma b/tests/files/good-1-block_header-2.lzma
index 7afa25f..5eb8575 100644 (file)
Binary files a/tests/files/good-1-block_header-2.lzma and b/tests/files/good-1-block_header-2.lzma differ

diff --git a/tests/files/good-1-block_header-3.lzma b/tests/files/good-1-block_header-3.lzma
index 85a1f8e..5e8dc78 100644 (file)
Binary files a/tests/files/good-1-block_header-3.lzma and b/tests/files/good-1-block_header-3.lzma differ

diff --git a/tests/files/good-1-check-crc32.lzma b/tests/files/good-1-check-crc32.lzma
index b586af1..949a215 100644 (file)
Binary files a/tests/files/good-1-check-crc32.lzma and b/tests/files/good-1-check-crc32.lzma differ

diff --git a/tests/files/good-1-check-crc64.lzma b/tests/files/good-1-check-crc64.lzma
index 9b8cc1f..6102c94 100644 (file)
Binary files a/tests/files/good-1-check-crc64.lzma and b/tests/files/good-1-check-crc64.lzma differ

diff --git a/tests/files/good-1-check-none.lzma b/tests/files/good-1-check-none.lzma
index 7b7ccd5..aab057d 100644 (file)
Binary files a/tests/files/good-1-check-none.lzma and b/tests/files/good-1-check-none.lzma differ

diff --git a/tests/files/good-1-check-sha256.lzma b/tests/files/good-1-check-sha256.lzma
index 0919afd..141a481 100644 (file)
Binary files a/tests/files/good-1-check-sha256.lzma and b/tests/files/good-1-check-sha256.lzma differ

diff --git a/tests/files/good-1-delta-lzma2.tiff.lzma b/tests/files/good-1-delta-lzma2.tiff.lzma
index d52b70d..744fb8d 100644 (file)
Binary files a/tests/files/good-1-delta-lzma2.tiff.lzma and b/tests/files/good-1-delta-lzma2.tiff.lzma differ

diff --git a/tests/files/good-1-lzma2-1.lzma b/tests/files/good-1-lzma2-1.lzma
index 386a1c1..96aff26 100644 (file)
Binary files a/tests/files/good-1-lzma2-1.lzma and b/tests/files/good-1-lzma2-1.lzma differ

diff --git a/tests/files/good-1-lzma2-2.lzma b/tests/files/good-1-lzma2-2.lzma
index 2397a84..19631d4 100644 (file)
Binary files a/tests/files/good-1-lzma2-2.lzma and b/tests/files/good-1-lzma2-2.lzma differ

diff --git a/tests/files/good-1-lzma2-3.lzma b/tests/files/good-1-lzma2-3.lzma
index 096f65c..11c84ee 100644 (file)
Binary files a/tests/files/good-1-lzma2-3.lzma and b/tests/files/good-1-lzma2-3.lzma differ

diff --git a/tests/files/good-1-sparc-lzma2.lzma b/tests/files/good-1-sparc-lzma2.lzma
index bfc7ac0..9111e39 100644 (file)
Binary files a/tests/files/good-1-sparc-lzma2.lzma and b/tests/files/good-1-sparc-lzma2.lzma differ

diff --git a/tests/files/good-1-x86-lzma2.lzma b/tests/files/good-1-x86-lzma2.lzma
index 62fb01a..4fbd0ee 100644 (file)
Binary files a/tests/files/good-1-x86-lzma2.lzma and b/tests/files/good-1-x86-lzma2.lzma differ

diff --git a/tests/files/good-2-lzma2.lzma b/tests/files/good-2-lzma2.lzma
index 4916530..dd34b66 100644 (file)
Binary files a/tests/files/good-2-lzma2.lzma and b/tests/files/good-2-lzma2.lzma differ

diff --git a/tests/files/unsupported-block_header.lzma b/tests/files/unsupported-block_header.lzma
index 2fa33a5..ee697e4 100644 (file)
Binary files a/tests/files/unsupported-block_header.lzma and b/tests/files/unsupported-block_header.lzma differ

diff --git a/tests/files/unsupported-check.lzma b/tests/files/unsupported-check.lzma
index 6d8a295..e2fe486 100644 (file)
Binary files a/tests/files/unsupported-check.lzma and b/tests/files/unsupported-check.lzma differ

diff --git a/tests/files/unsupported-filter_flags-1.lzma b/tests/files/unsupported-filter_flags-1.lzma
index c70571f..b4acab2 100644 (file)
Binary files a/tests/files/unsupported-filter_flags-1.lzma and b/tests/files/unsupported-filter_flags-1.lzma differ

diff --git a/tests/files/unsupported-filter_flags-2.lzma b/tests/files/unsupported-filter_flags-2.lzma
index 1fd68f9..fa907dc 100644 (file)
Binary files a/tests/files/unsupported-filter_flags-2.lzma and b/tests/files/unsupported-filter_flags-2.lzma differ

diff --git a/tests/files/unsupported-filter_flags-3.lzma b/tests/files/unsupported-filter_flags-3.lzma
index dcaf21f..939ab5f 100644 (file)
Binary files a/tests/files/unsupported-filter_flags-3.lzma and b/tests/files/unsupported-filter_flags-3.lzma differ