📅 Commit Tue, 6 Jul 2021 09:34:40

🐛 update readthedocs
🚧 3.4.0
✨ generate_ecc_keypair
✅ tests added/updated

.readthedocs.yml

@@ -4,7 +4,7 @@ build:
     image: latest
 
 python:
-  version: 3.7
+  version: '3.8'
   install:
      - method: pip
        path: .

README.md

@@ -4,7 +4,7 @@
 
 ![](https://github.com/securisec/chepy/workflows/tests/badge.svg)
 ![](https://img.shields.io/travis/com/securisec/chepy?logo=travis)
-[![](https://img.shields.io/docker/cloud/build/securisec/chepy?logo=docker)](https://hub.docker.com/r/securisec/chepy)
+<!-- [![](https://img.shields.io/docker/cloud/build/securisec/chepy?logo=docker)](https://hub.docker.com/r/securisec/chepy) -->
 
 [![](https://img.shields.io/readthedocs/chepy.svg?logo=read-the-docs&label=Docs)](http://chepy.readthedocs.io/en/latest/)
 [![](https://img.shields.io/pypi/v/chepy.svg?logo=pypi&label=pypi)](https://pypi.python.org/pypi/chepy)

TODO

@@ -6,12 +6,9 @@ Code:
 New ideas:
   ☐ rubber ducky encode/decode
   ☐ save registers https://t.co/pBNRufibY8?amp=1 
-  ✔ convert to nato alphabets: a = alpha, b = bravo
   ☐ cbor encode/decode https://github.com/agronholm/cbor2 (plugin)
   ☐ fuzzy search
-  ✔ rsa sign/verify
-  ✔ rsa generate random key (private and public)
-  ✔ rsa encrypt/decrpt
+  ✔ ecc generate
   ☐ pgp, generate, encrypt, decrypt, verify
   ☐ swap little and big endian
 
@@ -49,6 +46,10 @@ Misc:
   ☐ cyberchef recipe to chepy recipe converter
 
 Archive:
+  ✔ convert to nato alphabets: a = alpha, b = bravo @project(New ideas)
+  ✔ rsa sign/verify @project(New ideas)
+  ✔ rsa generate random key (private and public) @project(New ideas)
+  ✔ rsa encrypt/decrpt @project(New ideas)
   ✔ sqlite plugin @project(Plugins)
   ✔ base 16 @project(Methods)
   ✔ protobuf plugin @project(Plugins)

chepy/__version__.py

@@ -1,2 +1,2 @@
-__version__ = "3.3.0"  # pragma: no cover
+__version__ = "3.4.0"  # pragma: no cover
 __author__ = "Hapsida @securisec"  # pragma: no cover

chepy/modules/publickey.py

@@ -3,6 +3,7 @@
 import lazy_import
 
 RSA = lazy_import.lazy_module("Crypto.PublicKey.RSA")
+ECC = lazy_import.lazy_module("Crypto.PublicKey.ECC")
 OpenSSL = lazy_import.lazy_module("OpenSSL")
 
 from ..core import ChepyCore, ChepyDecorators
@@ -248,3 +249,24 @@ def generate_rsa_keypair(
         priv = key.exportKey(passphrase=passphrase, format=format)
         self.state = {"public": pub, "private": priv}
         return self
+
+    @ChepyDecorators.call_stack
+    def generate_ecc_keypair(
+        self,
+        curve: Literal['p256', 'p384', 'p521'] = 'p256',
+        format: Literal["PEM", "DER"] = "PEM"
+    ) -> PublickeyT:
+        """Generate RSA key pair
+
+        Args:
+            curve (Literal[, optional): Curve for keys. Defaults to p256.
+            format (Literal[, optional): Output format type. Defaults to 'PEM'.
+
+        Returns:
+            Chepy: The Chepy object.
+        """
+        key = ECC.generate(curve=curve)
+        pub = key.public_key().export_key(format=format)
+        priv = key.export_key(format=format)
+        self.state = {"public": pub, "private": priv}
+        return self

chepy/modules/publickey.pyi

@@ -1,5 +1,5 @@
 from ..core import ChepyCore
-from typing import Any, TypeVar
+from typing import Any, Literal, TypeVar
 
 RSA: Any
 OpenSSL: Any
@@ -17,3 +17,4 @@ class Publickey(ChepyCore):
     def parse_private_pem(self: PublickeyT) -> PublickeyT: ...
     def dump_pkcs12_cert(self: PublickeyT, password: str) -> PublickeyT: ...
     def generate_rsa_keypair(self: PublickeyT, bits:int=..., format:str=..., passphrase:str=...) -> PublickeyT: ...
+    def generate_ecc_keypair(self: PublickeyT, curve:Literal['p256', 'p384', 'p521']=..., format:Literal['PEM', 'DER']=...) -> PublickeyT: ...

tests/test_publickey.py

@@ -134,3 +134,9 @@ def test_generate_rsa_keypair():
     k = Chepy("").generate_rsa_keypair().o
     assert b"PUBLIC" in k["public"]
     assert b"PRIVATE" in k["private"]
+
+
+def test_generate_ecc_keypair():
+    k = Chepy("").generate_ecc_keypair().o
+    assert "PUBLIC" in k["public"]
+    assert "PRIVATE" in k["private"]