| OLD | NEW |
| 1 | 1 |
| 2 class IntegrationHelper: | 2 class IntegrationHelper: |
| 3 | 3 |
| 4 def __init__(self, | 4 def __init__(self, |
| 5 username=None, password=None, sharedKey=None, | 5 username=None, password=None, sharedKey=None, |
| 6 certChain=None, privateKey=None, | 6 certChain=None, privateKey=None, |
| 7 cryptoID=None, protocol=None, | 7 cryptoID=None, protocol=None, |
| 8 x509Fingerprint=None, | 8 x509Fingerprint=None, |
| 9 x509TrustList=None, x509CommonName=None, | 9 x509TrustList=None, x509CommonName=None, |
| 10 settings = None): | 10 settings = None): |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 43 raise ValueError("Bad parameters") | 43 raise ValueError("Bad parameters") |
| 44 | 44 |
| 45 #Authenticate the server based on its cryptoID or fingerprint | 45 #Authenticate the server based on its cryptoID or fingerprint |
| 46 if sharedKey and (cryptoID or protocol or x509Fingerprint): | 46 if sharedKey and (cryptoID or protocol or x509Fingerprint): |
| 47 raise ValueError("Can't use shared keys with other forms of"\ | 47 raise ValueError("Can't use shared keys with other forms of"\ |
| 48 "authentication") | 48 "authentication") |
| 49 | 49 |
| 50 self.checker = Checker(cryptoID, protocol, x509Fingerprint, | 50 self.checker = Checker(cryptoID, protocol, x509Fingerprint, |
| 51 x509TrustList, x509CommonName) | 51 x509TrustList, x509CommonName) |
| 52 self.settings = settings | 52 self.settings = settings |
| OLD | NEW |