Skip to content

Commit

Permalink
Change LICENSE: From GPL to BSD
Browse files Browse the repository at this point in the history
  • Loading branch information
JonathanSalwan committed Sep 16, 2016
1 parent c480d7d commit d0165b4
Show file tree
Hide file tree
Showing 25 changed files with 29 additions and 440 deletions.
342 changes: 0 additions & 342 deletions COPYING

This file was deleted.

27 changes: 27 additions & 0 deletions LICENSE_BSD.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
This is the software license for the ROPgadget project.

Copyright (c) 2016. All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:

* Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
* Neither the name of the developers nor the names of its
contributors may be used to endorse or promote products derived from this
software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
5 changes: 0 additions & 5 deletions ROPgadget.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,6 @@
## http://twitter.com/JonathanSalwan
## http://shell-storm.org/project/ROPgadget/
##
## This program is free software: you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
## the Free Software Foundation, either version 3 of the License, or
## (at your option) any later version.
##

import ropgadget

Expand Down
4 changes: 0 additions & 4 deletions ropgadget/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,6 @@
## http://twitter.com/JonathanSalwan
## http://shell-storm.org/project/ROPgadget/
##
## This program is free software: you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
## the Free Software Foundation, either version 3 of the License, or
## (at your option) any later version.

import ropgadget.args
import ropgadget.binary
Expand Down
4 changes: 0 additions & 4 deletions ropgadget/args.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,6 @@
## http://twitter.com/JonathanSalwan
## http://shell-storm.org/project/ROPgadget/
##
## This program is free software: you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
## the Free Software Foundation, either version 3 of the License, or
## (at your option) any later version.

import argparse
import sys
Expand Down
4 changes: 0 additions & 4 deletions ropgadget/binary.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,6 @@
## http://twitter.com/JonathanSalwan
## http://shell-storm.org/project/ROPgadget/
##
## This program is free software: you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
## the Free Software Foundation, either version 3 of the License, or
## (at your option) any later version.

from ropgadget.loaders.elf import *
from ropgadget.loaders.pe import *
Expand Down
4 changes: 0 additions & 4 deletions ropgadget/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,6 @@
## http://twitter.com/JonathanSalwan
## http://shell-storm.org/project/ROPgadget/
##
## This program is free software: you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
## the Free Software Foundation, either version 3 of the License, or
## (at your option) any later version.

import cmd
import os
Expand Down
4 changes: 0 additions & 4 deletions ropgadget/gadgets.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,6 @@
## http://twitter.com/JonathanSalwan
## http://shell-storm.org/project/ROPgadget/
##
## This program is free software: you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
## the Free Software Foundation, either version 3 of the License, or
## (at your option) any later version.

import re
from capstone import *
Expand Down
4 changes: 0 additions & 4 deletions ropgadget/loaders/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,6 @@
## http://twitter.com/JonathanSalwan
## http://shell-storm.org/project/ROPgadget/
##
## This program is free software: you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
## the Free Software Foundation, either version 3 of the License, or
## (at your option) any later version.

import ropgadget.loaders.elf
import ropgadget.loaders.macho
Expand Down
4 changes: 0 additions & 4 deletions ropgadget/loaders/elf.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,6 @@
## http://twitter.com/JonathanSalwan
## http://shell-storm.org/project/ROPgadget/
##
## This program is free software: you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
## the Free Software Foundation, either version 3 of the License, or
## (at your option) any later version.

from capstone import *
from ctypes import *
Expand Down
4 changes: 0 additions & 4 deletions ropgadget/loaders/macho.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,6 @@
## http://twitter.com/JonathanSalwan
## http://shell-storm.org/project/ROPgadget/
##
## This program is free software: you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
## the Free Software Foundation, either version 3 of the License, or
## (at your option) any later version.

from capstone import *
from ctypes import *
Expand Down
4 changes: 0 additions & 4 deletions ropgadget/loaders/pe.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,6 @@
## http://twitter.com/JonathanSalwan
## http://shell-storm.org/project/ROPgadget/
##
## This program is free software: you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
## the Free Software Foundation, either version 3 of the License, or
## (at your option) any later version.

from capstone import *
from ctypes import *
Expand Down
5 changes: 0 additions & 5 deletions ropgadget/loaders/raw.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,6 @@
## http://shell-storm.org
## http://twitter.com/JonathanSalwan
##
## This program is free software: you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
## the Free Software Foundation, either version 3 of the License, or
## (at your option) any later version.
##

from capstone import *

Expand Down
4 changes: 0 additions & 4 deletions ropgadget/loaders/universal.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,6 @@
## http://twitter.com/ephracis
## http://shell-storm.org/project/ROPgadget/
##
## This program is free software: you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
## the Free Software Foundation, either version 3 of the License, or
## (at your option) any later version.

import sys

Expand Down
4 changes: 0 additions & 4 deletions ropgadget/options.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,6 @@
## http://twitter.com/JonathanSalwan
## http://shell-storm.org/project/ROPgadget/
##
## This program is free software: you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
## the Free Software Foundation, either version 3 of the License, or
## (at your option) any later version.

import re
import codecs
Expand Down
4 changes: 0 additions & 4 deletions ropgadget/rgutils.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,6 @@
## http://twitter.com/JonathanSalwan
## http://shell-storm.org/project/ROPgadget/
##
## This program is free software: you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
## the Free Software Foundation, either version 3 of the License, or
## (at your option) any later version.

def deleteDuplicateGadgets(currentGadgets):
gadgets_content_set = set()
Expand Down
5 changes: 0 additions & 5 deletions ropgadget/ropchain/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,6 @@
## http://shell-storm.org
## http://twitter.com/JonathanSalwan
##
## This program is free software: you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
## the Free Software Foundation, either version 3 of the License, or
## (at your option) any later version.
##

import ropgadget.ropchain.ropmaker
import ropgadget.ropchain.arch
5 changes: 0 additions & 5 deletions ropgadget/ropchain/arch/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,6 @@
## http://shell-storm.org
## http://twitter.com/JonathanSalwan
##
## This program is free software: you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
## the Free Software Foundation, either version 3 of the License, or
## (at your option) any later version.
##

import ropgadget.ropchain.arch.ropmakerx86
import ropgadget.ropchain.arch.ropmakerx64
5 changes: 0 additions & 5 deletions ropgadget/ropchain/arch/ropmakerx64.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,6 @@
## http://shell-storm.org
## http://twitter.com/JonathanSalwan
##
## This program is free software: you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
## the Free Software Foundation, either version 3 of the License, or
## (at your option) any later version.
##

import re
from capstone import *
Expand Down
5 changes: 0 additions & 5 deletions ropgadget/ropchain/arch/ropmakerx86.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,6 @@
## http://shell-storm.org
## http://twitter.com/JonathanSalwan
##
## This program is free software: you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
## the Free Software Foundation, either version 3 of the License, or
## (at your option) any later version.
##

import re
from capstone import *
Expand Down
5 changes: 0 additions & 5 deletions ropgadget/ropchain/ropmaker.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,6 @@
## http://shell-storm.org
## http://twitter.com/JonathanSalwan
##
## This program is free software: you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
## the Free Software Foundation, either version 3 of the License, or
## (at your option) any later version.
##

from capstone import *
from ropgadget.ropchain.arch.ropmakerx86 import *
Expand Down
4 changes: 0 additions & 4 deletions ropgadget/updateAlert.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,6 @@
## http://twitter.com/JonathanSalwan
## http://shell-storm.org/project/ROPgadget/
##
## This program is free software: you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
## the Free Software Foundation, either version 3 of the License, or
## (at your option) any later version.

import re
try:
Expand Down
4 changes: 0 additions & 4 deletions ropgadget/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,6 @@
## http://twitter.com/JonathanSalwan
## http://shell-storm.org/project/ROPgadget/
##
## This program is free software: you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
## the Free Software Foundation, either version 3 of the License, or
## (at your option) any later version.

MAJOR_VERSION = 5
MINOR_VERSION = 5
Expand Down
5 changes: 0 additions & 5 deletions scripts/ROPgadget
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,6 @@
## http://twitter.com/JonathanSalwan
## http://shell-storm.org/project/ROPgadget/
##
## This program is free software: you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
## the Free Software Foundation, either version 3 of the License, or
## (at your option) any later version.
##

import ropgadget

Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ def fullsplit(path, result=None):
version = version,
description = package_description,
packages = packages,
license = "GLPv2",
license = "BSD",
author = "Jonathan Salwan",
author_email = "[email protected]",
url = "https://github.com/JonathanSalwan/ROPgadget",
Expand All @@ -58,7 +58,7 @@ def fullsplit(path, result=None):
'Topic :: Security',
'Environment :: Console',
'Operating System :: OS Independent',
'License :: OSI Approved :: GNU General Public License v2 (GPLv2)',
'License :: OSI Approved :: BSD License',
'Programming Language :: Python :: 2.7',
'Intended Audience :: Developers'
]
Expand Down

0 comments on commit d0165b4

Please sign in to comment.