Skip to content

Commit

Permalink
Merge pull request #22 from bandoche/chore/cryptography-upgrade
Browse files Browse the repository at this point in the history
Release 0.5.0
  • Loading branch information
bandoche authored Jan 18, 2022
2 parents ed1609a + bf6050c commit 80f06ce
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 6 deletions.
9 changes: 7 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ version: 2.1


jobs:
build-and-test-39: &template
build-and-test-310: &template
docker:
- image: circleci/python:3.9
- image: circleci/python:3.10
steps:
- checkout
- run:
Expand All @@ -25,6 +25,10 @@ jobs:
- run:
command: codecov
name: Send coverage
build-and-test-39:
<<: *template
docker:
- image: circleci/python:3.9
build-and-test-38:
<<: *template
docker:
Expand All @@ -40,6 +44,7 @@ jobs:
workflows:
main:
jobs:
- build-and-test-310
- build-and-test-39
- build-and-test-38
- build-and-test-37
Expand Down
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,10 @@ The current development version can be found at

## History

### Ver. 0.5.0 (2022-01-18)
- Upgrade dependency (`cryptography==36.0.1`)
- Fix file handle leakage

### Ver. 0.4.5 (2020-12-03)
- Fix import path issue (thanks to [Gyong1211](https://github.com/Gyong1211))

Expand Down
3 changes: 2 additions & 1 deletion pypinksign/pypinksign.py
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,8 @@ def _load_prikey_with_decrypted_data(self, decrypted_prikey_data: bytes) -> None
def load_p12(self, p12_data: bytes = None) -> None:
"""Load key information from P12(PKCS12, Usually pfx)"""
if p12_data is None:
p12_data = open(self.p12_path, 'rb').read()
with open(self.p12_path, 'rb') as f:
p12_data = f.read()

pubkey_data, prikey_data = separate_p12_into_npki(p12_data, self.prikey_password)
self.load_pubkey(pubkey_data=pubkey_data)
Expand Down
6 changes: 3 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@


PROJECT = 'pypinksign'
VERSION = '0.4.5'
VERSION = '0.5.0'
URL = 'http://github.com/bandoche/PyPinkSign'
AUTHOR = 'Sangjun Jung'
AUTHOR_EMAIL = '[email protected]'
Expand All @@ -28,9 +28,9 @@
zip_safe=False,
install_requires=[
'pyasn1==0.4.8',
'cryptography==3.3.2',
'cryptography==36.0.1',
],
keywords='npki 공인인증서 korean pki certificate',
keywords='npki 공인인증서 공동인증서 korean pki certificate',
platforms='OS Independent',
classifiers=[
'Development Status :: 4 - Beta',
Expand Down

0 comments on commit 80f06ce

Please sign in to comment.