reaver: upgrade to v1.6.6
PATCH 1/1 reaver: upgrade to v1.6.6
---
Upgrade to latest release.
Patch does not apply anymore, but I doubt it's still needed because internal code has been improved. Tested on RPi0w.
--- package/reaver/0001-fix-271.patch | 32 ------------------------------- package/reaver/reaver.hash | 2 +- package/reaver/reaver.mk | 2 +- 3 files changed, 2 insertions(+), 34 deletions(-) delete mode 100644 package/reaver/0001-fix-271.patch
package/reaver/0001-fix-271.patch deleted +0 -32
@@ -1,32 +0,0 @@ -From c7040da3a9ff98cd8063b9d5b5a7721374186391 Mon Sep 17 00:00:00 2001 -From: rofl0r <[email protected]> -Date: Fri, 22 Feb 2019 17:38:24 +0000 -Subject: [PATCH] fix #271 - -Signed-off-by: Fabrice Fontaine <[email protected]> -[Retrieved from: -https://github.com/t6x/reaver-wps-fork-t6x/commit/c7040da3a9ff98cd8063b9d5b5a7721374186391] ---- - src/wps/wps_attr_parse.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/wps/wps_attr_parse.c b/src/wps/wps_attr_parse.c -index 30b0e79..d681b70 100644 ---- a/src/wps/wps_attr_parse.c -+++ b/src/wps/wps_attr_parse.c -@@ -443,12 +443,12 @@ int wps_parse_msg(const struct wpabuf *msg, struct wps_parse_attr *attr) - * Mac OS X 10.6 seems to be adding 0x00 padding to the - * end of M1. Skip those to avoid interop issues. - */ -- int i; -- for (i = 0; i < end - pos; i++) { -+ uintptr_t i, left = end - pos; -+ for (i = 0; i < left; i++) { - if (pos[i]) - break; - } -- if (i == end - pos) { -+ if (i == left) { - wpa_printf(MSG_DEBUG, "WPS: Workaround - skip " - "unexpected message padding"); - break;
package/reaver/reaver.hash +1 -1
@@ -1,3 +1,3 @@ # locally computed -sha256 e6761d2d4ef9cb2b45fe0a60d6b94048ce4442e4ac209904fe89506ff1e94c44 reaver-1.6.5.tar.gz +sha256 73189782b208d12b8dddc4f29d32e1f72b1f3609e573c9ea9510deebec394583 reaver-1.6.6.tar.gz sha256 bb40cfd5e9ca6e8465ea3c236f3f2293e8300af1bfe87e72fabe482ae6cc995a docs/LICENSE
package/reaver/reaver.mk +1 -1
@@ -6,7 +6,7 @@ # Older repos for this project will not cross-compile easily # while this one works right away -REAVER_VERSION = 1.6.5 +REAVER_VERSION = 1.6.6 REAVER_SITE = $(call github,t6x,reaver-wps-fork-t6x,v$(REAVER_VERSION)) REAVER_LICENSE = GPL-2.0+ REAVER_LICENSE_FILES = docs/LICENSE
Signature · 1 line
2.20.1
PATCH 1/1 reaver: upgrade to v1.6.6
Hi Guillaume,
Am Mi., 27. Mai 2020 um 23:14 Uhr schrieb Guillaume W. Bres <[email protected]>:
Quoted 2 lines
Signed-off-by Guillaume W. Bres <[email protected]>
Quoted 6 lines
---
Upgrade to latest release.
Patch does not apply anymore, but I doubt it's still needed because internal code has been improved. Tested on RPi0w.
The patch is in fact in the new upstream version.
Quoted 51 lines
Signed-off-by Guillaume W. Bres <[email protected]>--- package/reaver/0001-fix-271.patch | 32 ------------------------------- package/reaver/reaver.hash | 2 +- package/reaver/reaver.mk | 2 +- 3 files changed, 2 insertions(+), 34 deletions(-) delete mode 100644 package/reaver/0001-fix-271.patchpackage/reaver/0001-fix-271.patch deleted +0
-32@@ -1,32 +0,0 @@ -From c7040da3a9ff98cd8063b9d5b5a7721374186391 Mon Sep 17 00:00:00 2001 -From: rofl0r <[email protected]> -Date: Fri, 22 Feb 2019 17:38:24 +0000 -Subject: [PATCH] fix #271 - -Signed-off-by: Fabrice Fontaine <[email protected]> -[Retrieved from: -https://github.com/t6x/reaver-wps-fork-t6x/commit/c7040da3a9ff98cd8063b9d5b5a7721374186391] ---- - src/wps/wps_attr_parse.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/wps/wps_attr_parse.c b/src/wps/wps_attr_parse.c -index 30b0e79..d681b70 100644 ---- a/src/wps/wps_attr_parse.c -+++ b/src/wps/wps_attr_parse.c -@@ -443,12 +443,12 @@ int wps_parse_msg(const struct wpabuf *msg, struct wps_parse_attr *attr) - * Mac OS X 10.6 seems to be adding 0x00 padding to the - * end of M1. Skip those to avoid interop issues. - */ -- int i; -- for (i = 0; i < end - pos; i++) { -+ uintptr_t i, left = end - pos; -+ for (i = 0; i < left; i++) { - if (pos[i]) - break; - } -- if (i == end - pos) { -+ if (i == left) { - wpa_printf(MSG_DEBUG, "WPS: Workaround - skip " - "unexpected message padding"); - break;package/reaver/reaver.hash +0
-0
package/reaver/reaver.hash line 3
Quoted 4 lines
package/reaver/reaver.hash +1
-1@@ -1,3 +1,3 @@ # locally computed -sha256 e6761d2d4ef9cb2b45fe0a60d6b94048ce4442e4ac209904fe89506ff1e94c44 reaver-1.6.5.tar.gz +sha256 73189782b208d12b8dddc4f29d32e1f72b1f3609e573c9ea9510deebec394583 reaver-1.6.6.tar.gz sha256 bb40cfd5e9ca6e8465ea3c236f3f2293e8300af1bfe87e72fabe482ae6cc995a docs/LICENSE
Just a side note: When changing the hash you also could adopt to the new code style:
"The format of this file is one line for each file for which to check the hash, each line with the following three fields separated by two spaces:"
Quoted 14 lines
package/reaver/reaver.mk +1
-2@@ -6,7 +6,7 @@ # Older repos for this project will not cross-compile easily # while this one works right away -REAVER_VERSION = 1.6.5 +REAVER_VERSION = 1.6.6 REAVER_SITE = $(call github,t6x,reaver-wps-fork-t6x,v$(REAVER_VERSION)) REAVER_LICENSE = GPL-2.0+ REAVER_LICENSE_FILES = docs/LICENSE --
Quoted 1 line
2.20.1
Thank you.
Signature · 1 line
Heiko
PATCH 1/1 reaver: upgrade to v1.6.6
Dear all,
Le jeu. 28 mai 2020 ? 07:07, Heiko Thiery <[email protected]> a ?crit :
Quoted 16 lines
Hi Guillaume,
Am Mi., 27. Mai 2020 um 23:14 Uhr schrieb Guillaume W. Bres <[email protected]>:
Quoted 2 lines
Signed-off-by Guillaume W. Bres <[email protected]>Reviewed-by Heiko Thiery <[email protected]>Quoted 6 lines
---
Upgrade to latest release.
Patch does not apply anymore, but I doubt it's still needed because internal code has been improved. Tested on RPi0w.
A dependency on BR2_TOOLCHAIN_HAS_THREADS must be added to Config.in due to
https://github.com/t6x/reaver-wps-fork-t6x/commit/eec6a8970167d35ae3267565014f43c21ea5d812
Quoted 83 lines
The patch is in fact in the new upstream version.
Quoted 51 lines
Signed-off-by Guillaume W. Bres <[email protected]>--- package/reaver/0001-fix-271.patch | 32 ------------------------------- package/reaver/reaver.hash | 2 +- package/reaver/reaver.mk | 2 +- 3 files changed, 2 insertions(+), 34 deletions(-) delete mode 100644 package/reaver/0001-fix-271.patchpackage/reaver/0001-fix-271.patch deleted +0
-32@@ -1,32 +0,0 @@ -From c7040da3a9ff98cd8063b9d5b5a7721374186391 Mon Sep 17 00:00:00 2001 -From: rofl0r <[email protected]> -Date: Fri, 22 Feb 2019 17:38:24 +0000 -Subject: [PATCH] fix #271 - -Signed-off-by: Fabrice Fontaine <[email protected]> -[Retrieved from: -https://github.com/t6x/reaver-wps-fork-t6x/commit/c7040da3a9ff98cd8063b9d5b5a7721374186391] ---- - src/wps/wps_attr_parse.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/wps/wps_attr_parse.c b/src/wps/wps_attr_parse.c -index 30b0e79..d681b70 100644 ---- a/src/wps/wps_attr_parse.c -+++ b/src/wps/wps_attr_parse.c -@@ -443,12 +443,12 @@ int wps_parse_msg(const struct wpabuf *msg, struct wps_parse_attr *attr) - * Mac OS X 10.6 seems to be adding 0x00 padding to the - * end of M1. Skip those to avoid interop issues. - */ -- int i; -- for (i = 0; i < end - pos; i++) { -+ uintptr_t i, left = end - pos; -+ for (i = 0; i < left; i++) { - if (pos[i]) - break; - } -- if (i == end - pos) { -+ if (i == left) { - wpa_printf(MSG_DEBUG, "WPS: Workaround - skip " - "unexpected message padding"); - break;package/reaver/reaver.hash +0
-0package/reaver/reaver.hash line 3
Quoted 4 lines
package/reaver/reaver.hash +1
-1@@ -1,3 +1,3 @@ # locally computed -sha256 e6761d2d4ef9cb2b45fe0a60d6b94048ce4442e4ac209904fe89506ff1e94c44 reaver-1.6.5.tar.gz +sha256 73189782b208d12b8dddc4f29d32e1f72b1f3609e573c9ea9510deebec394583 reaver-1.6.6.tar.gz sha256 bb40cfd5e9ca6e8465ea3c236f3f2293e8300af1bfe87e72fabe482ae6cc995a docs/LICENSEJust a side note: When changing the hash you also could adopt to the new code style:
"The format of this file is one line for each file for which to check the hash, each line with the following three fields separated by two spaces:"Quoted 14 lines
package/reaver/reaver.mk +1
-2@@ -6,7 +6,7 @@ # Older repos for this project will not cross-compile easily # while this one works right away -REAVER_VERSION = 1.6.5 +REAVER_VERSION = 1.6.6 REAVER_SITE = $(call github,t6x,reaver-wps-fork-t6x,v$(REAVER_VERSION)) REAVER_LICENSE = GPL-2.0+ REAVER_LICENSE_FILES = docs/LICENSE --Quoted 1 line
2.20.1
Thank you.
Quoted 2 lines
--
Heiko
Best Regards,
Fabrice
PATCH v2 1/1 package/reaver: bump to v1.6.6
---
Changes v0 -> v1:
- correct patch title for package upgrade
- add white space to reaver.hash
- add depends on BR2_TOOLCHAIN_HAS_THREADS (suggested by Fabrice)
v0: upgrade to 1.6.6 (latest) release
I removed the patch because it is not needed anymore. Tested on RPi0w.
--- package/reaver/0001-fix-271.patch | 32 ------------------------------- package/reaver/Config.in | 1 + package/reaver/reaver.hash | 4 ++-- package/reaver/reaver.mk | 2 +- 4 files changed, 4 insertions(+), 35 deletions(-) delete mode 100644 package/reaver/0001-fix-271.patch
package/reaver/0001-fix-271.patch deleted +0 -32
@@ -1,32 +0,0 @@ -From c7040da3a9ff98cd8063b9d5b5a7721374186391 Mon Sep 17 00:00:00 2001 -From: rofl0r <[email protected]> -Date: Fri, 22 Feb 2019 17:38:24 +0000 -Subject: [PATCH] fix #271 - -Signed-off-by: Fabrice Fontaine <[email protected]> -[Retrieved from: -https://github.com/t6x/reaver-wps-fork-t6x/commit/c7040da3a9ff98cd8063b9d5b5a7721374186391] ---- - src/wps/wps_attr_parse.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/wps/wps_attr_parse.c b/src/wps/wps_attr_parse.c -index 30b0e79..d681b70 100644 ---- a/src/wps/wps_attr_parse.c -+++ b/src/wps/wps_attr_parse.c -@@ -443,12 +443,12 @@ int wps_parse_msg(const struct wpabuf *msg, struct wps_parse_attr *attr) - * Mac OS X 10.6 seems to be adding 0x00 padding to the - * end of M1. Skip those to avoid interop issues. - */ -- int i; -- for (i = 0; i < end - pos; i++) { -+ uintptr_t i, left = end - pos; -+ for (i = 0; i < left; i++) { - if (pos[i]) - break; - } -- if (i == end - pos) { -+ if (i == left) { - wpa_printf(MSG_DEBUG, "WPS: Workaround - skip " - "unexpected message padding"); - break;
package/reaver/Config.in +1 -0
@@ -1,5 +1,6 @@ config BR2_PACKAGE_REAVER bool "reaver" + depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_LIBPCAP help Reaver is a tool to audit networks against brute WPS pins
package/reaver/reaver.hash +2 -2
@@ -1,3 +1,3 @@ # locally computed -sha256 e6761d2d4ef9cb2b45fe0a60d6b94048ce4442e4ac209904fe89506ff1e94c44 reaver-1.6.5.tar.gz -sha256 bb40cfd5e9ca6e8465ea3c236f3f2293e8300af1bfe87e72fabe482ae6cc995a docs/LICENSE +sha256 73189782b208d12b8dddc4f29d32e1f72b1f3609e573c9ea9510deebec394583 reaver-1.6.6.tar.gz +sha256 bb40cfd5e9ca6e8465ea3c236f3f2293e8300af1bfe87e72fabe482ae6cc995a docs/LICENSE
package/reaver/reaver.mk +1 -1
@@ -6,7 +6,7 @@ # Older repos for this project will not cross-compile easily # while this one works right away -REAVER_VERSION = 1.6.5 +REAVER_VERSION = 1.6.6 REAVER_SITE = $(call github,t6x,reaver-wps-fork-t6x,v$(REAVER_VERSION)) REAVER_LICENSE = GPL-2.0+ REAVER_LICENSE_FILES = docs/LICENSE
Signature · 1 line
2.20.1
PATCH v2 1/1 package/reaver: bump to v1.6.6
Hi Guillaume,
Le jeu. 28 mai 2020 ? 11:03, Guillaume W. Bres
<[email protected]> a ?crit :
Quoted 63 lines
---
Changes v0 -> v1:
- correct patch title for package upgrade
- add white space to reaver.hash
- add depends onBR2_TOOLCHAIN_HAS_THREADS(suggested by Fabrice)v0: upgrade to 1.6.6 (latest) release
I removed the patch because it is not needed anymore. Tested on RPi0w.Signed-off-by Guillaume W. Bres <[email protected]>--- package/reaver/0001-fix-271.patch | 32 ------------------------------- package/reaver/Config.in | 1 + package/reaver/reaver.hash | 4 ++-- package/reaver/reaver.mk | 2 +- 4 files changed, 4 insertions(+), 35 deletions(-) delete mode 100644 package/reaver/0001-fix-271.patchpackage/reaver/0001-fix-271.patch deleted +0
-32@@ -1,32 +0,0 @@ -From c7040da3a9ff98cd8063b9d5b5a7721374186391 Mon Sep 17 00:00:00 2001 -From: rofl0r <[email protected]> -Date: Fri, 22 Feb 2019 17:38:24 +0000 -Subject: [PATCH] fix #271 - -Signed-off-by: Fabrice Fontaine <[email protected]> -[Retrieved from: -https://github.com/t6x/reaver-wps-fork-t6x/commit/c7040da3a9ff98cd8063b9d5b5a7721374186391] ---- - src/wps/wps_attr_parse.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/wps/wps_attr_parse.c b/src/wps/wps_attr_parse.c -index 30b0e79..d681b70 100644 ---- a/src/wps/wps_attr_parse.c -+++ b/src/wps/wps_attr_parse.c -@@ -443,12 +443,12 @@ int wps_parse_msg(const struct wpabuf *msg, struct wps_parse_attr *attr) - * Mac OS X 10.6 seems to be adding 0x00 padding to the - * end of M1. Skip those to avoid interop issues. - */ -- int i; -- for (i = 0; i < end - pos; i++) { -+ uintptr_t i, left = end - pos; -+ for (i = 0; i < left; i++) { - if (pos[i]) - break; - } -- if (i == end - pos) { -+ if (i == left) { - wpa_printf(MSG_DEBUG, "WPS: Workaround - skip " - "unexpected message padding"); - break;package/reaver/Config.in +0
-0
package/reaver/Config.in line 6
Quoted 6 lines
package/reaver/Config.in +1
-0@@ -1,5 +1,6 @@ config BR2_PACKAGE_REAVER bool "reaver" + depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_LIBPCAP help Reaver is a tool to audit networks against brute WPS pins
Thanks for this new version, you must also add a comment to warn the user about this dependency:
comment "reaver needs a toolchain w/ threads"
depends on !BR2_TOOLCHAIN_HAS_THREADS
Quoted 24 lines
package/reaver/reaver.hash +2
-2@@ -1,3 +1,3 @@ # locally computed -sha256 e6761d2d4ef9cb2b45fe0a60d6b94048ce4442e4ac209904fe89506ff1e94c44 reaver-1.6.5.tar.gz -sha256 bb40cfd5e9ca6e8465ea3c236f3f2293e8300af1bfe87e72fabe482ae6cc995a docs/LICENSE +sha256 73189782b208d12b8dddc4f29d32e1f72b1f3609e573c9ea9510deebec394583 reaver-1.6.6.tar.gz +sha256 bb40cfd5e9ca6e8465ea3c236f3f2293e8300af1bfe87e72fabe482ae6cc995a docs/LICENSEpackage/reaver/reaver.mk +1
-2@@ -6,7 +6,7 @@ # Older repos for this project will not cross-compile easily # while this one works right away -REAVER_VERSION = 1.6.5 +REAVER_VERSION = 1.6.6 REAVER_SITE = $(call github,t6x,reaver-wps-fork-t6x,v$(REAVER_VERSION)) REAVER_LICENSE = GPL-2.0+ REAVER_LICENSE_FILES = docs/LICENSE --
Quoted 2 lines
2.20.1
Best Regards,
Fabrice
PATCH v3 1/1 package/reaver: bump to v1.6.6
---
Changes v1 -> v2:
- add comment on BR2_TOOLCHAIN_HAS_THREADS dependency to help user (suggested by Fabrice)
Changes v0 -> v1:
- correct patch title for package upgrade
- add white space to reaver.hash
- add depends on BR2_TOOLCHAIN_HAS_THREADS (suggested by Fabrice)
v0: upgrade to 1.6.6 (latest) release
I removed the patch because it is not needed anymore. Tested on RPi0w.
--- package/reaver/0001-fix-271.patch | 32 ------------------------------- package/reaver/Config.in | 4 ++++ package/reaver/reaver.hash | 4 ++-- package/reaver/reaver.mk | 2 +- 4 files changed, 7 insertions(+), 35 deletions(-) delete mode 100644 package/reaver/0001-fix-271.patch
package/reaver/0001-fix-271.patch deleted +0 -32
@@ -1,32 +0,0 @@ -From c7040da3a9ff98cd8063b9d5b5a7721374186391 Mon Sep 17 00:00:00 2001 -From: rofl0r <[email protected]> -Date: Fri, 22 Feb 2019 17:38:24 +0000 -Subject: [PATCH] fix #271 - -Signed-off-by: Fabrice Fontaine <[email protected]> -[Retrieved from: -https://github.com/t6x/reaver-wps-fork-t6x/commit/c7040da3a9ff98cd8063b9d5b5a7721374186391] ---- - src/wps/wps_attr_parse.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/wps/wps_attr_parse.c b/src/wps/wps_attr_parse.c -index 30b0e79..d681b70 100644 ---- a/src/wps/wps_attr_parse.c -+++ b/src/wps/wps_attr_parse.c -@@ -443,12 +443,12 @@ int wps_parse_msg(const struct wpabuf *msg, struct wps_parse_attr *attr) - * Mac OS X 10.6 seems to be adding 0x00 padding to the - * end of M1. Skip those to avoid interop issues. - */ -- int i; -- for (i = 0; i < end - pos; i++) { -+ uintptr_t i, left = end - pos; -+ for (i = 0; i < left; i++) { - if (pos[i]) - break; - } -- if (i == end - pos) { -+ if (i == left) { - wpa_printf(MSG_DEBUG, "WPS: Workaround - skip " - "unexpected message padding"); - break;
package/reaver/Config.in +4 -0
@@ -1,5 +1,6 @@ config BR2_PACKAGE_REAVER bool "reaver" + depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_LIBPCAP help Reaver is a tool to audit networks against brute WPS pins
@@ -7,3 +8,6 @@ config BR2_PACKAGE_REAVER https://code.google.com/archive/p/reaver-wps/wikis/README.wiki https://github.com/t6x/reaver-wps-fork-t6x + +comment "reaver needs a toolchain w/ threads" + depends on !BR2_TOOLCHAIN_HAS_THREADS
package/reaver/reaver.hash +2 -2
@@ -1,3 +1,3 @@ # locally computed -sha256 e6761d2d4ef9cb2b45fe0a60d6b94048ce4442e4ac209904fe89506ff1e94c44 reaver-1.6.5.tar.gz -sha256 bb40cfd5e9ca6e8465ea3c236f3f2293e8300af1bfe87e72fabe482ae6cc995a docs/LICENSE +sha256 73189782b208d12b8dddc4f29d32e1f72b1f3609e573c9ea9510deebec394583 reaver-1.6.6.tar.gz +sha256 bb40cfd5e9ca6e8465ea3c236f3f2293e8300af1bfe87e72fabe482ae6cc995a docs/LICENSE
package/reaver/reaver.mk +1 -1
@@ -6,7 +6,7 @@ # Older repos for this project will not cross-compile easily # while this one works right away -REAVER_VERSION = 1.6.5 +REAVER_VERSION = 1.6.6 REAVER_SITE = $(call github,t6x,reaver-wps-fork-t6x,v$(REAVER_VERSION)) REAVER_LICENSE = GPL-2.0+ REAVER_LICENSE_FILES = docs/LICENSE
Signature · 1 line
2.20.1
PATCH v3 1/1 package/reaver: bump to v1.6.6
Quoted 10 lines · On Thu, 28 May 2020 12:27:54 +0200 "Guillaume W. Bres"…
---
Changes v1 -> v2:
- add comment onBR2_TOOLCHAIN_HAS_THREADSdependency to help user (suggested by Fabrice)Changes v0 -> v1:
- correct patch title for package upgrade
- add white space to reaver.hash
- add depends onBR2_TOOLCHAIN_HAS_THREADS(suggested by Fabrice)
Quoted 5 lines
v0: upgrade to 1.6.6 (latest) release
I removed the patch because it is not needed anymore. Tested on RPi0w.Signed-off-by Guillaume W. Bres <[email protected]>
The Signed-off-by should have been in the commit log, i.e before the "---" sign.
It seems like you got confused by this. A commit log should look like this:
package/foobar: bump to 1.2.3
This is some additional explanations about this change.
And some other explanation.
---
Changes from v1:
- ...
package/reaver/0001-fix-271.patch | 32 ------------------------------- package/reaver/Config.in | 4 ++++ package/reaver/reaver.hash | 4 ++-- package/reaver/reaver.mk | 2 +- 4 files changed, 7 insertions(+), 35 deletions(-)
delete mode 100644 package/reaver/0001-fix-271.patch
Does that clarify the expected organization ?
I've fixed that up, and applied your patch to our next branch.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com