ensec-cli 1.0.4__tar.gz → 1.0.6__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {ensec_cli-1.0.4 → ensec_cli-1.0.6}/PKG-INFO +2 -2
- ensec_cli-1.0.6/ensec_cli/__init__.py +1 -0
- {ensec_cli-1.0.4 → ensec_cli-1.0.6}/ensec_cli/cli.py +1 -1
- {ensec_cli-1.0.4 → ensec_cli-1.0.6}/ensec_cli/rsa_encryptor.py +13 -4
- {ensec_cli-1.0.4 → ensec_cli-1.0.6}/ensec_cli.egg-info/PKG-INFO +2 -2
- {ensec_cli-1.0.4 → ensec_cli-1.0.6}/pyproject.toml +2 -2
- ensec_cli-1.0.4/ensec_cli/__init__.py +0 -1
- {ensec_cli-1.0.4 → ensec_cli-1.0.6}/LICENSE +0 -0
- {ensec_cli-1.0.4 → ensec_cli-1.0.6}/README.md +0 -0
- {ensec_cli-1.0.4 → ensec_cli-1.0.6}/ensec_cli/conf_load.py +0 -0
- {ensec_cli-1.0.4 → ensec_cli-1.0.6}/ensec_cli/esdcompress.py +0 -0
- {ensec_cli-1.0.4 → ensec_cli-1.0.6}/ensec_cli/passchk.py +0 -0
- {ensec_cli-1.0.4 → ensec_cli-1.0.6}/ensec_cli/rsa_signer.py +0 -0
- {ensec_cli-1.0.4 → ensec_cli-1.0.6}/ensec_cli/utils.py +0 -0
- {ensec_cli-1.0.4 → ensec_cli-1.0.6}/ensec_cli/wavencode.py +0 -0
- {ensec_cli-1.0.4 → ensec_cli-1.0.6}/ensec_cli.egg-info/SOURCES.txt +0 -0
- {ensec_cli-1.0.4 → ensec_cli-1.0.6}/ensec_cli.egg-info/dependency_links.txt +0 -0
- {ensec_cli-1.0.4 → ensec_cli-1.0.6}/ensec_cli.egg-info/entry_points.txt +0 -0
- {ensec_cli-1.0.4 → ensec_cli-1.0.6}/ensec_cli.egg-info/requires.txt +0 -0
- {ensec_cli-1.0.4 → ensec_cli-1.0.6}/ensec_cli.egg-info/top_level.txt +0 -0
- {ensec_cli-1.0.4 → ensec_cli-1.0.6}/setup.cfg +0 -0
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: ensec-cli
|
|
3
|
-
Version: 1.0.
|
|
3
|
+
Version: 1.0.6
|
|
4
4
|
Summary: EncryptSecureDEC Open Source CLI
|
|
5
|
-
Requires-Python: >=3.
|
|
5
|
+
Requires-Python: >=3.8
|
|
6
6
|
Description-Content-Type: text/markdown
|
|
7
7
|
License-File: LICENSE
|
|
8
8
|
Requires-Dist: pycryptodome
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
__version__ = "1.0.6"
|
|
@@ -225,7 +225,7 @@ def ensure_dirs():
|
|
|
225
225
|
TRUSTED_DIR.mkdir(parents=True, exist_ok=True)
|
|
226
226
|
|
|
227
227
|
ensure_dirs()
|
|
228
|
-
|
|
228
|
+
# from cryptography.hazmat.backends import default_backend
|
|
229
229
|
# ===============================================
|
|
230
230
|
# RSA Key Generation
|
|
231
231
|
# ===============================================
|
|
@@ -240,11 +240,20 @@ def ensure_rsa_keys():
|
|
|
240
240
|
|
|
241
241
|
if not RSA_KEY_PATH.exists() or not RSA_PUB_PATH.exists():
|
|
242
242
|
print("[INFO] Generating new RSA key pair...")
|
|
243
|
-
|
|
244
|
-
|
|
243
|
+
try:
|
|
244
|
+
private_key = rsa.generate_private_key(
|
|
245
245
|
public_exponent=65537,
|
|
246
246
|
key_size=2048
|
|
247
|
-
|
|
247
|
+
)
|
|
248
|
+
except TypeError:
|
|
249
|
+
from cryptography.hazmat.backends import default_backend
|
|
250
|
+
|
|
251
|
+
private_key = rsa.generate_private_key(
|
|
252
|
+
public_exponent=65537,
|
|
253
|
+
key_size=2048,
|
|
254
|
+
backend=default_backend()
|
|
255
|
+
)
|
|
256
|
+
|
|
248
257
|
public_key = private_key.public_key()
|
|
249
258
|
|
|
250
259
|
# ★ここが追加ポイント:設定で暗号化ONならパスワード付きで保存
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: ensec-cli
|
|
3
|
-
Version: 1.0.
|
|
3
|
+
Version: 1.0.6
|
|
4
4
|
Summary: EncryptSecureDEC Open Source CLI
|
|
5
|
-
Requires-Python: >=3.
|
|
5
|
+
Requires-Python: >=3.8
|
|
6
6
|
Description-Content-Type: text/markdown
|
|
7
7
|
License-File: LICENSE
|
|
8
8
|
Requires-Dist: pycryptodome
|
|
@@ -4,9 +4,9 @@ build-backend = "setuptools.build_meta"
|
|
|
4
4
|
|
|
5
5
|
[project]
|
|
6
6
|
name = "ensec-cli"
|
|
7
|
-
version = "1.0.
|
|
7
|
+
version = "1.0.6"
|
|
8
8
|
description = "EncryptSecureDEC Open Source CLI"
|
|
9
|
-
requires-python = ">=3.
|
|
9
|
+
requires-python = ">=3.8"
|
|
10
10
|
readme = "README.md"
|
|
11
11
|
|
|
12
12
|
dependencies = [
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
__version__ = "1.0.4"
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|