flichtenheld has uploaded this change for review. (
http://gerrit.openvpn.net/c/openvpn/+/310?usp=email )
Change subject: generate_auth_token: simplify code
......................................................................
generate_auth_token: simplify code
The previous code went through some hoops
to avoid compiler warnings. But there is
a much easier way by just telling it
exactly what you want to do.
Also fix typo in variable name while I'm
here.
Change-Id: Icc86334b26ba1fcc20f4cd03644018d1d16796e3
Signed-off-by: Frank Lichtenheld <fr...@lichtenheld.com>
---
M src/openvpn/auth_token.c
1 file changed, 5 insertions(+), 11 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/10/310/2
diff --git a/src/openvpn/auth_token.c b/src/openvpn/auth_token.c
index 6787ea7..28b58b0 100644
--- a/src/openvpn/auth_token.c
+++ b/src/openvpn/auth_token.c
@@ -182,24 +182,18 @@
char *initial_token_copy = string_alloc(multi->auth_token_initial,
&gc);
char *old_sessid = initial_token_copy + strlen(SESSION_ID_PREFIX);
- char *old_tsamp_initial = old_sessid + AUTH_TOKEN_SESSION_ID_LEN*8/6;
+ char *old_tstamp_initial = old_sessid + AUTH_TOKEN_SESSION_ID_LEN*8/6;
/*
* We null terminate the old token just after the session ID to let
* our base64 decode function only decode the session ID
*/
- old_tsamp_initial[12] = '\0';
- ASSERT(openvpn_base64_decode(old_tsamp_initial, old_tstamp_decode, 9)
== 9);
+ old_tstamp_initial[12] = '\0';
+ ASSERT(openvpn_base64_decode(old_tstamp_initial, old_tstamp_decode, 9)
== 9);
- /*
- * Avoid old gcc (4.8.x) complaining about strict aliasing
- * by using a temporary variable instead of doing it in one
- * line
- */
- uint64_t *tstamp_ptr = (uint64_t *) old_tstamp_decode;
- initial_timestamp = *tstamp_ptr;
+ memcpy(&initial_timestamp, &old_tstamp_decode,
sizeof(initial_timestamp));
- old_tsamp_initial[0] = '\0';
+ old_tstamp_initial[0] = '\0';
ASSERT(openvpn_base64_decode(old_sessid, sessid,
AUTH_TOKEN_SESSION_ID_LEN) == AUTH_TOKEN_SESSION_ID_LEN);
}
else if (!rand_bytes(sessid, AUTH_TOKEN_SESSION_ID_LEN))
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/310?usp=email
To unsubscribe, or for help writing mail filters, visit
http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Icc86334b26ba1fcc20f4cd03644018d1d16796e3
Gerrit-Change-Number: 310
Gerrit-PatchSet: 2
Gerrit-Owner: flichtenheld <fr...@lichtenheld.com>
Gerrit-Reviewer: plaisthos <arne-open...@rfc2549.org>
Gerrit-CC: openvpn-devel <openvpn-devel@lists.sourceforge.net>
Gerrit-MessageType: newchange
_______________________________________________
Openvpn-devel mailing list
Openvpn-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
