From 1dc92281fa580c11a79fef9fc862a6ce354a76ac Mon Sep 17 00:00:00 2001
From: Igor Pavlov <ipavlov@users.sourceforge.net>
Date: Fri, 2 Jan 2009 00:00:00 +0000
Subject: [PATCH] 4.64

---
 C/7zVersion.h                       |  6 +++---
 CPP/7zip/Archive/Zip/ZipHandler.cpp | 12 ++++++------
 CPP/7zip/MyVersion.h                | 10 +++++-----
 DOC/7zip.nsi                        |  2 +-
 DOC/7zip.wxs                        |  2 +-
 DOC/License.txt                     |  2 +-
 DOC/readme.txt                      |  4 ++--
 7 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/C/7zVersion.h b/C/7zVersion.h
index 9009300a..e7ed4490 100755
--- a/C/7zVersion.h
+++ b/C/7zVersion.h
@@ -1,7 +1,7 @@
 #define MY_VER_MAJOR 4
-#define MY_VER_MINOR 63
+#define MY_VER_MINOR 64
 #define MY_VER_BUILD 0
-#define MY_VERSION "4.63"
-#define MY_DATE "2008-12-31"
+#define MY_VERSION "4.64"
+#define MY_DATE "2009-01-03"
 #define MY_COPYRIGHT ": Igor Pavlov : Public domain"
 #define MY_VERSION_COPYRIGHT_DATE MY_VERSION " " MY_COPYRIGHT " : " MY_DATE
diff --git a/CPP/7zip/Archive/Zip/ZipHandler.cpp b/CPP/7zip/Archive/Zip/ZipHandler.cpp
index 3054ae02..25cbd886 100755
--- a/CPP/7zip/Archive/Zip/ZipHandler.cpp
+++ b/CPP/7zip/Archive/Zip/ZipHandler.cpp
@@ -425,7 +425,7 @@ class CZipDecoder
   CObjectVector<CMethodItem> methodItems;
 
 public:
-  CZipDecoder(): 
+  CZipDecoder():
       _zipCryptoDecoderSpec(0),
       _pkAesDecoderSpec(0),
       _wzAesDecoderSpec(0),
@@ -662,11 +662,6 @@ HRESULT CZipDecoder::Decode(
       if (wzAesMode)
       {
         result = _wzAesDecoderSpec->ReadHeader(inStream);
-        if (result == S_OK)
-        {
-          if (!_wzAesDecoderSpec->CheckPasswordVerifyCode())
-            result = S_FALSE;
-        }
       }
       else if (pkAesMode)
       {
@@ -689,6 +684,11 @@ HRESULT CZipDecoder::Decode(
         RINOK(filterStreamSpec->SetInStream(inStream));
         inStreamReleaser.FilterCoder = filterStreamSpec;
         inStreamNew = filterStream;
+        if (wzAesMode)
+        {
+          if (!_wzAesDecoderSpec->CheckPasswordVerifyCode())
+            result = S_FALSE;
+        }
       }
     }
     else
diff --git a/CPP/7zip/MyVersion.h b/CPP/7zip/MyVersion.h
index 228f1015..0f06d540 100755
--- a/CPP/7zip/MyVersion.h
+++ b/CPP/7zip/MyVersion.h
@@ -1,8 +1,8 @@
 #define MY_VER_MAJOR 4
-#define MY_VER_MINOR 63
+#define MY_VER_MINOR 64
 #define MY_VER_BUILD 0
-#define MY_VERSION "4.63"
-#define MY_7ZIP_VERSION "7-Zip 4.63"
-#define MY_DATE "2008-12-31"
-#define MY_COPYRIGHT "Copyright (c) 1999-2008 Igor Pavlov"
+#define MY_VERSION "4.64"
+#define MY_7ZIP_VERSION "7-Zip 4.64"
+#define MY_DATE "2009-01-03"
+#define MY_COPYRIGHT "Copyright (c) 1999-2009 Igor Pavlov"
 #define MY_VERSION_COPYRIGHT_DATE MY_VERSION "  " MY_COPYRIGHT "  " MY_DATE
diff --git a/DOC/7zip.nsi b/DOC/7zip.nsi
index e6ba4a68..ca4fc60a 100755
--- a/DOC/7zip.nsi
+++ b/DOC/7zip.nsi
@@ -2,7 +2,7 @@
 ;Defines
 
 !define VERSION_MAJOR 4
-!define VERSION_MINOR 63
+!define VERSION_MINOR 64
 !define VERSION_POSTFIX_FULL ""
 !ifdef WIN64
 !ifdef IA64
diff --git a/DOC/7zip.wxs b/DOC/7zip.wxs
index 6f60f765..3fcb5f1b 100755
--- a/DOC/7zip.wxs
+++ b/DOC/7zip.wxs
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
 <?define VerMajor = "4" ?>
-<?define VerMinor = "63" ?>
+<?define VerMinor = "64" ?>
 <?define VerBuild = "00" ?>
 <?define MmVer = "$(var.VerMajor).$(var.VerMinor)" ?>
 <?define MmHex = "0$(var.VerMajor)$(var.VerMinor)" ?>
diff --git a/DOC/License.txt b/DOC/License.txt
index 0d8bc7a2..9331efb4 100755
--- a/DOC/License.txt
+++ b/DOC/License.txt
@@ -3,7 +3,7 @@
   License for use and distribution
   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-  7-Zip Copyright (C) 1999-2008 Igor Pavlov.
+  7-Zip Copyright (C) 1999-2009 Igor Pavlov.
 
   Licenses for files are:
 
diff --git a/DOC/readme.txt b/DOC/readme.txt
index c2b72de8..ad92e658 100755
--- a/DOC/readme.txt
+++ b/DOC/readme.txt
@@ -1,9 +1,9 @@
-7-Zip 4.62 Sources
+7-Zip 4.64 Sources
 ------------------
 
 7-Zip is a file archiver for Windows 95/98/ME/NT/2000/2003/XP/Vista. 
 
-7-Zip Copyright (C) 1999-2008 Igor Pavlov.
+7-Zip Copyright (C) 1999-2009 Igor Pavlov.
 
 
 License Info