[Openvpn-devel] remove bogus file check on --genkey argument

Message ID 20200420102102.20981-1-a@unstable.cc
State Accepted
Headers show
Series
  • [Openvpn-devel] remove bogus file check on --genkey argument
Related show

Commit Message

Antonio Quartulli April 20, 2020, 10:21 a.m.
When invoking openvpn as standalone with the --genkey
argument, options_postprocess() is not called at all
because do_genkey() takes over the execution earlier.

For this reason, checking the --genkey argument in
options_postprocess_filechecks() is a no-op.

Geti rid of the bogus check altogether.

Signed-off-by: Antonio Quartulli <a@unstable.cc>
---
 src/openvpn/options.c | 3 ---
 1 file changed, 3 deletions(-)

Comments

Gert Doering April 20, 2020, 10:30 a.m. | #1
Acked-by: Gert Doering <gert@greenie.muc.de>

"If you say so" :-)  (haven't looked more closely than "it compiles
and does not introduce/modify possibly dangerous code paths").

Your patch has been applied to the master branch.

commit c40679fbb051228f6c5108adaa9f6fc6929b1e0f (master)
Author: Antonio Quartulli
Date:   Mon Apr 20 12:21:02 2020 +0200

     remove bogus file check on --genkey argument

     Signed-off-by: Antonio Quartulli <a@unstable.cc>
     Acked-by: Gert Doering <gert@greenie.muc.de>
     Message-Id: <20200420102102.20981-1-a@unstable.cc>
     URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg19795.html
     Signed-off-by: Gert Doering <gert@greenie.muc.de>


--
kind regards,

Gert Doering
Arne Schwabe April 20, 2020, 10:31 a.m. | #2
Am 20.04.20 um 12:21 schrieb Antonio Quartulli:
> When invoking openvpn as standalone with the --genkey
> argument, options_postprocess() is not called at all
> because do_genkey() takes over the execution earlier.
> 
> For this reason, checking the --genkey argument in
> options_postprocess_filechecks() is a no-op.
> 
> Geti rid of the bogus check altogether.

Typo!

Acked-By: Arne Schwabe <arne@rfc2549.org

Patch

diff --git a/src/openvpn/options.c b/src/openvpn/options.c
index 63dc53c3..a8394c6c 100644
--- a/src/openvpn/options.c
+++ b/src/openvpn/options.c
@@ -3420,9 +3420,6 @@  options_postprocess_filechecks(struct options *options)
                                   "--tls-crypt-v2");
     }
 
-    errs |= check_file_access(CHKACC_FILE|CHKACC_INLINE|CHKACC_PRIVATE,
-                              options->genkey_filename, R_OK,
-                              "--genkey");
     errs |= check_file_access(CHKACC_FILE|CHKACC_INLINE|CHKACC_PRIVATE,
                               options->shared_secret_file, R_OK, "--secret");