From e6ed7078f9cfe07f761a6a33ca5f24a548bdbdb4 Mon Sep 17 00:00:00 2001 From: iMHLv2 Date: Fri, 17 Jan 2014 14:21:55 -0600 Subject: [PATCH] sync with r3581 of trunk --- LEGAL.txt | 7 +++--- LICENSE.txt | 10 -------- README.txt | 7 +++--- contrib/plugins/disablewarnings.py | 7 +++--- contrib/plugins/enumfunc.py | 7 +++--- contrib/plugins/example.py | 7 +++--- contrib/plugins/malware/poisonivy.py | 7 +++--- contrib/plugins/malware/zeusscan.py | 7 +++--- contrib/plugins/pagecheck.py | 7 +++--- contrib/plugins/psdispscan.py | 7 +++--- contrib/plugins/scanprof.py | 7 +++--- contrib/plugins/verinfo.py | 7 +++--- setup.py | 7 +++--- tools/vtype_diff.py | 7 +++--- vol.py | 7 +++--- volatility/addrspace.py | 7 +++--- volatility/cache.py | 7 +++--- volatility/commands.py | 7 +++--- volatility/constants.py | 7 +++--- volatility/debug.py | 7 +++--- volatility/dwarf.py | 7 +++--- volatility/exceptions.py | 7 +++--- volatility/fmtspec.py | 7 +++--- volatility/obj.py | 7 +++--- volatility/plugins/addrspaces/amd64.py | 7 +++--- volatility/plugins/addrspaces/arm.py | 7 +++--- volatility/plugins/addrspaces/crash.py | 7 +++--- volatility/plugins/addrspaces/hibernate.py | 7 +++--- volatility/plugins/addrspaces/hpak.py | 7 +++--- volatility/plugins/addrspaces/ieee1394.py | 15 ++++++------ volatility/plugins/addrspaces/intel.py | 7 +++--- volatility/plugins/addrspaces/lime.py | 7 +++--- volatility/plugins/addrspaces/macho.py | 7 +++--- volatility/plugins/addrspaces/paged.py | 7 +++--- volatility/plugins/addrspaces/standard.py | 7 +++--- volatility/plugins/addrspaces/vboxelf.py | 7 +++--- volatility/plugins/addrspaces/vmware.py | 7 +++--- volatility/plugins/bioskbd.py | 7 +++--- volatility/plugins/common.py | 7 +++--- volatility/plugins/connections.py | 7 +++--- volatility/plugins/connscan.py | 7 +++--- volatility/plugins/crashinfo.py | 7 +++--- volatility/plugins/dlldump.py | 7 +++--- volatility/plugins/dumpcerts.py | 7 +++--- volatility/plugins/dumpfiles.py | 9 -------- volatility/plugins/envars.py | 7 +++--- volatility/plugins/evtlogs.py | 7 +++--- volatility/plugins/fileparam.py | 7 +++--- volatility/plugins/filescan.py | 7 +++--- volatility/plugins/getservicesids.py | 7 +++--- volatility/plugins/getsids.py | 7 +++--- volatility/plugins/gui/atoms.py | 7 +++--- volatility/plugins/gui/clipboard.py | 7 +++--- volatility/plugins/gui/constants.py | 7 +++--- volatility/plugins/gui/desktops.py | 7 +++--- volatility/plugins/gui/eventhooks.py | 7 +++--- volatility/plugins/gui/gahti.py | 7 +++--- volatility/plugins/gui/gditimers.py | 7 +++--- volatility/plugins/gui/messagehooks.py | 7 +++--- volatility/plugins/gui/screenshot.py | 7 +++--- volatility/plugins/gui/sessions.py | 7 +++--- volatility/plugins/gui/userhandles.py | 7 +++--- volatility/plugins/gui/vtypes/vista.py | 7 +++--- volatility/plugins/gui/vtypes/win2003.py | 7 +++--- volatility/plugins/gui/vtypes/win7.py | 7 +++--- volatility/plugins/gui/vtypes/xp.py | 7 +++--- volatility/plugins/gui/win32k_core.py | 7 +++--- volatility/plugins/gui/windows.py | 7 +++--- volatility/plugins/gui/windowstations.py | 7 +++--- volatility/plugins/handles.py | 11 +++++---- volatility/plugins/hibinfo.py | 7 +++--- volatility/plugins/hpakinfo.py | 7 +++--- volatility/plugins/iehistory.py | 7 +++--- volatility/plugins/imagecopy.py | 7 +++--- volatility/plugins/imageinfo.py | 7 +++--- volatility/plugins/kdbgscan.py | 7 +++--- volatility/plugins/kpcrscan.py | 7 +++--- volatility/plugins/linux/arp.py | 7 +++--- volatility/plugins/linux/banner.py | 7 +++--- volatility/plugins/linux/bash.py | 7 +++--- volatility/plugins/linux/check_afinfo.py | 7 +++--- volatility/plugins/linux/check_creds.py | 7 +++--- volatility/plugins/linux/check_evt_arm.py | 7 +++--- volatility/plugins/linux/check_fops.py | 7 +++--- volatility/plugins/linux/check_idt.py | 7 +++--- volatility/plugins/linux/check_modules.py | 7 +++--- volatility/plugins/linux/check_syscall.py | 7 +++--- volatility/plugins/linux/check_syscall_arm.py | 7 +++--- volatility/plugins/linux/common.py | 7 +++--- volatility/plugins/linux/cpuinfo.py | 7 +++--- volatility/plugins/linux/dentry_cache.py | 7 +++--- volatility/plugins/linux/dmesg.py | 7 +++--- volatility/plugins/linux/dump_map.py | 7 +++--- volatility/plugins/linux/find_file.py | 7 +++--- volatility/plugins/linux/flags.py | 7 +++--- volatility/plugins/linux/ifconfig.py | 7 +++--- volatility/plugins/linux/iomem.py | 7 +++--- volatility/plugins/linux/keyboard_notifier.py | 7 +++--- volatility/plugins/linux/linux_volshell.py | 7 +++--- volatility/plugins/linux/linux_yarascan.py | 7 +++--- volatility/plugins/linux/lsmod.py | 7 +++--- volatility/plugins/linux/lsof.py | 7 +++--- volatility/plugins/linux/mount.py | 7 +++--- volatility/plugins/linux/mount_cache.py | 7 +++--- volatility/plugins/linux/netstat.py | 7 +++--- volatility/plugins/linux/pidhashtable.py | 7 +++--- volatility/plugins/linux/pkt_queues.py | 7 +++--- volatility/plugins/linux/proc_maps.py | 7 +++--- volatility/plugins/linux/psaux.py | 7 +++--- volatility/plugins/linux/pslist.py | 7 +++--- volatility/plugins/linux/pslist_cache.py | 7 +++--- volatility/plugins/linux/pstree.py | 7 +++--- volatility/plugins/linux/psxview.py | 7 +++--- volatility/plugins/linux/route_cache.py | 7 +++--- volatility/plugins/linux/sk_buff_cache.py | 7 +++--- volatility/plugins/linux/slab_info.py | 7 +++--- volatility/plugins/linux/tmpfs.py | 7 +++--- volatility/plugins/linux/tty_check.py | 7 +++--- volatility/plugins/linux/vma_cache.py | 7 +++--- volatility/plugins/mac/arp.py | 7 +++--- volatility/plugins/mac/check_syscall_table.py | 7 +++--- volatility/plugins/mac/check_sysctl.py | 7 +++--- volatility/plugins/mac/check_trap_table.py | 7 +++--- volatility/plugins/mac/common.py | 19 ++++++++++----- volatility/plugins/mac/dead_procs.py | 7 +++--- volatility/plugins/mac/dmesg.py | 7 +++--- volatility/plugins/mac/dump_map.py | 7 +++--- volatility/plugins/mac/find_aslr_shift.py | 7 +++--- volatility/plugins/mac/ifconfig.py | 7 +++--- volatility/plugins/mac/ip_filters.py | 7 +++--- volatility/plugins/mac/list_zones.py | 7 +++--- volatility/plugins/mac/lsmod.py | 7 +++--- volatility/plugins/mac/lsof.py | 14 ++++------- volatility/plugins/mac/mac_volshell.py | 7 +++--- volatility/plugins/mac/mac_yarascan.py | 7 +++--- volatility/plugins/mac/machine_info.py | 7 +++--- volatility/plugins/mac/mount.py | 7 +++--- volatility/plugins/mac/netstat.py | 9 ++++---- volatility/plugins/mac/notifiers.py | 7 +++--- volatility/plugins/mac/pgrp_hash_table.py | 7 +++--- volatility/plugins/mac/pid_hash_table.py | 7 +++--- volatility/plugins/mac/print_boot_cmdline.py | 7 +++--- volatility/plugins/mac/proc_maps.py | 7 +++--- volatility/plugins/mac/psaux.py | 7 +++--- volatility/plugins/mac/pslist.py | 7 +++--- volatility/plugins/mac/pstasks.py | 7 +++--- volatility/plugins/mac/pstree.py | 7 +++--- volatility/plugins/mac/psxview.py | 7 +++--- volatility/plugins/mac/route.py | 7 +++--- volatility/plugins/mac/session_hash_table.py | 7 +++--- volatility/plugins/mac/trustedbsd.py | 7 +++--- volatility/plugins/mac/version.py | 7 +++--- volatility/plugins/machoinfo.py | 7 +++--- volatility/plugins/malware/apihooks.py | 7 +++--- volatility/plugins/malware/callbacks.py | 7 +++--- volatility/plugins/malware/cmdhistory.py | 7 +++--- volatility/plugins/malware/devicetree.py | 7 +++--- volatility/plugins/malware/idt.py | 7 +++--- volatility/plugins/malware/impscan.py | 7 +++--- volatility/plugins/malware/malfind.py | 7 +++--- volatility/plugins/malware/psxview.py | 7 +++--- volatility/plugins/malware/svcscan.py | 7 +++--- volatility/plugins/malware/threads.py | 7 +++--- volatility/plugins/malware/timers.py | 7 +++--- volatility/plugins/mbrparser.py | 7 +++--- volatility/plugins/mftparser.py | 7 +++--- volatility/plugins/moddump.py | 7 +++--- volatility/plugins/modscan.py | 7 +++--- volatility/plugins/modules.py | 7 +++--- volatility/plugins/netscan.py | 7 +++--- volatility/plugins/overlays/basic.py | 7 +++--- volatility/plugins/overlays/linux/elf.py | 7 +++--- volatility/plugins/overlays/linux/linux.py | 12 ++++++---- volatility/plugins/overlays/linux/linux64.py | 7 +++--- volatility/plugins/overlays/mac/mac.py | 23 +++++++++++++++---- .../plugins/overlays/windows/kdbg_vtypes.py | 7 +++--- .../plugins/overlays/windows/kpcr_vtypes.py | 7 +++--- .../plugins/overlays/windows/tcpip_vtypes.py | 7 +++--- volatility/plugins/overlays/windows/vista.py | 7 +++--- .../windows/vista_sp0_x64_syscalls.py | 7 +++--- .../windows/vista_sp0_x86_syscalls.py | 7 +++--- .../windows/vista_sp12_x64_syscalls.py | 7 +++--- .../windows/vista_sp12_x86_syscalls.py | 7 +++--- .../plugins/overlays/windows/win2003.py | 7 +++--- .../windows/win2003_sp0_x86_syscalls.py | 7 +++--- .../windows/win2003_sp12_x64_syscalls.py | 7 +++--- .../windows/win2003_sp12_x86_syscalls.py | 7 +++--- volatility/plugins/overlays/windows/win7.py | 7 +++--- .../windows/win7_sp01_x64_syscalls.py | 7 +++--- .../windows/win7_sp01_x86_syscalls.py | 7 +++--- .../plugins/overlays/windows/windows.py | 7 +++--- .../plugins/overlays/windows/windows64.py | 7 +++--- volatility/plugins/overlays/windows/xp.py | 7 +++--- .../overlays/windows/xp_sp2_x86_syscalls.py | 7 +++--- volatility/plugins/patcher.py | 7 +++--- volatility/plugins/privileges.py | 7 +++--- volatility/plugins/procdump.py | 7 +++--- volatility/plugins/pstree.py | 7 +++--- volatility/plugins/raw2dmp.py | 7 +++--- volatility/plugins/registry/hivelist.py | 7 +++--- volatility/plugins/registry/hivescan.py | 7 +++--- volatility/plugins/registry/lsadump.py | 7 +++--- volatility/plugins/registry/printkey.py | 7 +++--- volatility/plugins/registry/registryapi.py | 7 +++--- volatility/plugins/registry/shellbags.py | 7 +++--- volatility/plugins/registry/shimcache.py | 7 +++--- volatility/plugins/sockets.py | 7 +++--- volatility/plugins/sockscan.py | 7 +++--- volatility/plugins/ssdt.py | 7 +++--- volatility/plugins/strings.py | 7 +++--- volatility/plugins/taskmods.py | 7 +++--- volatility/plugins/timeliner.py | 7 +++--- volatility/plugins/userassist.py | 7 +++--- volatility/plugins/vadinfo.py | 7 +++--- volatility/plugins/vboxinfo.py | 7 +++--- volatility/plugins/vmwareinfo.py | 7 +++--- volatility/plugins/volshell.py | 7 +++--- volatility/scan.py | 7 +++--- volatility/timefmt.py | 7 +++--- volatility/utils.py | 7 +++--- volatility/win32/crashdump.py | 7 +++--- volatility/win32/domcachedump.py | 7 +++--- volatility/win32/hashdump.py | 7 +++--- volatility/win32/hive.py | 7 +++--- volatility/win32/lsasecrets.py | 7 +++--- volatility/win32/modules.py | 7 +++--- volatility/win32/network.py | 7 +++--- volatility/win32/rawreg.py | 7 +++--- volatility/win32/tasks.py | 7 +++--- volatility/win32/xpress.py | 7 +++--- 230 files changed, 725 insertions(+), 944 deletions(-) diff --git a/LEGAL.txt b/LEGAL.txt index 18decdd6..69924bca 100644 --- a/LEGAL.txt +++ b/LEGAL.txt @@ -7,10 +7,9 @@ License Copyright (C) 2007-2013 Volatility Foundation Volatility is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License Version 2 as -published by the Free Software Foundation. You may not use, modify or -distribute this program under any other version of the GNU General -Public License. +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. Volatility is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/LICENSE.txt b/LICENSE.txt index 9bf7326f..fa6a77d4 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -279,13 +279,3 @@ POSSIBILITY OF SUCH DAMAGES. END OF TERMS AND CONDITIONS -Notwithstanding any rights to use the Software granted by the foregoing, -if entities or individuals have received a Cease & Desist letter from -the Volatility Project, the Volatility Foundation, or its copyright holders -for violating the terms of the GPL version 2, those entities (their employees, -subcontractors, independent contractors, and affiliates) and / or persons -are granted no such rights and any use by any one or more of them is -expressly prohibited, in accordance with Section 4 of the GPL version 2. -Any rights granted to such entities and / or persons by earlier license -agreements have been previously terminated as to them. - diff --git a/README.txt b/README.txt index e93b8755..5e0eb4fc 100644 --- a/README.txt +++ b/README.txt @@ -434,10 +434,9 @@ Copyright (C) 2007-2013 Volatility Foundation All Rights Reserved Volatility is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License Version 2 as -published by the Free Software Foundation. You may not use, modify or -distribute this program under any other version of the GNU General -Public License. +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. Volatility is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/contrib/plugins/disablewarnings.py b/contrib/plugins/disablewarnings.py index 626efcf2..ba45fe8e 100644 --- a/contrib/plugins/disablewarnings.py +++ b/contrib/plugins/disablewarnings.py @@ -6,10 +6,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/contrib/plugins/enumfunc.py b/contrib/plugins/enumfunc.py index 8451778c..79c8a4a1 100644 --- a/contrib/plugins/enumfunc.py +++ b/contrib/plugins/enumfunc.py @@ -4,10 +4,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/contrib/plugins/example.py b/contrib/plugins/example.py index 5d807846..6eb39079 100644 --- a/contrib/plugins/example.py +++ b/contrib/plugins/example.py @@ -6,10 +6,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/contrib/plugins/malware/poisonivy.py b/contrib/plugins/malware/poisonivy.py index b3c68aea..16fffb57 100644 --- a/contrib/plugins/malware/poisonivy.py +++ b/contrib/plugins/malware/poisonivy.py @@ -11,10 +11,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/contrib/plugins/malware/zeusscan.py b/contrib/plugins/malware/zeusscan.py index ef80f76c..c0cd8e2f 100644 --- a/contrib/plugins/malware/zeusscan.py +++ b/contrib/plugins/malware/zeusscan.py @@ -9,10 +9,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/contrib/plugins/pagecheck.py b/contrib/plugins/pagecheck.py index a7c9bd54..cea7898c 100644 --- a/contrib/plugins/pagecheck.py +++ b/contrib/plugins/pagecheck.py @@ -3,10 +3,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/contrib/plugins/psdispscan.py b/contrib/plugins/psdispscan.py index f6f2e22d..a4911aae 100644 --- a/contrib/plugins/psdispscan.py +++ b/contrib/plugins/psdispscan.py @@ -6,10 +6,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/contrib/plugins/scanprof.py b/contrib/plugins/scanprof.py index ec620a31..59fd70bc 100644 --- a/contrib/plugins/scanprof.py +++ b/contrib/plugins/scanprof.py @@ -6,10 +6,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/contrib/plugins/verinfo.py b/contrib/plugins/verinfo.py index 4019bcb6..ef0c89a0 100644 --- a/contrib/plugins/verinfo.py +++ b/contrib/plugins/verinfo.py @@ -6,10 +6,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/setup.py b/setup.py index 51a1613c..6004649e 100644 --- a/setup.py +++ b/setup.py @@ -9,10 +9,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/tools/vtype_diff.py b/tools/vtype_diff.py index 323301be..55b31856 100755 --- a/tools/vtype_diff.py +++ b/tools/vtype_diff.py @@ -9,10 +9,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/vol.py b/vol.py index 7312c404..787d9928 100644 --- a/vol.py +++ b/vol.py @@ -7,10 +7,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/addrspace.py b/volatility/addrspace.py index dbeb3347..53dffdba 100755 --- a/volatility/addrspace.py +++ b/volatility/addrspace.py @@ -8,10 +8,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/cache.py b/volatility/cache.py index f01e977c..57eba0da 100644 --- a/volatility/cache.py +++ b/volatility/cache.py @@ -1,10 +1,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/commands.py b/volatility/commands.py index bb5f9e1e..a08f298b 100644 --- a/volatility/commands.py +++ b/volatility/commands.py @@ -4,10 +4,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/constants.py b/volatility/constants.py index 79f66d84..c2d67b97 100644 --- a/volatility/constants.py +++ b/volatility/constants.py @@ -4,10 +4,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/debug.py b/volatility/debug.py index c31da8ae..930e69e3 100644 --- a/volatility/debug.py +++ b/volatility/debug.py @@ -6,10 +6,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/dwarf.py b/volatility/dwarf.py index 30fd0774..237622ba 100644 --- a/volatility/dwarf.py +++ b/volatility/dwarf.py @@ -5,10 +5,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/exceptions.py b/volatility/exceptions.py index 3847bc32..5a2642c3 100644 --- a/volatility/exceptions.py +++ b/volatility/exceptions.py @@ -3,10 +3,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/fmtspec.py b/volatility/fmtspec.py index e6f3981c..d4865ac1 100644 --- a/volatility/fmtspec.py +++ b/volatility/fmtspec.py @@ -3,10 +3,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/obj.py b/volatility/obj.py index 8fc0504b..1a1782e0 100644 --- a/volatility/obj.py +++ b/volatility/obj.py @@ -7,10 +7,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/addrspaces/amd64.py b/volatility/plugins/addrspaces/amd64.py index 4c9dd831..cb29f341 100644 --- a/volatility/plugins/addrspaces/amd64.py +++ b/volatility/plugins/addrspaces/amd64.py @@ -7,10 +7,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/addrspaces/arm.py b/volatility/plugins/addrspaces/arm.py index 529bcf2a..46be95d3 100644 --- a/volatility/plugins/addrspaces/arm.py +++ b/volatility/plugins/addrspaces/arm.py @@ -7,10 +7,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/addrspaces/crash.py b/volatility/plugins/addrspaces/crash.py index da453bef..1c291d10 100644 --- a/volatility/plugins/addrspaces/crash.py +++ b/volatility/plugins/addrspaces/crash.py @@ -8,10 +8,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/addrspaces/hibernate.py b/volatility/plugins/addrspaces/hibernate.py index 2240f51f..fdf81a81 100644 --- a/volatility/plugins/addrspaces/hibernate.py +++ b/volatility/plugins/addrspaces/hibernate.py @@ -6,10 +6,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/addrspaces/hpak.py b/volatility/plugins/addrspaces/hpak.py index 52c4906a..50d76325 100644 --- a/volatility/plugins/addrspaces/hpak.py +++ b/volatility/plugins/addrspaces/hpak.py @@ -4,10 +4,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/addrspaces/ieee1394.py b/volatility/plugins/addrspaces/ieee1394.py index 9b43dc71..31e68094 100644 --- a/volatility/plugins/addrspaces/ieee1394.py +++ b/volatility/plugins/addrspaces/ieee1394.py @@ -6,10 +6,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -21,6 +20,7 @@ # import time +import volatility.debug as debug import urlparse import volatility.addrspace as addrspace @@ -28,7 +28,7 @@ import volatility.addrspace as addrspace check = urlparse.urlsplit("firewire://method/0") urlparse_broken = False if check[1] != 'method': - urlparse_broken = True + urlparse_broken = True def FirewireRW(netloc, location): if netloc in fw_implementations: @@ -67,13 +67,14 @@ class FWForensic1394(object): def __init__(self, location): """Initializes the firewire implementation""" self.location = location.strip('/') + debug.info("Waiting for 5s firewire to settle") self._bus = forensic1394.Bus() self._bus.enable_sbp2() + time.sleep(5) self._device = None def is_valid(self): try: - time.sleep(2) devices = self._bus.devices() # FIXME: Base the device off the location rather than hardcoded first remote device self._device = devices[int(self.location)] @@ -128,7 +129,7 @@ class FirewireAddressSpace(addrspace.BaseAddressSpace): self.name = "Firewire using " + str(netloc) + " at " + str(path) # We have no way of knowing how big a firewire space is... # Set it to the maximum for the moment - # TODO: Find a way of determining the size safely and reliably from the space itself + # TODO: Find a way of determining the size safely and reliably from the space itself self.size = 0xFFFFFFFF def intervals(self, start, size): diff --git a/volatility/plugins/addrspaces/intel.py b/volatility/plugins/addrspaces/intel.py index a95c3a79..fdf0114a 100644 --- a/volatility/plugins/addrspaces/intel.py +++ b/volatility/plugins/addrspaces/intel.py @@ -10,10 +10,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/addrspaces/lime.py b/volatility/plugins/addrspaces/lime.py index 0e11d36a..d4e4e4c0 100644 --- a/volatility/plugins/addrspaces/lime.py +++ b/volatility/plugins/addrspaces/lime.py @@ -7,10 +7,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/addrspaces/macho.py b/volatility/plugins/addrspaces/macho.py index 89f766c4..d7058a1a 100644 --- a/volatility/plugins/addrspaces/macho.py +++ b/volatility/plugins/addrspaces/macho.py @@ -6,10 +6,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/addrspaces/paged.py b/volatility/plugins/addrspaces/paged.py index cde4458f..484d4b68 100644 --- a/volatility/plugins/addrspaces/paged.py +++ b/volatility/plugins/addrspaces/paged.py @@ -4,10 +4,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/addrspaces/standard.py b/volatility/plugins/addrspaces/standard.py index 656ac65a..47d3d018 100644 --- a/volatility/plugins/addrspaces/standard.py +++ b/volatility/plugins/addrspaces/standard.py @@ -10,10 +10,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/addrspaces/vboxelf.py b/volatility/plugins/addrspaces/vboxelf.py index 68bd3072..ef1b370e 100644 --- a/volatility/plugins/addrspaces/vboxelf.py +++ b/volatility/plugins/addrspaces/vboxelf.py @@ -9,10 +9,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/addrspaces/vmware.py b/volatility/plugins/addrspaces/vmware.py index 295b3cc3..58915ce4 100644 --- a/volatility/plugins/addrspaces/vmware.py +++ b/volatility/plugins/addrspaces/vmware.py @@ -4,10 +4,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/bioskbd.py b/volatility/plugins/bioskbd.py index 8e099f22..8fdbf8d5 100644 --- a/volatility/plugins/bioskbd.py +++ b/volatility/plugins/bioskbd.py @@ -7,10 +7,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/common.py b/volatility/plugins/common.py index 30cfd0a9..cffc28f1 100644 --- a/volatility/plugins/common.py +++ b/volatility/plugins/common.py @@ -6,10 +6,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/connections.py b/volatility/plugins/connections.py index f7629e17..93a1a357 100644 --- a/volatility/plugins/connections.py +++ b/volatility/plugins/connections.py @@ -6,10 +6,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/connscan.py b/volatility/plugins/connscan.py index 72ec2448..fc7b5f77 100644 --- a/volatility/plugins/connscan.py +++ b/volatility/plugins/connscan.py @@ -5,10 +5,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/crashinfo.py b/volatility/plugins/crashinfo.py index 34bec0ca..0cd58e01 100644 --- a/volatility/plugins/crashinfo.py +++ b/volatility/plugins/crashinfo.py @@ -4,10 +4,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/dlldump.py b/volatility/plugins/dlldump.py index 1cf29f5c..2b3ee29a 100644 --- a/volatility/plugins/dlldump.py +++ b/volatility/plugins/dlldump.py @@ -8,10 +8,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/dumpcerts.py b/volatility/plugins/dumpcerts.py index da34ad5a..5f3da958 100644 --- a/volatility/plugins/dumpcerts.py +++ b/volatility/plugins/dumpcerts.py @@ -10,10 +10,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/dumpfiles.py b/volatility/plugins/dumpfiles.py index aff24ad0..1984214e 100644 --- a/volatility/plugins/dumpfiles.py +++ b/volatility/plugins/dumpfiles.py @@ -17,15 +17,6 @@ # You should have received a copy of the GNU General Public License # along with Volatility. If not, see . # -# Notwithstanding any rights to use the Software granted by the foregoing, -# if entities or individuals have received a Cease & Desist letter from -# the Volatility Project, the Volatility Foundation, or its copyright holders -# for violating the terms of the GPL version 2, those entities (their employees, -# subcontractors, independent contractors, and affiliates) and / or persons -# are granted no such rights and any use by any one or more of them is -# expressly prohibited, in accordance with Section 4 of the GPL version 2. -# Any rights granted to such entities and / or persons by earlier license -# agreements have been previously terminated as to them. #pylint: disable-msg=C0111 diff --git a/volatility/plugins/envars.py b/volatility/plugins/envars.py index be4c12d7..4fbb24bc 100644 --- a/volatility/plugins/envars.py +++ b/volatility/plugins/envars.py @@ -5,10 +5,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/evtlogs.py b/volatility/plugins/evtlogs.py index d08a577c..c3d77098 100644 --- a/volatility/plugins/evtlogs.py +++ b/volatility/plugins/evtlogs.py @@ -5,10 +5,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/fileparam.py b/volatility/plugins/fileparam.py index 60bf3585..049ec507 100644 --- a/volatility/plugins/fileparam.py +++ b/volatility/plugins/fileparam.py @@ -6,10 +6,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/filescan.py b/volatility/plugins/filescan.py index 4a88178f..80b75fd1 100644 --- a/volatility/plugins/filescan.py +++ b/volatility/plugins/filescan.py @@ -5,10 +5,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/getservicesids.py b/volatility/plugins/getservicesids.py index f278de1f..2d660c75 100644 --- a/volatility/plugins/getservicesids.py +++ b/volatility/plugins/getservicesids.py @@ -5,10 +5,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/getsids.py b/volatility/plugins/getsids.py index 944deeba..d974cbdf 100644 --- a/volatility/plugins/getsids.py +++ b/volatility/plugins/getsids.py @@ -7,10 +7,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/gui/atoms.py b/volatility/plugins/gui/atoms.py index 782123bc..998b83b6 100644 --- a/volatility/plugins/gui/atoms.py +++ b/volatility/plugins/gui/atoms.py @@ -5,10 +5,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/gui/clipboard.py b/volatility/plugins/gui/clipboard.py index 8f835e8c..82672693 100644 --- a/volatility/plugins/gui/clipboard.py +++ b/volatility/plugins/gui/clipboard.py @@ -5,10 +5,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/gui/constants.py b/volatility/plugins/gui/constants.py index 01180d27..927e6cd7 100644 --- a/volatility/plugins/gui/constants.py +++ b/volatility/plugins/gui/constants.py @@ -6,10 +6,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/gui/desktops.py b/volatility/plugins/gui/desktops.py index f8c18b37..62b363aa 100644 --- a/volatility/plugins/gui/desktops.py +++ b/volatility/plugins/gui/desktops.py @@ -5,10 +5,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/gui/eventhooks.py b/volatility/plugins/gui/eventhooks.py index 47d3680c..b07ebfcb 100644 --- a/volatility/plugins/gui/eventhooks.py +++ b/volatility/plugins/gui/eventhooks.py @@ -5,10 +5,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/gui/gahti.py b/volatility/plugins/gui/gahti.py index 2ec92049..92ac78e1 100644 --- a/volatility/plugins/gui/gahti.py +++ b/volatility/plugins/gui/gahti.py @@ -5,10 +5,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/gui/gditimers.py b/volatility/plugins/gui/gditimers.py index 5978b5ed..245fb62b 100644 --- a/volatility/plugins/gui/gditimers.py +++ b/volatility/plugins/gui/gditimers.py @@ -5,10 +5,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/gui/messagehooks.py b/volatility/plugins/gui/messagehooks.py index 7f12812b..86a2658b 100644 --- a/volatility/plugins/gui/messagehooks.py +++ b/volatility/plugins/gui/messagehooks.py @@ -5,10 +5,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/gui/screenshot.py b/volatility/plugins/gui/screenshot.py index 0ac66768..058157e3 100644 --- a/volatility/plugins/gui/screenshot.py +++ b/volatility/plugins/gui/screenshot.py @@ -6,10 +6,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/gui/sessions.py b/volatility/plugins/gui/sessions.py index cdef79b0..2f84fa6c 100644 --- a/volatility/plugins/gui/sessions.py +++ b/volatility/plugins/gui/sessions.py @@ -5,10 +5,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/gui/userhandles.py b/volatility/plugins/gui/userhandles.py index 0d273a8f..dcc3f1ee 100644 --- a/volatility/plugins/gui/userhandles.py +++ b/volatility/plugins/gui/userhandles.py @@ -5,10 +5,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/gui/vtypes/vista.py b/volatility/plugins/gui/vtypes/vista.py index 42665b63..b6f9f5f1 100644 --- a/volatility/plugins/gui/vtypes/vista.py +++ b/volatility/plugins/gui/vtypes/vista.py @@ -5,10 +5,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/gui/vtypes/win2003.py b/volatility/plugins/gui/vtypes/win2003.py index 702e328b..9b43b734 100644 --- a/volatility/plugins/gui/vtypes/win2003.py +++ b/volatility/plugins/gui/vtypes/win2003.py @@ -5,10 +5,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/gui/vtypes/win7.py b/volatility/plugins/gui/vtypes/win7.py index 84771dfe..99486951 100644 --- a/volatility/plugins/gui/vtypes/win7.py +++ b/volatility/plugins/gui/vtypes/win7.py @@ -5,10 +5,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/gui/vtypes/xp.py b/volatility/plugins/gui/vtypes/xp.py index 543bd85d..95468d1b 100644 --- a/volatility/plugins/gui/vtypes/xp.py +++ b/volatility/plugins/gui/vtypes/xp.py @@ -5,10 +5,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/gui/win32k_core.py b/volatility/plugins/gui/win32k_core.py index 287046d2..290df147 100644 --- a/volatility/plugins/gui/win32k_core.py +++ b/volatility/plugins/gui/win32k_core.py @@ -5,10 +5,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/gui/windows.py b/volatility/plugins/gui/windows.py index 976ac596..8d4f469c 100644 --- a/volatility/plugins/gui/windows.py +++ b/volatility/plugins/gui/windows.py @@ -5,10 +5,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/gui/windowstations.py b/volatility/plugins/gui/windowstations.py index 0dfc1388..06a27e3e 100644 --- a/volatility/plugins/gui/windowstations.py +++ b/volatility/plugins/gui/windowstations.py @@ -5,10 +5,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/handles.py b/volatility/plugins/handles.py index b62dfc1c..3eeb343e 100644 --- a/volatility/plugins/handles.py +++ b/volatility/plugins/handles.py @@ -7,10 +7,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -73,6 +72,10 @@ class Handles(taskmods.DllList): pid = task.UniqueProcessId if task.ObjectTable.HandleTableList: for handle in task.ObjectTable.handles(): + + if not handle.is_valid(): + continue + name = "" object_type = handle.get_object_type() if object_type == "File": diff --git a/volatility/plugins/hibinfo.py b/volatility/plugins/hibinfo.py index 9accd8d7..1791719a 100644 --- a/volatility/plugins/hibinfo.py +++ b/volatility/plugins/hibinfo.py @@ -6,10 +6,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/hpakinfo.py b/volatility/plugins/hpakinfo.py index 56c475a1..4598c9d8 100644 --- a/volatility/plugins/hpakinfo.py +++ b/volatility/plugins/hpakinfo.py @@ -4,10 +4,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/iehistory.py b/volatility/plugins/iehistory.py index 6b0b3be2..4dbe7f35 100644 --- a/volatility/plugins/iehistory.py +++ b/volatility/plugins/iehistory.py @@ -5,10 +5,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/imagecopy.py b/volatility/plugins/imagecopy.py index 7a171c33..003a71d6 100644 --- a/volatility/plugins/imagecopy.py +++ b/volatility/plugins/imagecopy.py @@ -6,10 +6,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/imageinfo.py b/volatility/plugins/imageinfo.py index 7d23e8e0..344e0e0e 100644 --- a/volatility/plugins/imageinfo.py +++ b/volatility/plugins/imageinfo.py @@ -6,10 +6,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/kdbgscan.py b/volatility/plugins/kdbgscan.py index 99c83ace..522f82a2 100644 --- a/volatility/plugins/kdbgscan.py +++ b/volatility/plugins/kdbgscan.py @@ -6,10 +6,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/kpcrscan.py b/volatility/plugins/kpcrscan.py index 7839db75..b9d4c618 100644 --- a/volatility/plugins/kpcrscan.py +++ b/volatility/plugins/kpcrscan.py @@ -3,10 +3,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/linux/arp.py b/volatility/plugins/linux/arp.py index 9087d45a..5ca922a5 100644 --- a/volatility/plugins/linux/arp.py +++ b/volatility/plugins/linux/arp.py @@ -4,10 +4,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/linux/banner.py b/volatility/plugins/linux/banner.py index 55279c84..e416d343 100644 --- a/volatility/plugins/linux/banner.py +++ b/volatility/plugins/linux/banner.py @@ -4,10 +4,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/linux/bash.py b/volatility/plugins/linux/bash.py index 68f60e36..7d16fe34 100644 --- a/volatility/plugins/linux/bash.py +++ b/volatility/plugins/linux/bash.py @@ -4,10 +4,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/linux/check_afinfo.py b/volatility/plugins/linux/check_afinfo.py index ad6a7771..73c69936 100644 --- a/volatility/plugins/linux/check_afinfo.py +++ b/volatility/plugins/linux/check_afinfo.py @@ -4,10 +4,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/linux/check_creds.py b/volatility/plugins/linux/check_creds.py index 35fcd5ea..5d7d831e 100644 --- a/volatility/plugins/linux/check_creds.py +++ b/volatility/plugins/linux/check_creds.py @@ -4,10 +4,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/linux/check_evt_arm.py b/volatility/plugins/linux/check_evt_arm.py index 6875b82e..68072bb5 100644 --- a/volatility/plugins/linux/check_evt_arm.py +++ b/volatility/plugins/linux/check_evt_arm.py @@ -3,10 +3,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/linux/check_fops.py b/volatility/plugins/linux/check_fops.py index e8a6a11d..08047964 100644 --- a/volatility/plugins/linux/check_fops.py +++ b/volatility/plugins/linux/check_fops.py @@ -4,10 +4,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/linux/check_idt.py b/volatility/plugins/linux/check_idt.py index 4d507c7d..74f99673 100644 --- a/volatility/plugins/linux/check_idt.py +++ b/volatility/plugins/linux/check_idt.py @@ -4,10 +4,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/linux/check_modules.py b/volatility/plugins/linux/check_modules.py index 62ee81cf..84e86386 100644 --- a/volatility/plugins/linux/check_modules.py +++ b/volatility/plugins/linux/check_modules.py @@ -4,10 +4,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/linux/check_syscall.py b/volatility/plugins/linux/check_syscall.py index bc146529..2ffa1aa1 100644 --- a/volatility/plugins/linux/check_syscall.py +++ b/volatility/plugins/linux/check_syscall.py @@ -4,10 +4,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/linux/check_syscall_arm.py b/volatility/plugins/linux/check_syscall_arm.py index 71a15ca2..1a1b7468 100644 --- a/volatility/plugins/linux/check_syscall_arm.py +++ b/volatility/plugins/linux/check_syscall_arm.py @@ -3,10 +3,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/linux/common.py b/volatility/plugins/linux/common.py index 03ccbe40..788b7204 100644 --- a/volatility/plugins/linux/common.py +++ b/volatility/plugins/linux/common.py @@ -4,10 +4,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/linux/cpuinfo.py b/volatility/plugins/linux/cpuinfo.py index 2129f1ac..1ee33814 100644 --- a/volatility/plugins/linux/cpuinfo.py +++ b/volatility/plugins/linux/cpuinfo.py @@ -4,10 +4,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/linux/dentry_cache.py b/volatility/plugins/linux/dentry_cache.py index 7eb71df2..c5845c3c 100644 --- a/volatility/plugins/linux/dentry_cache.py +++ b/volatility/plugins/linux/dentry_cache.py @@ -4,10 +4,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/linux/dmesg.py b/volatility/plugins/linux/dmesg.py index 25e54083..238a5832 100644 --- a/volatility/plugins/linux/dmesg.py +++ b/volatility/plugins/linux/dmesg.py @@ -4,10 +4,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/linux/dump_map.py b/volatility/plugins/linux/dump_map.py index c09e077d..965fb1a4 100644 --- a/volatility/plugins/linux/dump_map.py +++ b/volatility/plugins/linux/dump_map.py @@ -4,10 +4,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/linux/find_file.py b/volatility/plugins/linux/find_file.py index 4324bb69..5528b6ac 100644 --- a/volatility/plugins/linux/find_file.py +++ b/volatility/plugins/linux/find_file.py @@ -4,10 +4,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/linux/flags.py b/volatility/plugins/linux/flags.py index 9c51e36e..341ff137 100644 --- a/volatility/plugins/linux/flags.py +++ b/volatility/plugins/linux/flags.py @@ -4,10 +4,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/linux/ifconfig.py b/volatility/plugins/linux/ifconfig.py index 35f88a7e..6b634055 100644 --- a/volatility/plugins/linux/ifconfig.py +++ b/volatility/plugins/linux/ifconfig.py @@ -4,10 +4,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/linux/iomem.py b/volatility/plugins/linux/iomem.py index e453f998..0e7b8312 100644 --- a/volatility/plugins/linux/iomem.py +++ b/volatility/plugins/linux/iomem.py @@ -4,10 +4,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/linux/keyboard_notifier.py b/volatility/plugins/linux/keyboard_notifier.py index 808d4ae2..85b541f8 100644 --- a/volatility/plugins/linux/keyboard_notifier.py +++ b/volatility/plugins/linux/keyboard_notifier.py @@ -3,10 +3,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/linux/linux_volshell.py b/volatility/plugins/linux/linux_volshell.py index 83b26dfc..068498ea 100644 --- a/volatility/plugins/linux/linux_volshell.py +++ b/volatility/plugins/linux/linux_volshell.py @@ -4,10 +4,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/linux/linux_yarascan.py b/volatility/plugins/linux/linux_yarascan.py index f3bae0a9..58d2f95b 100644 --- a/volatility/plugins/linux/linux_yarascan.py +++ b/volatility/plugins/linux/linux_yarascan.py @@ -4,10 +4,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/linux/lsmod.py b/volatility/plugins/linux/lsmod.py index 699f8cf3..40964aa0 100644 --- a/volatility/plugins/linux/lsmod.py +++ b/volatility/plugins/linux/lsmod.py @@ -4,10 +4,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/linux/lsof.py b/volatility/plugins/linux/lsof.py index 4cd7ab09..8a566369 100644 --- a/volatility/plugins/linux/lsof.py +++ b/volatility/plugins/linux/lsof.py @@ -4,10 +4,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/linux/mount.py b/volatility/plugins/linux/mount.py index 58982220..f18d2b39 100644 --- a/volatility/plugins/linux/mount.py +++ b/volatility/plugins/linux/mount.py @@ -4,10 +4,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/linux/mount_cache.py b/volatility/plugins/linux/mount_cache.py index d09d8864..3a434262 100644 --- a/volatility/plugins/linux/mount_cache.py +++ b/volatility/plugins/linux/mount_cache.py @@ -3,10 +3,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/linux/netstat.py b/volatility/plugins/linux/netstat.py index 3ee8c2b7..9fe3ea6d 100644 --- a/volatility/plugins/linux/netstat.py +++ b/volatility/plugins/linux/netstat.py @@ -4,10 +4,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/linux/pidhashtable.py b/volatility/plugins/linux/pidhashtable.py index 57f15139..5d5f856e 100644 --- a/volatility/plugins/linux/pidhashtable.py +++ b/volatility/plugins/linux/pidhashtable.py @@ -4,10 +4,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/linux/pkt_queues.py b/volatility/plugins/linux/pkt_queues.py index 00159510..de585587 100644 --- a/volatility/plugins/linux/pkt_queues.py +++ b/volatility/plugins/linux/pkt_queues.py @@ -4,10 +4,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/linux/proc_maps.py b/volatility/plugins/linux/proc_maps.py index 902b3071..8d98c3e7 100644 --- a/volatility/plugins/linux/proc_maps.py +++ b/volatility/plugins/linux/proc_maps.py @@ -4,10 +4,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/linux/psaux.py b/volatility/plugins/linux/psaux.py index 69bffadd..85971d82 100644 --- a/volatility/plugins/linux/psaux.py +++ b/volatility/plugins/linux/psaux.py @@ -4,10 +4,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/linux/pslist.py b/volatility/plugins/linux/pslist.py index 92babfcc..15159194 100644 --- a/volatility/plugins/linux/pslist.py +++ b/volatility/plugins/linux/pslist.py @@ -4,10 +4,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/linux/pslist_cache.py b/volatility/plugins/linux/pslist_cache.py index 27e799e0..6bdcd57f 100644 --- a/volatility/plugins/linux/pslist_cache.py +++ b/volatility/plugins/linux/pslist_cache.py @@ -3,10 +3,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/linux/pstree.py b/volatility/plugins/linux/pstree.py index f8a71c49..fb6ccf40 100644 --- a/volatility/plugins/linux/pstree.py +++ b/volatility/plugins/linux/pstree.py @@ -2,10 +2,9 @@ # Copyright (C) 2007-2013 Volatility Foundation # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/linux/psxview.py b/volatility/plugins/linux/psxview.py index 0ec326fb..8eac100e 100644 --- a/volatility/plugins/linux/psxview.py +++ b/volatility/plugins/linux/psxview.py @@ -5,10 +5,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/linux/route_cache.py b/volatility/plugins/linux/route_cache.py index 69bda411..257b796f 100644 --- a/volatility/plugins/linux/route_cache.py +++ b/volatility/plugins/linux/route_cache.py @@ -4,10 +4,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/linux/sk_buff_cache.py b/volatility/plugins/linux/sk_buff_cache.py index 55f42a5d..ee6da1cb 100644 --- a/volatility/plugins/linux/sk_buff_cache.py +++ b/volatility/plugins/linux/sk_buff_cache.py @@ -4,10 +4,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/linux/slab_info.py b/volatility/plugins/linux/slab_info.py index db103fb2..c8518e9a 100644 --- a/volatility/plugins/linux/slab_info.py +++ b/volatility/plugins/linux/slab_info.py @@ -3,10 +3,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/linux/tmpfs.py b/volatility/plugins/linux/tmpfs.py index 532c9638..9239f3cf 100644 --- a/volatility/plugins/linux/tmpfs.py +++ b/volatility/plugins/linux/tmpfs.py @@ -4,10 +4,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/linux/tty_check.py b/volatility/plugins/linux/tty_check.py index 37b9d27c..e12ab35b 100644 --- a/volatility/plugins/linux/tty_check.py +++ b/volatility/plugins/linux/tty_check.py @@ -3,10 +3,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/linux/vma_cache.py b/volatility/plugins/linux/vma_cache.py index 2ab8b908..b41aa203 100644 --- a/volatility/plugins/linux/vma_cache.py +++ b/volatility/plugins/linux/vma_cache.py @@ -4,10 +4,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/mac/arp.py b/volatility/plugins/mac/arp.py index 04959c4f..97662fbe 100644 --- a/volatility/plugins/mac/arp.py +++ b/volatility/plugins/mac/arp.py @@ -4,10 +4,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/mac/check_syscall_table.py b/volatility/plugins/mac/check_syscall_table.py index 33743150..01e1f6c2 100644 --- a/volatility/plugins/mac/check_syscall_table.py +++ b/volatility/plugins/mac/check_syscall_table.py @@ -4,10 +4,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/mac/check_sysctl.py b/volatility/plugins/mac/check_sysctl.py index 13ddadd6..3939cb74 100644 --- a/volatility/plugins/mac/check_sysctl.py +++ b/volatility/plugins/mac/check_sysctl.py @@ -4,10 +4,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/mac/check_trap_table.py b/volatility/plugins/mac/check_trap_table.py index 5ce37506..488cb582 100644 --- a/volatility/plugins/mac/check_trap_table.py +++ b/volatility/plugins/mac/check_trap_table.py @@ -4,10 +4,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/mac/common.py b/volatility/plugins/mac/common.py index 875635cb..7fa95625 100644 --- a/volatility/plugins/mac/common.py +++ b/volatility/plugins/mac/common.py @@ -4,10 +4,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -76,8 +75,16 @@ def is_64bit_capable(addr_space): @returns True if 64-bit capable. """ x86_64_flag_addr = addr_space.profile.get_symbol("_x86_64_flag") - x86_64_flag = obj.Object("int", offset = x86_64_flag_addr, vm = addr_space) - return x86_64_flag == 1 + + # this symbol no longer exists in 10.9 / Mavericks + # this is most likely b/c all Macs are 64 bit by 10.9 + if x86_64_flag_addr: + x86_64_flag = obj.Object("int", offset = x86_64_flag_addr, vm = addr_space) + ret = x86_64_flag == 1 + else: + ret = True + + return ret def get_kernel_addrs(obj_ref): import volatility.plugins.mac.lsmod as lsmod diff --git a/volatility/plugins/mac/dead_procs.py b/volatility/plugins/mac/dead_procs.py index 8fa6d8b8..3c2e2c43 100644 --- a/volatility/plugins/mac/dead_procs.py +++ b/volatility/plugins/mac/dead_procs.py @@ -4,10 +4,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/mac/dmesg.py b/volatility/plugins/mac/dmesg.py index 2f275c3b..aa370c3c 100644 --- a/volatility/plugins/mac/dmesg.py +++ b/volatility/plugins/mac/dmesg.py @@ -4,10 +4,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/mac/dump_map.py b/volatility/plugins/mac/dump_map.py index 304d6c09..4a5fd7a9 100644 --- a/volatility/plugins/mac/dump_map.py +++ b/volatility/plugins/mac/dump_map.py @@ -4,10 +4,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/mac/find_aslr_shift.py b/volatility/plugins/mac/find_aslr_shift.py index 335fd88c..2ba584a3 100644 --- a/volatility/plugins/mac/find_aslr_shift.py +++ b/volatility/plugins/mac/find_aslr_shift.py @@ -4,10 +4,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/mac/ifconfig.py b/volatility/plugins/mac/ifconfig.py index 66879e66..334fc0c5 100644 --- a/volatility/plugins/mac/ifconfig.py +++ b/volatility/plugins/mac/ifconfig.py @@ -4,10 +4,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/mac/ip_filters.py b/volatility/plugins/mac/ip_filters.py index 65d1a8b7..bbf5ca3d 100644 --- a/volatility/plugins/mac/ip_filters.py +++ b/volatility/plugins/mac/ip_filters.py @@ -4,10 +4,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/mac/list_zones.py b/volatility/plugins/mac/list_zones.py index 2787fc1f..55d2f2a6 100644 --- a/volatility/plugins/mac/list_zones.py +++ b/volatility/plugins/mac/list_zones.py @@ -4,10 +4,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/mac/lsmod.py b/volatility/plugins/mac/lsmod.py index d7a6d68c..ea04667a 100644 --- a/volatility/plugins/mac/lsmod.py +++ b/volatility/plugins/mac/lsmod.py @@ -4,10 +4,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/mac/lsof.py b/volatility/plugins/mac/lsof.py index 25df2276..5db70b96 100644 --- a/volatility/plugins/mac/lsof.py +++ b/volatility/plugins/mac/lsof.py @@ -4,10 +4,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -42,11 +41,8 @@ class mac_lsof(pstasks.mac_tasks): for i, fd in enumerate(fds): f = fd.dereference_as("fileproc") if f: - ## FIXME after 2.3 replace this explicit int field with the following line: - ## if str(f.f_fglob.fg_type) == 'DTYPE_VNODE': - ## Its not needed for profiles generated with convert.py after r3290 - fg_type = obj.Object("int", f.f_fglob.fg_type.obj_offset, vm = self.addr_space) - if fg_type == 1: # VNODE + ftype = f.f_fglob.fg_type + if ftype == 'DTYPE_VNODE': vnode = f.f_fglob.fg_data.dereference_as("vnode") path = vnode.full_path() else: diff --git a/volatility/plugins/mac/mac_volshell.py b/volatility/plugins/mac/mac_volshell.py index 31893cda..129629ef 100644 --- a/volatility/plugins/mac/mac_volshell.py +++ b/volatility/plugins/mac/mac_volshell.py @@ -4,10 +4,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/mac/mac_yarascan.py b/volatility/plugins/mac/mac_yarascan.py index b15e792d..52241042 100644 --- a/volatility/plugins/mac/mac_yarascan.py +++ b/volatility/plugins/mac/mac_yarascan.py @@ -4,10 +4,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/mac/machine_info.py b/volatility/plugins/mac/machine_info.py index 6b3f6176..82d17aca 100644 --- a/volatility/plugins/mac/machine_info.py +++ b/volatility/plugins/mac/machine_info.py @@ -4,10 +4,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/mac/mount.py b/volatility/plugins/mac/mount.py index cfcc3c76..2aa9d2cb 100644 --- a/volatility/plugins/mac/mount.py +++ b/volatility/plugins/mac/mount.py @@ -4,10 +4,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/mac/netstat.py b/volatility/plugins/mac/netstat.py index adf62dcd..7d497226 100644 --- a/volatility/plugins/mac/netstat.py +++ b/volatility/plugins/mac/netstat.py @@ -4,10 +4,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -42,7 +41,7 @@ class mac_netstat(lsof.mac_lsof): ("Process", "24")]) for proc, i, fd, _path in data: - if str(fd.f_fglob.fg_type or '') == 'DTYPE_SOCKET': + if fd.f_fglob.fg_type == 'DTYPE_SOCKET': socket = fd.f_fglob.fg_data.dereference_as("socket") family = socket.family diff --git a/volatility/plugins/mac/notifiers.py b/volatility/plugins/mac/notifiers.py index cd39bfde..c4446273 100644 --- a/volatility/plugins/mac/notifiers.py +++ b/volatility/plugins/mac/notifiers.py @@ -4,10 +4,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/mac/pgrp_hash_table.py b/volatility/plugins/mac/pgrp_hash_table.py index 3b84aaf2..033bdea0 100644 --- a/volatility/plugins/mac/pgrp_hash_table.py +++ b/volatility/plugins/mac/pgrp_hash_table.py @@ -4,10 +4,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/mac/pid_hash_table.py b/volatility/plugins/mac/pid_hash_table.py index 0bf5e885..646cdd32 100644 --- a/volatility/plugins/mac/pid_hash_table.py +++ b/volatility/plugins/mac/pid_hash_table.py @@ -4,10 +4,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/mac/print_boot_cmdline.py b/volatility/plugins/mac/print_boot_cmdline.py index 7788fece..a456dc09 100644 --- a/volatility/plugins/mac/print_boot_cmdline.py +++ b/volatility/plugins/mac/print_boot_cmdline.py @@ -4,10 +4,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/mac/proc_maps.py b/volatility/plugins/mac/proc_maps.py index 8b1c7224..0173fb53 100644 --- a/volatility/plugins/mac/proc_maps.py +++ b/volatility/plugins/mac/proc_maps.py @@ -4,10 +4,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/mac/psaux.py b/volatility/plugins/mac/psaux.py index 9a50da06..0ec02373 100644 --- a/volatility/plugins/mac/psaux.py +++ b/volatility/plugins/mac/psaux.py @@ -4,10 +4,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/mac/pslist.py b/volatility/plugins/mac/pslist.py index 79589ee2..2e920bd2 100644 --- a/volatility/plugins/mac/pslist.py +++ b/volatility/plugins/mac/pslist.py @@ -4,10 +4,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/mac/pstasks.py b/volatility/plugins/mac/pstasks.py index 008032c8..ac2997c3 100644 --- a/volatility/plugins/mac/pstasks.py +++ b/volatility/plugins/mac/pstasks.py @@ -4,10 +4,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/mac/pstree.py b/volatility/plugins/mac/pstree.py index d3198c09..bd9a8115 100644 --- a/volatility/plugins/mac/pstree.py +++ b/volatility/plugins/mac/pstree.py @@ -4,10 +4,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/mac/psxview.py b/volatility/plugins/mac/psxview.py index 974d5ba1..856a5341 100644 --- a/volatility/plugins/mac/psxview.py +++ b/volatility/plugins/mac/psxview.py @@ -5,10 +5,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/mac/route.py b/volatility/plugins/mac/route.py index 5a2fa9bf..cadebf37 100644 --- a/volatility/plugins/mac/route.py +++ b/volatility/plugins/mac/route.py @@ -4,10 +4,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/mac/session_hash_table.py b/volatility/plugins/mac/session_hash_table.py index f29125e8..4f649bc8 100644 --- a/volatility/plugins/mac/session_hash_table.py +++ b/volatility/plugins/mac/session_hash_table.py @@ -4,10 +4,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/mac/trustedbsd.py b/volatility/plugins/mac/trustedbsd.py index f8870d49..83a288a0 100644 --- a/volatility/plugins/mac/trustedbsd.py +++ b/volatility/plugins/mac/trustedbsd.py @@ -4,10 +4,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/mac/version.py b/volatility/plugins/mac/version.py index c94be439..24229dfc 100644 --- a/volatility/plugins/mac/version.py +++ b/volatility/plugins/mac/version.py @@ -4,10 +4,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/machoinfo.py b/volatility/plugins/machoinfo.py index c2a84155..c36383ce 100644 --- a/volatility/plugins/machoinfo.py +++ b/volatility/plugins/machoinfo.py @@ -4,10 +4,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/malware/apihooks.py b/volatility/plugins/malware/apihooks.py index b871faf6..fbe3673b 100644 --- a/volatility/plugins/malware/apihooks.py +++ b/volatility/plugins/malware/apihooks.py @@ -7,10 +7,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/malware/callbacks.py b/volatility/plugins/malware/callbacks.py index 17120ea7..04659a23 100644 --- a/volatility/plugins/malware/callbacks.py +++ b/volatility/plugins/malware/callbacks.py @@ -5,10 +5,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/malware/cmdhistory.py b/volatility/plugins/malware/cmdhistory.py index fd74a442..ec2ee468 100644 --- a/volatility/plugins/malware/cmdhistory.py +++ b/volatility/plugins/malware/cmdhistory.py @@ -12,10 +12,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/malware/devicetree.py b/volatility/plugins/malware/devicetree.py index 80eada29..52caa0f6 100644 --- a/volatility/plugins/malware/devicetree.py +++ b/volatility/plugins/malware/devicetree.py @@ -5,10 +5,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/malware/idt.py b/volatility/plugins/malware/idt.py index fb1cdbf7..b2b0c639 100644 --- a/volatility/plugins/malware/idt.py +++ b/volatility/plugins/malware/idt.py @@ -5,10 +5,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/malware/impscan.py b/volatility/plugins/malware/impscan.py index 0e244e02..fe17adba 100644 --- a/volatility/plugins/malware/impscan.py +++ b/volatility/plugins/malware/impscan.py @@ -5,10 +5,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/malware/malfind.py b/volatility/plugins/malware/malfind.py index c7270c03..f99207fb 100644 --- a/volatility/plugins/malware/malfind.py +++ b/volatility/plugins/malware/malfind.py @@ -5,10 +5,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/malware/psxview.py b/volatility/plugins/malware/psxview.py index 200b0f92..da76a950 100644 --- a/volatility/plugins/malware/psxview.py +++ b/volatility/plugins/malware/psxview.py @@ -5,10 +5,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/malware/svcscan.py b/volatility/plugins/malware/svcscan.py index 17888024..2ce9d912 100644 --- a/volatility/plugins/malware/svcscan.py +++ b/volatility/plugins/malware/svcscan.py @@ -5,10 +5,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/malware/threads.py b/volatility/plugins/malware/threads.py index bf45449d..f4d5c92c 100644 --- a/volatility/plugins/malware/threads.py +++ b/volatility/plugins/malware/threads.py @@ -5,10 +5,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/malware/timers.py b/volatility/plugins/malware/timers.py index 4be7a74c..0d25dd18 100644 --- a/volatility/plugins/malware/timers.py +++ b/volatility/plugins/malware/timers.py @@ -5,10 +5,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/mbrparser.py b/volatility/plugins/mbrparser.py index 580adff7..79e60660 100644 --- a/volatility/plugins/mbrparser.py +++ b/volatility/plugins/mbrparser.py @@ -5,10 +5,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/mftparser.py b/volatility/plugins/mftparser.py index 89b2b641..ab81c749 100644 --- a/volatility/plugins/mftparser.py +++ b/volatility/plugins/mftparser.py @@ -5,10 +5,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/moddump.py b/volatility/plugins/moddump.py index 194b3da8..c7c18e02 100644 --- a/volatility/plugins/moddump.py +++ b/volatility/plugins/moddump.py @@ -8,10 +8,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/modscan.py b/volatility/plugins/modscan.py index c04c131a..4d770d25 100644 --- a/volatility/plugins/modscan.py +++ b/volatility/plugins/modscan.py @@ -5,10 +5,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/modules.py b/volatility/plugins/modules.py index 047a0a3a..6dfef0c4 100644 --- a/volatility/plugins/modules.py +++ b/volatility/plugins/modules.py @@ -6,10 +6,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/netscan.py b/volatility/plugins/netscan.py index c634e003..28d272dd 100644 --- a/volatility/plugins/netscan.py +++ b/volatility/plugins/netscan.py @@ -6,10 +6,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/overlays/basic.py b/volatility/plugins/overlays/basic.py index 257a3ad6..904c18ba 100644 --- a/volatility/plugins/overlays/basic.py +++ b/volatility/plugins/overlays/basic.py @@ -7,10 +7,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/overlays/linux/elf.py b/volatility/plugins/overlays/linux/elf.py index ea1deed8..728b5f18 100644 --- a/volatility/plugins/overlays/linux/elf.py +++ b/volatility/plugins/overlays/linux/elf.py @@ -4,10 +4,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/overlays/linux/linux.py b/volatility/plugins/overlays/linux/linux.py index 83b22c93..1ccc0f5e 100644 --- a/volatility/plugins/overlays/linux/linux.py +++ b/volatility/plugins/overlays/linux/linux.py @@ -5,10 +5,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -135,7 +134,10 @@ def parse_system_map(data, module): # get the system map for line in data.splitlines(): - (str_addr, symbol_type, symbol) = line.strip().split() + try: + (str_addr, symbol_type, symbol) = line.strip().split() + except ValueError: + continue try: sym_addr = long(str_addr, 16) diff --git a/volatility/plugins/overlays/linux/linux64.py b/volatility/plugins/overlays/linux/linux64.py index 1328ca68..68793a99 100644 --- a/volatility/plugins/overlays/linux/linux64.py +++ b/volatility/plugins/overlays/linux/linux64.py @@ -4,10 +4,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/overlays/mac/mac.py b/volatility/plugins/overlays/mac/mac.py index e9e20702..668a9bfd 100644 --- a/volatility/plugins/overlays/mac/mac.py +++ b/volatility/plugins/overlays/mac/mac.py @@ -5,10 +5,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -126,7 +125,7 @@ class VolatilityMacIntelValidAS(obj.VolatilityMagic): string = self.obj_vm.read(version_addr, 60) - if string.startswith("Darwin"): + if string and string.startswith("Darwin"): self._set_profile_metadata(string) yield True else: @@ -164,6 +163,19 @@ class vnode(obj.CType): ret = "/" + ret return ret + +class fileglob(obj.CType): + + @property + def fg_type(self): + ret = self.members.get("fg_type") + if ret: + ret = self.m("fg_type") + else: + ret = self.fg_ops.fo_type + + ret = str(ret) + return ret class proc(obj.CType): @property @@ -970,6 +982,7 @@ class MacObjectClasses(obj.ProfileModification): 'VolatilityDTB': VolatilityDTB, 'VolatilityMacIntelValidAS' : VolatilityMacIntelValidAS, 'proc' : proc, + 'fileglob' : fileglob, 'vnode' : vnode, 'socket' : socket, 'zone' : zone, diff --git a/volatility/plugins/overlays/windows/kdbg_vtypes.py b/volatility/plugins/overlays/windows/kdbg_vtypes.py index 5fb4b7fd..1d93fad4 100644 --- a/volatility/plugins/overlays/windows/kdbg_vtypes.py +++ b/volatility/plugins/overlays/windows/kdbg_vtypes.py @@ -3,10 +3,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/overlays/windows/kpcr_vtypes.py b/volatility/plugins/overlays/windows/kpcr_vtypes.py index 60ffdd17..607bcebe 100644 --- a/volatility/plugins/overlays/windows/kpcr_vtypes.py +++ b/volatility/plugins/overlays/windows/kpcr_vtypes.py @@ -5,10 +5,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/overlays/windows/tcpip_vtypes.py b/volatility/plugins/overlays/windows/tcpip_vtypes.py index 50cb1b29..8e0b9f4d 100644 --- a/volatility/plugins/overlays/windows/tcpip_vtypes.py +++ b/volatility/plugins/overlays/windows/tcpip_vtypes.py @@ -3,10 +3,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/overlays/windows/vista.py b/volatility/plugins/overlays/windows/vista.py index cc1264f1..b314a4b3 100644 --- a/volatility/plugins/overlays/windows/vista.py +++ b/volatility/plugins/overlays/windows/vista.py @@ -5,10 +5,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/overlays/windows/vista_sp0_x64_syscalls.py b/volatility/plugins/overlays/windows/vista_sp0_x64_syscalls.py index 8ebfd16b..c1c71ebf 100644 --- a/volatility/plugins/overlays/windows/vista_sp0_x64_syscalls.py +++ b/volatility/plugins/overlays/windows/vista_sp0_x64_syscalls.py @@ -4,10 +4,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/overlays/windows/vista_sp0_x86_syscalls.py b/volatility/plugins/overlays/windows/vista_sp0_x86_syscalls.py index f0ad8333..5e40f172 100644 --- a/volatility/plugins/overlays/windows/vista_sp0_x86_syscalls.py +++ b/volatility/plugins/overlays/windows/vista_sp0_x86_syscalls.py @@ -5,10 +5,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/overlays/windows/vista_sp12_x64_syscalls.py b/volatility/plugins/overlays/windows/vista_sp12_x64_syscalls.py index 2a7aeb4b..63403fd4 100644 --- a/volatility/plugins/overlays/windows/vista_sp12_x64_syscalls.py +++ b/volatility/plugins/overlays/windows/vista_sp12_x64_syscalls.py @@ -4,10 +4,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/overlays/windows/vista_sp12_x86_syscalls.py b/volatility/plugins/overlays/windows/vista_sp12_x86_syscalls.py index 57486ab9..acbc4d6b 100644 --- a/volatility/plugins/overlays/windows/vista_sp12_x86_syscalls.py +++ b/volatility/plugins/overlays/windows/vista_sp12_x86_syscalls.py @@ -4,10 +4,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/overlays/windows/win2003.py b/volatility/plugins/overlays/windows/win2003.py index 97c78cfb..e02c7147 100644 --- a/volatility/plugins/overlays/windows/win2003.py +++ b/volatility/plugins/overlays/windows/win2003.py @@ -4,10 +4,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/overlays/windows/win2003_sp0_x86_syscalls.py b/volatility/plugins/overlays/windows/win2003_sp0_x86_syscalls.py index d61cb0dd..c05574e0 100644 --- a/volatility/plugins/overlays/windows/win2003_sp0_x86_syscalls.py +++ b/volatility/plugins/overlays/windows/win2003_sp0_x86_syscalls.py @@ -4,10 +4,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/overlays/windows/win2003_sp12_x64_syscalls.py b/volatility/plugins/overlays/windows/win2003_sp12_x64_syscalls.py index 4f5f3fac..dc0223d9 100644 --- a/volatility/plugins/overlays/windows/win2003_sp12_x64_syscalls.py +++ b/volatility/plugins/overlays/windows/win2003_sp12_x64_syscalls.py @@ -4,10 +4,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/overlays/windows/win2003_sp12_x86_syscalls.py b/volatility/plugins/overlays/windows/win2003_sp12_x86_syscalls.py index 8f597e37..167442d3 100644 --- a/volatility/plugins/overlays/windows/win2003_sp12_x86_syscalls.py +++ b/volatility/plugins/overlays/windows/win2003_sp12_x86_syscalls.py @@ -4,10 +4,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/overlays/windows/win7.py b/volatility/plugins/overlays/windows/win7.py index a1b91c2a..be892823 100644 --- a/volatility/plugins/overlays/windows/win7.py +++ b/volatility/plugins/overlays/windows/win7.py @@ -4,10 +4,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/overlays/windows/win7_sp01_x64_syscalls.py b/volatility/plugins/overlays/windows/win7_sp01_x64_syscalls.py index 36cb174d..bb947f4b 100644 --- a/volatility/plugins/overlays/windows/win7_sp01_x64_syscalls.py +++ b/volatility/plugins/overlays/windows/win7_sp01_x64_syscalls.py @@ -4,10 +4,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/overlays/windows/win7_sp01_x86_syscalls.py b/volatility/plugins/overlays/windows/win7_sp01_x86_syscalls.py index 1fdaaf6e..133792b9 100644 --- a/volatility/plugins/overlays/windows/win7_sp01_x86_syscalls.py +++ b/volatility/plugins/overlays/windows/win7_sp01_x86_syscalls.py @@ -5,10 +5,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/overlays/windows/windows.py b/volatility/plugins/overlays/windows/windows.py index 8e21e9f7..fd85eb4b 100644 --- a/volatility/plugins/overlays/windows/windows.py +++ b/volatility/plugins/overlays/windows/windows.py @@ -5,10 +5,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/overlays/windows/windows64.py b/volatility/plugins/overlays/windows/windows64.py index 7fec8424..6ecead71 100644 --- a/volatility/plugins/overlays/windows/windows64.py +++ b/volatility/plugins/overlays/windows/windows64.py @@ -5,10 +5,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/overlays/windows/xp.py b/volatility/plugins/overlays/windows/xp.py index ce0cf053..557c96fb 100644 --- a/volatility/plugins/overlays/windows/xp.py +++ b/volatility/plugins/overlays/windows/xp.py @@ -5,10 +5,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/overlays/windows/xp_sp2_x86_syscalls.py b/volatility/plugins/overlays/windows/xp_sp2_x86_syscalls.py index 05fd2c39..7ee7fe71 100644 --- a/volatility/plugins/overlays/windows/xp_sp2_x86_syscalls.py +++ b/volatility/plugins/overlays/windows/xp_sp2_x86_syscalls.py @@ -5,10 +5,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/patcher.py b/volatility/plugins/patcher.py index 89cc6072..a1127b02 100644 --- a/volatility/plugins/patcher.py +++ b/volatility/plugins/patcher.py @@ -6,10 +6,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/privileges.py b/volatility/plugins/privileges.py index 536a5db4..fe18dcbf 100644 --- a/volatility/plugins/privileges.py +++ b/volatility/plugins/privileges.py @@ -5,10 +5,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/procdump.py b/volatility/plugins/procdump.py index 3dd23aab..78987d9e 100644 --- a/volatility/plugins/procdump.py +++ b/volatility/plugins/procdump.py @@ -8,10 +8,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/pstree.py b/volatility/plugins/pstree.py index bc4b2208..4bd731db 100644 --- a/volatility/plugins/pstree.py +++ b/volatility/plugins/pstree.py @@ -6,10 +6,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/raw2dmp.py b/volatility/plugins/raw2dmp.py index a16152f5..f64fecde 100644 --- a/volatility/plugins/raw2dmp.py +++ b/volatility/plugins/raw2dmp.py @@ -5,10 +5,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/registry/hivelist.py b/volatility/plugins/registry/hivelist.py index 6698bcef..a9f1cd9d 100644 --- a/volatility/plugins/registry/hivelist.py +++ b/volatility/plugins/registry/hivelist.py @@ -5,10 +5,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/registry/hivescan.py b/volatility/plugins/registry/hivescan.py index 4827b196..22f3e09d 100644 --- a/volatility/plugins/registry/hivescan.py +++ b/volatility/plugins/registry/hivescan.py @@ -5,10 +5,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/registry/lsadump.py b/volatility/plugins/registry/lsadump.py index 5537a895..0f9423a3 100644 --- a/volatility/plugins/registry/lsadump.py +++ b/volatility/plugins/registry/lsadump.py @@ -5,10 +5,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/registry/printkey.py b/volatility/plugins/registry/printkey.py index d8e6d73d..81f8e42d 100644 --- a/volatility/plugins/registry/printkey.py +++ b/volatility/plugins/registry/printkey.py @@ -5,10 +5,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/registry/registryapi.py b/volatility/plugins/registry/registryapi.py index 93d1df62..b16e0751 100644 --- a/volatility/plugins/registry/registryapi.py +++ b/volatility/plugins/registry/registryapi.py @@ -5,10 +5,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/registry/shellbags.py b/volatility/plugins/registry/shellbags.py index ac7dc8df..c93509ef 100644 --- a/volatility/plugins/registry/shellbags.py +++ b/volatility/plugins/registry/shellbags.py @@ -5,10 +5,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/registry/shimcache.py b/volatility/plugins/registry/shimcache.py index 2eec9cc8..750ab277 100644 --- a/volatility/plugins/registry/shimcache.py +++ b/volatility/plugins/registry/shimcache.py @@ -5,10 +5,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/sockets.py b/volatility/plugins/sockets.py index 5435ce9d..71c57eef 100644 --- a/volatility/plugins/sockets.py +++ b/volatility/plugins/sockets.py @@ -6,10 +6,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/sockscan.py b/volatility/plugins/sockscan.py index e39c9674..035a3183 100644 --- a/volatility/plugins/sockscan.py +++ b/volatility/plugins/sockscan.py @@ -5,10 +5,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/ssdt.py b/volatility/plugins/ssdt.py index ae2a3f9b..da09b0aa 100644 --- a/volatility/plugins/ssdt.py +++ b/volatility/plugins/ssdt.py @@ -4,10 +4,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/strings.py b/volatility/plugins/strings.py index c993daa9..acfc5a57 100644 --- a/volatility/plugins/strings.py +++ b/volatility/plugins/strings.py @@ -5,10 +5,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/taskmods.py b/volatility/plugins/taskmods.py index 9f2ef10d..4e031582 100644 --- a/volatility/plugins/taskmods.py +++ b/volatility/plugins/taskmods.py @@ -8,10 +8,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/timeliner.py b/volatility/plugins/timeliner.py index 3f5ce40b..6d7ed951 100644 --- a/volatility/plugins/timeliner.py +++ b/volatility/plugins/timeliner.py @@ -5,10 +5,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/userassist.py b/volatility/plugins/userassist.py index 290864b8..06c0e602 100644 --- a/volatility/plugins/userassist.py +++ b/volatility/plugins/userassist.py @@ -4,10 +4,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/vadinfo.py b/volatility/plugins/vadinfo.py index 0578fb9d..eb9d53b0 100644 --- a/volatility/plugins/vadinfo.py +++ b/volatility/plugins/vadinfo.py @@ -8,10 +8,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/vboxinfo.py b/volatility/plugins/vboxinfo.py index b3740025..66b62fa3 100644 --- a/volatility/plugins/vboxinfo.py +++ b/volatility/plugins/vboxinfo.py @@ -4,10 +4,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/vmwareinfo.py b/volatility/plugins/vmwareinfo.py index b4ac89eb..a0911cdb 100644 --- a/volatility/plugins/vmwareinfo.py +++ b/volatility/plugins/vmwareinfo.py @@ -4,10 +4,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/plugins/volshell.py b/volatility/plugins/volshell.py index c29b3abb..797d3203 100644 --- a/volatility/plugins/volshell.py +++ b/volatility/plugins/volshell.py @@ -4,10 +4,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/scan.py b/volatility/scan.py index 8dd27560..d6d7ebe8 100644 --- a/volatility/scan.py +++ b/volatility/scan.py @@ -9,10 +9,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/timefmt.py b/volatility/timefmt.py index 126c0208..a0fe53d2 100644 --- a/volatility/timefmt.py +++ b/volatility/timefmt.py @@ -6,10 +6,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/utils.py b/volatility/utils.py index 22a7c2e5..6f1f850f 100644 --- a/volatility/utils.py +++ b/volatility/utils.py @@ -6,10 +6,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/win32/crashdump.py b/volatility/win32/crashdump.py index e2d3adff..e0c3700c 100644 --- a/volatility/win32/crashdump.py +++ b/volatility/win32/crashdump.py @@ -5,10 +5,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/win32/domcachedump.py b/volatility/win32/domcachedump.py index a0d96a05..a13134f0 100644 --- a/volatility/win32/domcachedump.py +++ b/volatility/win32/domcachedump.py @@ -5,10 +5,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/win32/hashdump.py b/volatility/win32/hashdump.py index eed543d9..b7d80728 100644 --- a/volatility/win32/hashdump.py +++ b/volatility/win32/hashdump.py @@ -5,10 +5,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/win32/hive.py b/volatility/win32/hive.py index b4180fe8..66263b42 100644 --- a/volatility/win32/hive.py +++ b/volatility/win32/hive.py @@ -5,10 +5,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/win32/lsasecrets.py b/volatility/win32/lsasecrets.py index 470c0538..32f42d07 100644 --- a/volatility/win32/lsasecrets.py +++ b/volatility/win32/lsasecrets.py @@ -5,10 +5,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/win32/modules.py b/volatility/win32/modules.py index 34fa2bfa..0514606c 100644 --- a/volatility/win32/modules.py +++ b/volatility/win32/modules.py @@ -4,10 +4,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/win32/network.py b/volatility/win32/network.py index b33ea5f4..2da4eb1e 100644 --- a/volatility/win32/network.py +++ b/volatility/win32/network.py @@ -4,10 +4,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/win32/rawreg.py b/volatility/win32/rawreg.py index 9475369f..d45d1678 100644 --- a/volatility/win32/rawreg.py +++ b/volatility/win32/rawreg.py @@ -5,10 +5,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/win32/tasks.py b/volatility/win32/tasks.py index 5f0745ab..003555f6 100644 --- a/volatility/win32/tasks.py +++ b/volatility/win32/tasks.py @@ -4,10 +4,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/volatility/win32/xpress.py b/volatility/win32/xpress.py index 884c3892..53d62902 100644 --- a/volatility/win32/xpress.py +++ b/volatility/win32/xpress.py @@ -5,10 +5,9 @@ # This file is part of Volatility. # # Volatility is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License Version 2 as -# published by the Free Software Foundation. You may not use, modify or -# distribute this program under any other version of the GNU General -# Public License. +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # # Volatility is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of