UUID cleanup #1892
Merged
UUID cleanup #1892
Conversation
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
- Merge functionality of `s.l.bluetooth.BTUUIDField` and `s.c.dce_rpc.UUIDField` - Moves `s.c.dce_rpc.RandUUID` to `s.volatile` - Adds support for RFC 4122 "versioned" UUIDs to `RandUUID`, and adds tests - Moves some `UUIDField` tests from `s/c/dce_rpc.uts` to `t/regression.uts` - Migrates `s.l.dhcp6.DUID_UUID.uuid` to `UUIDField`, and adds tests - Fix `re` stomping in `t/regression.uts`
Tests still pass.
Tests now pass.
Closed
Codecov Report
@@ Coverage Diff @@
## master #1892 +/- ##
==========================================
+ Coverage 85.88% 85.94% +0.05%
==========================================
Files 187 187
Lines 42733 42750 +17
==========================================
+ Hits 36701 36740 +39
+ Misses 6032 6010 -22
|
p-l-
requested changes
Mar 10, 2019
Member
p-l-
left a comment
p-l-
left a comment
There was a problem hiding this comment.
Thanks for that PR. Apart from my minor comment, that's OK for me.
Co-Authored-By: micolous <micolous+gh@gmail.com>
Contributor
Author
|
@p-l-: I have made all requested changes now, please take a look. |
micolous
added a commit
to micolous/scapy
that referenced
this pull request
Mar 24, 2019
- Decodes iBeacon as a submessage of Apple's BLE broadcast frame format. Does not implement support for other types of Apple BLE broadcasts. - Adds tests and example documentation. This PR uses `UUIDField` from PR secdev#1892.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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.
There are multiple implementations of a UUID-like field, and some places where we don't use this at all (but could!). This pull request merges them, and brings it into a new
scapy.field.UUIDField.This impacts
s.l.bluetooth,s.l.dhcp6,s.c.dce_rpc,s.c.opc_daands.c.pnio_rpc.The new
UUIDFieldalways uses Python'suuid.UUIDclass as an internal representation (not all modules did this).s.l.bluetooth.BTUUIDFieldands.c.dce_rpc.UUIDFieldintos.fields.UUIDFields.c.dce_rpc.RandUUIDtos.volatileRandUUID, and adds testsUUIDFieldtests that don't useEndiannessFieldfroms/c/dce_rpc.utstot/regression.utsdhcp6: MigratesDUID_UUID.uuidtoUUIDField, and adds tests (tested only with regression tests, based on my reading of the RFC)opc_da: Migrate fromPUUIDtoUUIDField, removesPUUID(tested only with regression tests)pnio_rpc: Fix regressions fromdce_rpcchanges (tested only with regression tests)remodule stomping int/regression.utsTests still pass on py2.7 and 3.7 (skipping root/netaccess tests)