From 5de23c1deb52b8be4c43ad9f694c64bbddd0c38a Mon Sep 17 00:00:00 2001
From: Igor Pavlov <ipavlov@users.sourceforge.net>
Date: Fri, 20 Nov 2015 00:00:00 +0000
Subject: 15.12

---
 CPP/7zip/Archive/Zip/ZipHandler.cpp | 2 ++
 CPP/7zip/Archive/Zip/ZipItem.h      | 2 ++
 2 files changed, 4 insertions(+)

(limited to 'CPP/7zip/Archive/Zip')

diff --git a/CPP/7zip/Archive/Zip/ZipHandler.cpp b/CPP/7zip/Archive/Zip/ZipHandler.cpp
index 510ecb41..a65c9e32 100644
--- a/CPP/7zip/Archive/Zip/ZipHandler.cpp
+++ b/CPP/7zip/Archive/Zip/ZipHandler.cpp
@@ -373,6 +373,8 @@ STDMETHODIMP CHandler::GetProperty(UInt32 index, PROPID propID, PROPVARIANT *val
               ConvertUInt32ToString(f.AlgId, temp + 1);
               m += temp;
             }
+            if (f.CertificateIsUsed())
+              m += "-Cert";
           }
           else
             m += kMethod_StrongCrypto;
diff --git a/CPP/7zip/Archive/Zip/ZipItem.h b/CPP/7zip/Archive/Zip/ZipItem.h
index 98afdf1d..c01ede8d 100644
--- a/CPP/7zip/Archive/Zip/ZipItem.h
+++ b/CPP/7zip/Archive/Zip/ZipItem.h
@@ -109,6 +109,8 @@ struct CStrongCryptoExtra
     Flags  = GetUi16(p + 6);
     return (Format == 2);
   }
+
+  bool CertificateIsUsed() const { return (Flags > 0x0001); }
 };
 
 struct CExtraBlock
-- 
cgit v1.2.3