fixing PyOpenSSL dependencies

Author: karen-avetisyan-mc

oauth1/authenticationutils.py

@@ -26,8 +26,7 @@
 # SUCH DAMAGE.
 #
 
-from cryptography.hazmat.primitives.serialization import pkcs12 
-from cryptography.hazmat.primitives import serialization
+from cryptography.hazmat.primitives.serialization import pkcs12
 
 
 def load_signing_key(pkcs12_filename, password):

oauth1/coreutils.py

@@ -28,12 +28,11 @@
 """
 Utility file having common functions
 """
-import hashlib
 import base64
-import urllib
+import hashlib
 import time
+import urllib
 from random import SystemRandom
-
 from urllib.parse import urlparse, parse_qsl
 
 

oauth1/oauth.py

@@ -26,11 +26,12 @@
 # SUCH DAMAGE.
 #
 import json
-import oauth1.coreutils as util
-from OpenSSL import crypto
+
 from cryptography.hazmat.primitives import hashes
 from cryptography.hazmat.primitives.asymmetric import padding
 
+import oauth1.coreutils as util
+
 
 class OAuth:
     EMPTY_STRING = ""
@@ -87,9 +88,9 @@ def get_base_string(url, method, oauth_parameters):
     def sign_message(message, signing_key):
         #    Signs the message using the private signing key
         signature = signing_key.sign(message.encode("utf-8"),
-                            padding.PKCS1v15(),
-           hashes.SHA256()) 
-        
+                                     padding.PKCS1v15(),
+                                     hashes.SHA256())
+
         return util.base64_encode(signature)
 
 

oauth1/oauth_ext.py

@@ -25,7 +25,6 @@
 # IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-from OpenSSL.crypto import PKey
 from requests import PreparedRequest
 from requests.auth import AuthBase
 
@@ -44,7 +43,7 @@ class OAuth1RSA(AuthBase):
         >>> requests.post('https://endpoint.com/the/route', data={'foo': 'bar'}, auth=oauth)
     """
 
-    def __init__(self, consumer_key: str, signing_key: PKey):
+    def __init__(self, consumer_key: str, signing_key: bytes):
         self.consumer_key = consumer_key
         self.signing_key = signing_key
 

oauth1/signer_interceptor.py

@@ -26,11 +26,13 @@
 # SUCH DAMAGE.
 #
 from functools import wraps
-from oauth1.oauth import OAuth
-from oauth1 import authenticationutils
 from urllib.parse import urlencode
+
 from deprecated import deprecated
 
+from oauth1 import authenticationutils
+from oauth1.oauth import OAuth
+
 
 class SignerInterceptor(object):
 

oauth1/version.py

@@ -1,2 +1,2 @@
 # -*- coding: utf-8 -*-
-__version__ = '1.8.0'
+__version__ = '1.9.0'

requirements.txt

@@ -1,4 +1,3 @@
 requests==2.27.1
 Deprecated==1.2.5
-cryptography>=42.0.0
-pyOpenSSL>=23.3.0
+cryptography>=42.0.0

setup.py

@@ -1,5 +1,5 @@
 #
-# Copyright 2019-2021 Mastercard
+# Copyright 2019-2024 Mastercard
 #
 # Redistribution and use in source and binary forms, with or without modification, are
 # permitted provided that the following conditions are met:
@@ -46,5 +46,5 @@
         'Topic :: Software Development :: Libraries :: Python Modules'
         ],
       tests_require=['coverage'],
-      install_requires=['requests','pyOpenSSL>=22.1.0,<=23.2.0','urllib3', 'Deprecated']
+      install_requires=['requests','cryptography>=42.0.0','urllib3', 'Deprecated']
       )

tests/test_utils.py

@@ -28,7 +28,6 @@
 #
 import unittest
 import oauth1.authenticationutils as authenticationutils
-from OpenSSL import crypto
 from cryptography.hazmat.primitives import serialization