Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
scapy
Manage
Activity
Members
Plan
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
CodeLinaro
public-release-test-restored
platform
external
scapy
Commits
3e96a13b
Commit
3e96a13b
authored
15 years ago
by
Phil
Browse files
Options
Downloads
Patches
Plain Diff
Made Python Crypto lib become a soft dependency.
parent
57df4b7e
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
scapy/all.py
+1
-1
1 addition, 1 deletion
scapy/all.py
scapy/crypto/__init__.py
+10
-1
10 additions, 1 deletion
scapy/crypto/__init__.py
with
11 additions
and
2 deletions
scapy/all.py
+
1
−
1
View file @
3e96a13b
...
...
@@ -40,4 +40,4 @@ from asn1.asn1 import *
from
asn1.ber
import
*
from
asn1.mib
import
*
from
crypto
.cert
import
*
from
crypto
import
*
This diff is collapsed.
Click to expand it.
scapy/crypto/__init__.py
+
10
−
1
View file @
3e96a13b
...
...
@@ -3,4 +3,13 @@
## Copyright (C) Arnaud Ebalard <arno@natisbad.org>
## This program is published under a GPLv2 license
__all__
=
[
"
cert
"
]
try
:
import
Crypto
except
ImportError
:
import
logging
log_loading
=
logging
.
getLogger
(
"
scapy.loading
"
)
log_loading
.
info
(
"
Can
'
t import python Crypto lib. Disabled certificate manipulation tools
"
)
else
:
from
scapy.crypto.cert
import
*
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment