update license

[ci skip]

README.md

@@ -1,4 +1,4 @@
-# *btcrecover* [![Build Status](https://travis-ci.org/gurnec/btcrecover.svg?branch=master)](https://travis-ci.org/gurnec/btcrecover) ![License](https://img.shields.io/badge/License-GPLv2-blue.svg) #
+# *btcrecover* [![Build Status](https://travis-ci.org/gurnec/btcrecover.svg?branch=master)](https://travis-ci.org/gurnec/btcrecover) ![license](https://img.shields.io/badge/license-GPLv2-blue.svg) #
 
 *btcrecover* is an open source Bitcoin wallet password and seed recovery tool. It is designed for the case where you already know most of your password or seed, but need assistance in trying different possible combinations.
 

TUTORIAL.md

@@ -505,10 +505,10 @@ Please see the separate [Limitations and Caveats](docs/Limitations_and_Caveats.m
 
 btcrecover.py -- Bitcoin wallet password recovery tool
 
-Copyright (C) 2015 Christopher Gurnee
+Copyright (C) 2014, 2015 Christopher Gurnee
 
-This program 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.
+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 2 of the License, or (at your option) any later version.
 
-This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License version 2 for more details.
+This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
 
-You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+You should have received a copy of the GNU General Public License along with this program.  If not, see http://www.gnu.org/licenses/

btcrecover.py

@@ -1,20 +1,20 @@
 #!/usr/bin/python
 
 # btcrecover.py -- Bitcoin wallet password recovery tool
-# Copyright (C) 2015 Christopher Gurnee
+# Copyright (C) 2014, 2015 Christopher Gurnee
 #
-# This program is free software; you can redistribute it and/or
+# This program 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.
+# as published by the Free Software Foundation; either version
+# 2 of the License, or (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License version 2 for more details.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# along with this program.  If not, see http://www.gnu.org/licenses/
 
 # If you find this program helpful, please consider a small
 # donation to the developer at the following Bitcoin address:

extract-scripts/extract-armory-privkey.py

@@ -1,20 +1,22 @@
 #!/usr/bin/python
 
 # extract-armory-privkey.py -- Armory private key extractor
-# Copyright (C) 2014 Christopher Gurnee
+# Copyright (C) 2014, 2015 Christopher Gurnee
 #
-# This program is free software; you can redistribute it and/or
+# This file is part of btcrecover.
+#
+# btcrecover 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.
+# as published by the Free Software Foundation; either version
+# 2 of the License, or (at your option) any later version.
 #
-# This program is distributed in the hope that it will be useful,
+# btcrecover is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License version 2 for more details.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# along with this program.  If not, see http://www.gnu.org/licenses/
 
 # If you find this program helpful, please consider a small
 # donation to the developer at the following Bitcoin address:

extract-scripts/extract-bitcoincore-mkey-from-pywallet.py

@@ -1,20 +1,22 @@
 #!/usr/bin/python
 
 # extract-bitcoincore-mkey.py -- Bitcoin wallet master key extractor
-# Copyright (C) 2014 Christopher Gurnee
+# Copyright (C) 2014, 2015 Christopher Gurnee
 #
-# This program is free software; you can redistribute it and/or
+# This file is part of btcrecover.
+#
+# btcrecover 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.
+# as published by the Free Software Foundation; either version
+# 2 of the License, or (at your option) any later version.
 #
-# This program is distributed in the hope that it will be useful,
+# btcrecover is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License version 2 for more details.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# along with this program.  If not, see http://www.gnu.org/licenses/
 
 # If you find this program helpful, please consider a small
 # donation to the developer at the following Bitcoin address:

extract-scripts/extract-bitcoincore-mkey.py

@@ -1,20 +1,22 @@
 #!/usr/bin/python
 
 # extract-bitcoincore-mkey.py -- Bitcoin wallet master key extractor
-# Copyright (C) 2014 Christopher Gurnee
+# Copyright (C) 2014, 2015 Christopher Gurnee
 #
-# This program is free software; you can redistribute it and/or
+# This file is part of btcrecover.
+#
+# btcrecover 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.
+# as published by the Free Software Foundation; either version
+# 2 of the License, or (at your option) any later version.
 #
-# This program is distributed in the hope that it will be useful,
+# btcrecover is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License version 2 for more details.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# along with this program.  If not, see http://www.gnu.org/licenses/
 
 # If you find this program helpful, please consider a small
 # donation to the developer at the following Bitcoin address:

extract-scripts/extract-blockchain-main-data.py

@@ -1,20 +1,22 @@
 #!/usr/bin/python
 
 # extract-blockchain-main-data.py -- Blockchain data extractor
-# Copyright (C) 2014 Christopher Gurnee
+# Copyright (C) 2014, 2015 Christopher Gurnee
 #
-# This program is free software; you can redistribute it and/or
+# This file is part of btcrecover.
+#
+# btcrecover 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.
+# as published by the Free Software Foundation; either version
+# 2 of the License, or (at your option) any later version.
 #
-# This program is distributed in the hope that it will be useful,
+# btcrecover is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License version 2 for more details.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# along with this program.  If not, see http://www.gnu.org/licenses/
 
 # If you find this program helpful, please consider a small
 # donation to the developer at the following Bitcoin address:

extract-scripts/extract-blockchain-second-hash.py

@@ -1,20 +1,22 @@
 #!/usr/bin/python
 
 # extract-blockchain-second-hash.py -- Blockchain second password hash extractor
-# Copyright (C) 2014 Christopher Gurnee
+# Copyright (C) 2014, 2015 Christopher Gurnee
 #
-# This program is free software; you can redistribute it and/or
+# This file is part of btcrecover.
+#
+# btcrecover 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.
+# as published by the Free Software Foundation; either version
+# 2 of the License, or (at your option) any later version.
 #
-# This program is distributed in the hope that it will be useful,
+# btcrecover is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License version 2 for more details.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# along with this program.  If not, see http://www.gnu.org/licenses/
 
 # If you find this program helpful, please consider a small
 # donation to the developer at the following Bitcoin address:

extract-scripts/extract-electrum-halfseed.py

@@ -1,20 +1,22 @@
 #!/usr/bin/python
 
 # extract-electrum-halfseed.py -- Electrum partial seed extractor
-# Copyright (C) 2014 Christopher Gurnee
+# Copyright (C) 2014, 2015 Christopher Gurnee
 #
-# This program is free software; you can redistribute it and/or
+# This file is part of btcrecover.
+#
+# btcrecover 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.
+# as published by the Free Software Foundation; either version
+# 2 of the License, or (at your option) any later version.
 #
-# This program is distributed in the hope that it will be useful,
+# btcrecover is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License version 2 for more details.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# along with this program.  If not, see http://www.gnu.org/licenses/
 
 # If you find this program helpful, please consider a small
 # donation to the developer at the following Bitcoin address:

extract-scripts/extract-electrum2-partmpk.py

@@ -1,20 +1,22 @@
 #!/usr/bin/python
 
 # extract-electrum-partmpk.py -- Electrum 2.x partial mpk extractor
-# Copyright (C) 2015 Christopher Gurnee
+# Copyright (C) 2014, 2015 Christopher Gurnee
 #
-# This program is free software; you can redistribute it and/or
+# This file is part of btcrecover.
+#
+# btcrecover 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.
+# as published by the Free Software Foundation; either version
+# 2 of the License, or (at your option) any later version.
 #
-# This program is distributed in the hope that it will be useful,
+# btcrecover is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License version 2 for more details.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# along with this program.  If not, see http://www.gnu.org/licenses/
 
 # If you find this program helpful, please consider a small
 # donation to the developer at the following Bitcoin address:

extract-scripts/extract-msigna-partmpk.py

@@ -1,20 +1,22 @@
 #!/usr/bin/python
 
 # extract-msigna-privkey.py -- mSIGNA private key extractor
-# Copyright (C) 2015 Christopher Gurnee
+# Copyright (C) 2014, 2015 Christopher Gurnee
 #
-# This program is free software; you can redistribute it and/or
+# This file is part of btcrecover.
+#
+# btcrecover 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.
+# as published by the Free Software Foundation; either version
+# 2 of the License, or (at your option) any later version.
 #
-# This program is distributed in the hope that it will be useful,
+# btcrecover is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License version 2 for more details.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# along with this program.  If not, see http://www.gnu.org/licenses/
 
 # If you find this program helpful, please consider a small
 # donation to the developer at the following Bitcoin address:

extract-scripts/extract-multibit-hd-data.py

@@ -1,20 +1,22 @@
 #!/usr/bin/python
 
 # extract-electrum-partmpk.py -- MultiBit HD first block extractor
-# Copyright (C) 2015 Christopher Gurnee
+# Copyright (C) 2014, 2015 Christopher Gurnee
 #
-# This program is free software; you can redistribute it and/or
+# This file is part of btcrecover.
+#
+# btcrecover 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.
+# as published by the Free Software Foundation; either version
+# 2 of the License, or (at your option) any later version.
 #
-# This program is distributed in the hope that it will be useful,
+# btcrecover is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License version 2 for more details.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# along with this program.  If not, see http://www.gnu.org/licenses/
 
 # If you find this program helpful, please consider a small
 # donation to the developer at the following Bitcoin address:

extract-scripts/extract-multibit-privkey.py

@@ -1,20 +1,22 @@
 #!/usr/bin/python
 
 # extract-multibit-privkey.py -- MultiBit private key extractor
-# Copyright (C) 2014 Christopher Gurnee
+# Copyright (C) 2014, 2015 Christopher Gurnee
 #
-# This program is free software; you can redistribute it and/or
+# This file is part of btcrecover.
+#
+# btcrecover 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.
+# as published by the Free Software Foundation; either version
+# 2 of the License, or (at your option) any later version.
 #
-# This program is distributed in the hope that it will be useful,
+# btcrecover is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License version 2 for more details.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# along with this program.  If not, see http://www.gnu.org/licenses/
 
 # If you find this program helpful, please consider a small
 # donation to the developer at the following Bitcoin address:

make-unicode.py

@@ -1,20 +1,22 @@
 #!/usr/bin/python
 
 # make-unicode.py -- build the Unicode version of btcrecover from the ASCII version
-# Copyright (C) 2014 Christopher Gurnee
+# Copyright (C) 2014, 2015 Christopher Gurnee
 #
-# This program is free software; you can redistribute it and/or
+# This file is part of btcrecover.
+#
+# btcrecover 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.
+# as published by the Free Software Foundation; either version
+# 2 of the License, or (at your option) any later version.
 #
-# This program is distributed in the hope that it will be useful,
+# btcrecover is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License version 2 for more details.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# along with this program.  If not, see http://www.gnu.org/licenses/
 
 # If you find this program helpful, please consider a small
 # donation to the developer at the following Bitcoin address: