Merge pull request #6 from TheOfficialFloW/master

Use IPv6 address that works on all devices. Thanks to Borris-ta.

pppwn.py

@@ -165,7 +165,7 @@ class Exploit():
 
     SOURCE_MAC = '41:41:41:41:41:41'
     SOURCE_IPV4 = '41.41.41.41'
-    SOURCE_IPV6 = 'fe80::4141:4141:4141:4141'
+    SOURCE_IPV6 = 'fe80::9f9f:41ff:9f9f:41ff'
 
     TARGET_IPV4 = '42.42.42.42'
 
@@ -458,7 +458,7 @@ def build_fake_lle(self):
         fake_lle += p32(0)  # sin6_flowinfo
         # sin6_addr
         fake_lle += p64be(0xfe80000100000000)
-        fake_lle += p64be(0x4141414141414141)
+        fake_lle += p64be(0x9f9f41ff9f9f41ff)
         fake_lle += p32(0)  # sin6_scope_id
 
         # pad
@@ -637,7 +637,7 @@ def run(self):
                       end='\r',
                       flush=True)
 
-            source_ipv6 = 'fe80::{:04x}:4141:4141:4141'.format(i)
+            source_ipv6 = 'fe80::{:04x}:41ff:9f9f:41ff'.format(i)
 
             self.s.send(
                 Ether(src=self.source_mac, dst=self.target_mac) /
@@ -720,7 +720,7 @@ def run(self):
             if i >= self.HOLE_START and i % self.HOLE_SPACE == 0:
                 continue
 
-            source_ipv6 = 'fe80::{:04x}:4141:4141:4141'.format(i)
+            source_ipv6 = 'fe80::{:04x}:41ff:9f9f:41ff'.format(i)
 
             self.s.send(
                 Ether(src=self.source_mac, dst=self.target_mac) /

stage1/Makefile

@@ -6,11 +6,7 @@ OBJCOPY = objcopy
 CFLAGS = -DSMP -isystem ../freebsd-headers/include -Wl,--build-id=none -Os -fno-stack-protector -fpic -fpie
 LDFLAGS = -T linker.ld -nostartfiles -nostdlib
 
-ifneq ($(filter $(FW), 700 701 702 750 751 755 800 801 803 850 852 900 903 904 950 951 960 1000 1001 1050 1070 1071 1100),)
 CFLAGS += -DFIRMWARE=$(FW)
-else
-$(error "Invalid firmware")
-endif
 
 all: $(TARGET).bin
 

stage2/Makefile

@@ -6,11 +6,7 @@ OBJCOPY = objcopy
 CFLAGS = -DSMP -isystem ../freebsd-headers/include -Wl,--build-id=none -Os -fno-stack-protector -fpic -fpie
 LDFLAGS = -T linker.ld -nostartfiles -nostdlib
 
-ifneq ($(filter $(FW), 700 701 702 750 751 755 800 801 803 850 852 900 903 904 950 951 960 1000 1001 1050 1070 1071 1100),)
 CFLAGS += -DFIRMWARE=$(FW)
-else
-$(error "Invalid firmware")
-endif
 
 all: $(TARGET).bin