Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update dependencies #13

Merged
merged 3 commits into from
Aug 24, 2018
Merged

Update dependencies #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d57a1b2
Add is_encrypted() to abstract methods
nolze Aug 21, 2018
40edd21
Refactor with flake8
nolze Aug 21, 2018
144dc8c
Update dependencies
nolze Aug 21, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions msoffcrypto/__main__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,5 +77,6 @@ def main():

file.decrypt(args.outfile)


if __name__ == '__main__':
main()
4 changes: 4 additions & 0 deletions msoffcrypto/format/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,7 @@ def load_key(self):
@abc.abstractmethod
def decrypt(self):
pass

@abc.abstractmethod
def is_encrypted(self):
pass
2 changes: 1 addition & 1 deletion msoffcrypto/format/doc97.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ def _parse_header_RC4CryptoAPI(encryptionHeader):
'salt': verifier['salt'],
'keySize': header['keySize'],
'encryptedVerifier': verifier['encryptedVerifier'],
'encryptedVerifierHash': verifier['encryptedVerifierHash'],
'encryptedVerifierHash': verifier['encryptedVerifierHash'],
}
return info

Expand Down
6 changes: 3 additions & 3 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

setup(
name='msoffcrypto-tool',
version='4.6.0',
version='4.6.1',
description='A Python tool and library for decrypting MS Office files with passwords or other keys',
long_description=open("README.md", "r").read(),
long_description_content_type='text/markdown',
Expand All @@ -17,8 +17,8 @@
"msoffcrypto.method",
],
install_requires=[
'olefile >= 0.44',
'cryptography >= 2.0.0',
'olefile >= 0.45',
'cryptography >= 2.3',
],
test_require=[
'nose >= 1.3.7',
Expand Down