Skip to contentSkip to conversation

build: install iwd-decrypt-profile

PATCH In review James Prestwood 3 participants 6 messages Oct 3, 2023 – Oct 20, 2023 Kbuild

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 build: install iwd-decrypt-profile

If profile encryption is enabled its not out of the question that somebody might need to decrypt it. This isn't a problem building from source but IWD as a package likely won't include the decrypt tool unless its specifically copied out. Add iwd-decrypt-profile to the list of installed programs like iwctl, iwmon, etc

This also fixes a minor bug in Makefile.am which was building both iwd-profile-decrypt and probe-req if DAEMON was true. This should be TOOLS.

---
 Makefile.am | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
Makefile.am +3 -2
index 2e962153..ebabcf1c 100644
@@ -378,8 +378,9 @@ man_MANS += wired/ead.8
 endif
 endif
 
-if DAEMON
-noinst_PROGRAMS += tools/probe-req tools/iwd-decrypt-profile
+if TOOLS
+noinst_PROGRAMS += tools/probe-req
+bin_PROGRAMS += tools/iwd-decrypt-profile
 
 tools_probe_req_SOURCES = tools/probe-req.c src/mpdu.h src/mpdu.c \
 					src/ie.h src/ie.c \
Signature · 1 line
2.25.1
#1 lore raw

Hi James,

Quoted 27 lines

If profile encryption is enabled its not out of the question that somebody might need to decrypt it. This isn't a problem building from source but IWD as a package likely won't include the decrypt tool unless its specifically copied out. Add iwd-decrypt-profile to the list of installed programs like iwctl, iwmon, etc

This also fixes a minor bug in Makefile.am which was building both iwd-profile-decrypt and probe-req if DAEMON was true. This should be TOOLS.
---
Makefile.am | 5 +++--

1 file changed, 3 insertions(+), 2 deletions(-)
Makefile.am +0 -0
index 2e962153..ebabcf1c 100644
@@ -378,8 +378,9 @@ man_MANS += wired/ead.8

endif
endif

Makefile.am +3 -2
-if DAEMON
-noinst_PROGRAMS += tools/probe-req tools/iwd-decrypt-profile
+if TOOLS
+noinst_PROGRAMS += tools/probe-req
+bin_PROGRAMS += tools/iwd-decrypt-profile
Quoted 2 lines

tools_probe_req_SOURCES = tools/probe-req.c src/mpdu.h src/mpdu.c \
src/ie.h src/ie.c \

I really prefer not installing that tool. If someone shoots themselves in the foot and need to recover, they can install it from the source. In addition, I do not want distributions cluster packages with random tools. That is going to get messy. If we ever think such a recover is needed, then it be better suited to be included in iwctl.

I moved both tools in DAEMON since once you disable iwd binary, none of them should be build either.

Regards

Marcel

#2 lore raw

Hi Marcel,

Quoted 29 lines · Marcel Holtmann

Hi James,

Quoted 27 lines

If profile encryption is enabled its not out of the question that somebody might need to decrypt it. This isn't a problem building from source but IWD as a package likely won't include the decrypt tool unless its specifically copied out. Add iwd-decrypt-profile to the list of installed programs like iwctl, iwmon, etc

This also fixes a minor bug in Makefile.am which was building both iwd-profile-decrypt and probe-req if DAEMON was true. This should be TOOLS.
---
Makefile.am | 5 +++--

1 file changed, 3 insertions(+), 2 deletions(-)
Makefile.am +0 -0
index 2e962153..ebabcf1c 100644
@@ -378,8 +378,9 @@ man_MANS += wired/ead.8

endif
endif

Makefile.am +3 -2
-if DAEMON
-noinst_PROGRAMS += tools/probe-req tools/iwd-decrypt-profile
+if TOOLS
+noinst_PROGRAMS += tools/probe-req
+bin_PROGRAMS += tools/iwd-decrypt-profile
Quoted 6 lines
Quoted 2 lines

tools_probe_req_SOURCES = tools/probe-req.c src/mpdu.h src/mpdu.c \
src/ie.h src/ie.c \

I really prefer not installing that tool. If someone shoots themselves in the foot and need to recover, they can install it from the source. In addition, I do not want distributions cluster packages with random tools. That is going to get messy. If we ever think such a recover is needed, then it be better suited to be included in iwctl.

I moved both tools in DAEMON since once you disable iwd binary, none of them should be build either.

This is fine, but it means --enable-tools has no function, just FYI.

If adding to iwctl is acceptable then I can go that route. This is a tool we need as far as debugging and potential recovery goes so I'd like it to be installed. I could also just keep this patch applied but I'd prefer upstreaming what I can.

I just wonder about the semantics using iwctl in this way. It doesn't seem like it would fit very well.

Thanks,
James

Quoted 5 lines

Regards

Marcel

#3 lore raw
In reply to James Prestwood

Resending in case this got missed.

Quoted 29 lines · James Prestwood

If profile encryption is enabled its not out of the question that somebody might need to decrypt it. This isn't a problem building from source but IWD as a package likely won't include the decrypt tool unless its specifically copied out. Add iwd-decrypt-profile to the list of installed programs like iwctl, iwmon, etc

This also fixes a minor bug in Makefile.am which was building both iwd-profile-decrypt and probe-req if DAEMON was true. This should be TOOLS.

---
  Makefile.am | 5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)
Makefile.am +3 -2
index 2e962153..ebabcf1c 100644
@@ -378,8 +378,9 @@ man_MANS += wired/ead.8
  endif
  endif
 
-if DAEMON
-noinst_PROGRAMS += tools/probe-req tools/iwd-decrypt-profile
+if TOOLS
+noinst_PROGRAMS += tools/probe-req
+bin_PROGRAMS += tools/iwd-decrypt-profile
 
  tools_probe_req_SOURCES = tools/probe-req.c src/mpdu.h src/mpdu.c \
  					src/ie.h src/ie.c \