gemcall/gemcall.py

@@ -1,21 +1,24 @@
 # vim: tabstop=4 shiftwidth=4 expandtab
 
-import socket
+import socket as sockets
 import urllib.parse
 import ssl
-from cryptography import x509
-from cryptography.hazmat.backends import default_backend
-from cryptography.hazmat.primitives.serialization import Encoding,PublicFormat
+
+from Crypto.PublicKey import RSA, ECC
 
 class Response():
-    def __init__(self, socket: socket.socket) -> "Response":
+    def __init__(self, socket: sockets.socket) -> "Response":
         self._socket = socket
 
-        cert = self._socket.getpeercert(binary_form=True)
-        certobj = x509.load_der_x509_certificate(cert, default_backend())
-        pubkey = certobj.public_key()
+        cert: bytes = self._socket.getpeercert(binary_form=True)
+        try:
+            certobj: RSA.RsaKey = RSA.import_key(cert)
+        except ValueError:
+            certobj: ECC.EccKey = ECC.import_key(cert)
+        # "\n" is added for API compatibility
+        pubkey: str = certobj.public_key().export_key(format="PEM") + "\n"
 
-        self.serverpubkey = pubkey.public_bytes(Encoding('PEM'), PublicFormat('X.509 subjectPublicKeyInfo with PKCS#1'))
+        self.serverpubkey: bytes = pubkey.encode()
         self._filehandle = self._socket.makefile(mode = "rb")
 
         # Two code digits, one space and a maximum of 1024 bytes of meta info.
@@ -23,22 +26,22 @@ class Response():
             self.responsecode, self.meta = self._filehandle.readline(1027).split(maxsplit=1)
             self.responsecode = int(self.responsecode)
             self.meta = self.meta.strip().decode("UTF-8")
-        except:
+        except Exception as err:
             self.discard()
-            raise RuntimeError("Received malformed header from gemini server")
+            raise RuntimeError("Received malformed header from gemini server") from err
 
-    def read(self, bufsize: int = 4096) -> "bytes":
+    def read(self, bufsize: int = 4096) -> bytes:
         return self._filehandle.read(bufsize)
 
-    def readline(self, bufsize: int = 4096) -> "bytes":
+    def readline(self, bufsize: int = 4096) -> bytes:
         return self._filehandle.readline(bufsize)
 
     def discard(self) -> None:
         self._filehandle.close()
         self._socket.close()
 
-def request(url: str = "", clientcert: str = None, clientkey: str = None, timeout: int = 3) -> "Response":
-    url = url if url.startswith("gemini://") else "gemini://" + url
+def request(url: str = "", clientcert: str = None, clientkey: str = None, timeout: int = 3) -> Response:
+    url: str = url if url.startswith("gemini://") else "gemini://" + url
     parsed = urllib.parse.urlparse(url)
     context = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
     context.minimum_version = ssl.TLSVersion.TLSv1_2
@@ -47,9 +50,8 @@ def request(url: str = "", clientcert: str = None, clientkey: str = None, timeou
     if (clientcert and clientkey):
         context.load_cert_chain(clientcert, clientkey)
 
-    sock = socket.create_connection((parsed.hostname, parsed.port or 1965))
+    sock = sockets.create_connection((parsed.hostname, parsed.port or 1965))
     ssock = context.wrap_socket(sock, server_hostname=parsed.hostname)
     ssock.sendall((url+"\r\n").encode("UTF-8"))
 
     return Response(ssock)
-

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = gemcall
-version = 0.8
+version = 0.9
 description = A library and CLI tool for making gemini requests.
 long_description = file: README.md
 long_description_content_type = text/markdown
@@ -25,7 +25,7 @@ python_requires = >= 3.9
 setup_requires =
     setuptools >= 38.3.0
 install_requires =
-    cryptography
+    pycryptodome
 
 [options.entry_points]
 console_scripts =