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 05a9fbb428b125f3e30ab724a75f2587087828fd..dd108324e04fdc80cfead373fb65bc4dc67f9f94 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 1f7220ec6152f6139e01322f4561d18eb3afabb8..ae587717d427b2b5e3e5d989e53bb6a272c21371 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 07c4695af5bb815198ebbf597349bafa6cb51655..2b46fa937b3e6e770f12973398f01d124f9220f4 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 15b6fe3650a9344012bb507022b72418ae40b3dc..f879af84ac473517a186f80510091273d9ea9676 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 2a612c61904a12fa93fc591710ca7c78260a5909..ed6e81fa0465f28bd06c400814c08d88e28d16b6 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 650c67f08ee39917e1c80ea30b6c9594c0f4e92b..a915a3a1e2b94162ce1dfce9a3981cdecd81db69 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 33892a245ff740251143639f6da059f75db3ca77..97c13302006f2c5d3042284b0807e6a25cae5fe9 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 c5b985c012f6f6b1f52d2d695a3a867379b3196e..45e00b74a3ffbdfc4738b5aea9c52093bca54fe3 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 a68119ffc1c0c9619888b1a94eec1fe625a84d2f..e126a419ca22496a9646a4cbb29d7ed71c633d8d 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 7a2eb5e4dfbc2a825c57b4e621ad5329f0922081..e3e8166d9722a02c4158bbd93d9909471f72552b 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 801a05c11122793a0bf3a408578e024898c1fa84..17955038b4624e8939a82cf9a560cc8cb5823297 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 0d005455f8befd9c6af9e581d48b3f1685b67b51..be31ce048c527f89217d3018a272b6408e7d5004 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 b82b6591c87d2db5c0d3d9b7b1b915a038111c46..f8ec7d61eab64001ed756f9f11837d125938a22e 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 57938927cc4e304659216039a761a0503c3b8dad..eb406ce6f9c772381bdd9b8bf8cbe3ff46213b18 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 e47609cdfc1ba610dd2d36041c0058560e6590bf..e33cee80dee5b8228d1474deae6ac35da4731350 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 0296e5ff76bb69e1a6b9eb915200a181a5367173..f7ff6dd39234e39d92dd3daef6746066f2e34fd4 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 faefa1b4d9c55eaff00ecdbf2271a3040a13e27c..3b2791958c99289ea20e77f051db8d3843ae1a1e 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 fbe3297fd5b469d3a15ed68e9820a28ab94b26fd..e1a2083197a55352139e78b1795c1c202a38493c 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 ef0dc491d8ae856fbfddb300f53003fda15fbe3b..e0eb7aaade0dcbc7a4d4dbb2995567688ee181b7 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 797b7d35fed6086542ce9ff3453eec786b2d8e77..437aeed077ccd1bf178a2a7c86a439eabb93558d 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 73db5bff6b283b43d0a2e7d1dcbbe8de4f737807..f87cab68724f0c93bda2976428e798b7fd528d09 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 845da22ec7024da741b7c0d451323fae20fd1662..1a487ca72fcac9e06eebdca9e27ca7ea2ce0fb2d 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 cd0d6f43c97ada3f487335b15844ebab9e0ba0ba..fd77d4748ce4d6d04c2cac5c862b89e0a8a79c66 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 63dec85bf01edac4d7d0211627f40688348c6e5c..a4a582adff7226c32ab7903a768f1b26e0785c34 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 3b306ff74e5e08949f2c83486e93be4b95c94328..f10b8d001ec375692a949f9ffad42fcfb2bd0f58 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 7bcdd568fc157074ba5aa9bd7df41e7c34c06371..e2a08b9e30e7d6fb531d4dff2f735c0a6957fe31 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 af2b614b4b19d8164e72d4b55e176a614c6f0362..604e818616ae30a4fb1b2520a764a253669a555f 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 c9de47480546aedf48be863c8eb887270140cc20..1d0f58b78b52c0161993324f63ef54f4b9062c43 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 cc6ba6dd2bf82d7d5837394c2ba7f1dc99a93dfd..42efda0d34d87f9dc93cad2b3d267846514e0888 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 8ce40b63526a4d96525e00e421e3eff9a30e622e..ee5e89c2a59a49484ab0133327e3b6c7674b2deb 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 de27f55f1a12bb79087c19370aef0dea5f415a51..f51eaad8f1a470337521683c53db85a30330dfd8 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 0a273477f084e7228b6321108c34b08eaf881238..1b5b78e48e58c4f2bd2a2f9bae0f61ccfcc769a4 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 3256fe1568d3242943e33dfbb32708d6f42d3477..83b95e05bc814cb60f759a30e89d243960797b60 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 ef8e106a49fce4ee98a579b15c66e142fcd85fa6..e6fc31461db459ae9075e704581317d910b4afee 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 7e5a81d4c96d06b1a9f8159f2b1c24da08a79f70..4f86b7d152d477b0da914aff1590000e89bf1183 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 3bbc241b66d4b6c40341b3b54d3cb6d69a8b1c22..c51e3a69c0de7e68ad78338a6c86cb2980eb1a2f 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 2724ed4b7e8c977153034a96f960601a4438f339..3edb480579ea7b2ef236468e39837cf629b18694 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 0eeaf464c2dca66ba450869efa9f50a43679f8ca..c0cc72003f67a50fbc3980980242cbf0e4f7c4a4 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 7afa25fa3454142a629369b84f0f34e0602da5eb..5eb8575ce7eaa721c4708a84a0472fe1c1e1eacf 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 85a1f8e8edfb2bf7e3fb298a945cf91a9cb4bb48..5e8dc78baf3abf71231972b49079ca49a8f3898c 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 b586af1466e0857d76a1fb0b897b852401749e29..949a215d08611c0de6794efd15a11880b7c320a7 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 9b8cc1f65230709e9fe5833d66c717cefd386d10..6102c945d12876e613572556d4dc86a52c107645 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 7b7ccd5f98e0468b72c05cfdb227e4009243bd11..aab057d7c536efd01af8c3edf550fb06a37e7f43 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 0919afdb71d5b152ec7d27ebc8f9789df61f8411..141a481805cb98411ae9beeb6cbb5db2a6551a8b 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 d52b70d436aa11c7b67a6dcc4479b2fb2cbe82cb..744fb8d189e29f0230d1cf72e89d6ffc4bd042a0 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 386a1c159473e1a8dd3cb04beafd74941995287d..96aff26e1f5b002639c164f671e1bf6032ea9cfc 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 2397a8492281da2141f79f37e01a1a0847531757..19631d483d9c0e67c8463b8c10ab119b12661f33 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 096f65c1abc1f73c902ff3519d03a83805c41e96..11c84ee6a7d97ba49c05f2a71bffe175a6ff087b 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 bfc7ac0b4a5aa9842e3dc39f47fe6c193202dcbb..9111e39be22ed7128d8e067b97750effc4152d24 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 62fb01a29694ea17cea251eee48cc23e1f79ebf3..4fbd0ee40685f524a30e68a4d7a96428f727779a 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 49165309bee155e248b2ec8a543828f53c12a4a6..dd34b66a4f5bead8bcbb88ee98b5e36d889c0679 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 2fa33a5bbf9bc0af2ee57a6585a006b44db82e69..ee697e4d7c5a0bed975944bef1deb6f911643628 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 6d8a295e405d67cecdbc2e281b2f8543c8d4dd74..e2fe486b235322c7b6aea0fb0a4243c96f96f849 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 c70571f99f977f3adcb590c00cf326ab5140cfc2..b4acab242bf481c3058b51393cc92416e4281b76 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 1fd68f9e07d0e6b3356ede503296cf0412953f85..fa907dc28e0af568f64d751b257eb9ca286cd3bd 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 dcaf21f8073e729254430d0d3955e151b481d3eb..939ab5fe0f8831d57e7894cb93126a93ace3754e 100644 (file)
Binary files a/tests/files/unsupported-filter_flags-3.lzma and b/tests/files/unsupported-filter_flags-3.lzma differ