diff options
| author | Igor Pavlov <ipavlov@users.sourceforge.net> | 2015-11-20 03:00:00 +0300 |
|---|---|---|
| committer | Kornel Lesiński <kornel@geekhood.net> | 2016-05-28 02:16:58 +0300 |
| commit | 5de23c1deb52b8be4c43ad9f694c64bbddd0c38a (patch) | |
| tree | 5b17a1cd7ecef0cba33bb3734356394136226940 /CPP/7zip/Archive/Zip | |
| parent | e24f7fba53cc8f28d74b5039f7279d9bf945ff25 (diff) | |
15.1215.12
Diffstat (limited to 'CPP/7zip/Archive/Zip')
| -rw-r--r-- | CPP/7zip/Archive/Zip/ZipHandler.cpp | 2 | ||||
| -rw-r--r-- | CPP/7zip/Archive/Zip/ZipItem.h | 2 |
2 files changed, 4 insertions, 0 deletions
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 |