Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix/imports #40 #43

Merged
merged 3 commits into from
Mar 4, 2016
Merged

Fix/imports #40 #43

merged 3 commits into from
Mar 4, 2016

Conversation

tintinweb
Copy link
Contributor

fixes #40

  • removes sys.path magic
  • renames scapy-ssl_tls to scapy_ssl_tls and adds __init__.py in order allow direct imports. (dashes are not allowed in package names for imports)
  • removes unused import for ssl_tls_crypto
  • removes circular import in scapy_ssl_tls.ssl_tls trying to import ssl_tls_crypto which in return tried to import from ssl_tls

Note: you might want to have a look at the latest changes to scapy-ssl_tls (https://github.com/tintinweb/scapy-ssl_tls) as lots of things were fixed quite some time ago (including this circular import) as well as new features and layers were added (tls automata, mutual auth, ...) and it is packaged for pip.

//tested on an old kali

@tintinweb
Copy link
Contributor Author

  • fixed the ADD for scapy_ssl_tls in the Dockerfile. (I do not have a dockerhost to test this, but looks reasonable)

nimia added a commit that referenced this pull request Mar 4, 2016
Removes sys.path magic.
Renames scapy-ssl_tls to scapy_ssl_tls and adds __init__.py in order allow direct imports. (dashes are not allowed in package names for imports).
Removes unused import for ssl_tls_crypto.
Removes circular import in scapy_ssl_tls.ssl_tls trying to import ssl_tls_crypto which in return tried to import from ssl_tls.
Fixes issue #40.
Thank you so much tintinweb.
@nimia nimia merged commit 6d33bf7 into nimia:master Mar 4, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Import Errors
2 participants