Merged
Conversation
Contributor
Author
|
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.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
fixes #40
sys.pathmagicscapy-ssl_tlstoscapy_ssl_tlsand adds__init__.pyin order allow direct imports. (dashes are not allowed in package names for imports)ssl_tls_cryptoscapy_ssl_tls.ssl_tlstrying to importssl_tls_cryptowhich in return tried to import fromssl_tlsNote: 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