ensec-cli 1.0.6__tar.gz → 1.0.8__tar.gz

{ensec_cli-1.0.6 → ensec_cli-1.0.8}/PKG-INFO

@@ -1,8 +1,8 @@
 Metadata-Version: 2.4
 Name: ensec-cli
-Version: 1.0.6
+Version: 1.0.8
 Summary: EncryptSecureDEC Open Source CLI
-Requires-Python: >=3.8
+Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: pycryptodome

ensec_cli-1.0.8/ensec_cli/__init__.py

@@ -0,0 +1 @@
+__version__ = "1.0.8"

{ensec_cli-1.0.6 → ensec_cli-1.0.8}/ensec_cli/cli.py

@@ -252,6 +252,30 @@ def cli_verify_chain(file_path):
 rsa_encryptor.ensure_rsa_keys()
 from .utils import decrypt_folder_cli,encrypt_folder
 
+def password_from_keyfile(keyfile_path: str) -> str:
+    """
+    キーファイルの内容からパスワード相当の文字列を生成する。
+    ファイル内容が1bitでも変わると復号できなくなる。
+    """
+    path = Path(keyfile_path)
+
+    if not path.is_file():
+        print(f"❌ Error: Key file not found - {keyfile_path}")
+        sys.exit(1)
+
+    try:
+        with open(path, "rb") as f:
+            data = f.read()
+    except Exception as e:
+        print(f"❌ Error: Failed to read key file - {e}")
+        sys.exit(1)
+
+    if not data:
+        print("❌ Error: Key file is empty.")
+        sys.exit(1)
+
+    return hashlib.sha256(data).hexdigest()
+
 def main():
     parser = argparse.ArgumentParser(description="EncryptSecureDEC CLI")
     parser.add_argument("mode",choices=["encrypt","decrypt","verify-chain","sign",
@@ -263,6 +287,7 @@ def main():
     parser.add_argument("--rsa", action="store_true",help="Encrypt / Decrypt RSA Mode")
     parser.add_argument("--dir", action="store_true",help="Encrypt Dir mode")
     parser.add_argument("--pubkey", help="Path to public key file (only required in RSA encrypt mode)")
+    parser.add_argument("--keyfile",help="Use a file as the password source for encryption/decryption")
     args = parser.parse_args()
 
     # --- validate RSA/pubkey usage ---
@@ -287,7 +312,13 @@ def main():
         sys.exit(result)
 
     if not args.rsa and ext != ".rdec" and args.mode != "sign" and args.mode != "verify-sign" and args.dir!=True and ext!=".esdc":
-        password = args.password or getpass.getpass("🔑 Enter password: ")
+        if args.keyfile and args.password:
+            print("❌ Error: --password and --keyfile cannot be used together.")
+            sys.exit(1)
+        if args.keyfile:
+            password = password_from_keyfile(args.keyfile)
+        else:
+            password = args.password or getpass.getpass("🔑 Enter password: ")
 
     # Check if file exists
     if not os.path.isfile(args.file) and args.dir!=True:

{ensec_cli-1.0.6 → ensec_cli-1.0.8}/ensec_cli.egg-info/PKG-INFO

@@ -1,8 +1,8 @@
 Metadata-Version: 2.4
 Name: ensec-cli
-Version: 1.0.6
+Version: 1.0.8
 Summary: EncryptSecureDEC Open Source CLI
-Requires-Python: >=3.8
+Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: pycryptodome

{ensec_cli-1.0.6 → ensec_cli-1.0.8}/pyproject.toml

@@ -4,9 +4,9 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ensec-cli"
-version = "1.0.6"
+version = "1.0.8"
 description = "EncryptSecureDEC Open Source CLI"
-requires-python = ">=3.8"
+requires-python = ">=3.9"
 readme = "README.md"
 
 dependencies = [

ensec_cli-1.0.6/ensec_cli/__init__.py

@@ -1 +0,0 @@
-__version__ = "1.0.6"