Merged in martingalloar/scapy/enumkeys (pull request #76)

Added EnumFields that takes valid values when fuzzed

scapy/fields.py

@@ -827,6 +827,24 @@ class BitMultiEnumField(BitField,MultiEnumField):
         return MultiEnumField.i2repr(self, pkt, x)
 
 
+class ByteEnumKeysField(ByteEnumField):
+    """ByteEnumField that picks valid values when fuzzed. """
+    def randval(self):
+        return RandEnumKeys(self.i2s)
+
+
+class ShortEnumKeysField(ShortEnumField):
+    """ShortEnumField that picks valid values when fuzzed. """
+    def randval(self):
+        return RandEnumKeys(self.i2s)
+
+
+class IntEnumKeysField(IntEnumField):
+    """IntEnumField that picks valid values when fuzzed. """
+    def randval(self):
+        return RandEnumKeys(self.i2s)
+
+
 # Little endian long field
 class LELongField(Field):
     def __init__(self, name, default):

scapy/volatile.py

@@ -188,6 +188,17 @@ class RandEnumSLong(RandEnum):
     def __init__(self):
         RandEnum.__init__(self, -2L**63, 2L**63-1)
 
+class RandEnumKeys(RandEnum):
+    """Picks a random value from dict keys list. """
+    def __init__(self, enum):
+        self.enum = []
+        for key in list(enum.keys()):
+            self.enum.append(key)
+        self.seq = RandomEnumeration(0, len(list(enum.keys())) - 1)
+
+    def _fix(self):
+        return self.enum[self.seq.next()]
+
 class RandChoice(RandField):
     def __init__(self, *args):
         if not args: