summaryrefslogtreecommitdiffstats
path: root/src/openvpn/openvpn.h
diff options
context:
space:
mode:
authorSteffan Karger <steffan@karger.me>2015-07-26 13:27:19 +0200
committerGert Doering <gert@greenie.muc.de>2015-07-27 20:07:23 +0200
commit2dd6501e3d679046a1ed488f22d62defdf737cf3 (patch)
tree6a9d86d41a716c7ddb000c3ce7dbb73a32183d23 /src/openvpn/openvpn.h
parent82acf2163412aae9259e2202dbe001a2ac797b99 (diff)
downloadopenvpn-2dd6501e3d679046a1ed488f22d62defdf737cf3.tar.gz
openvpn-2dd6501e3d679046a1ed488f22d62defdf737cf3.tar.xz
openvpn-2dd6501e3d679046a1ed488f22d62defdf737cf3.zip
reintroduce md5_digest wrapper struct to fix gcc warnings
I was wrong to assume that adding the const qualifier to the pointer-to- fixed-size-array contruction used in options_hash_changed_or_zero() was allowed. GCC actually warns about this, but I was using clang and clang seems to be fine with the contruction. To make GCC happy too, reintroduce the md5_digest wrapped struct, and use that when passing around the digest. This reverts the "struct md5_digest" parts of 827de237860813d2859a, but keeps the rest. Signed-off-by: Steffan Karger <steffan@karger.me> Acked-by: Gert Doering <gert@greenie.muc.de> Message-Id: <1437910039-30101-1-git-send-email-steffan@karger.me> URL: http://article.gmane.org/gmane.network.openvpn.devel/9949 Signed-off-by: Gert Doering <gert@greenie.muc.de>
Diffstat (limited to 'src/openvpn/openvpn.h')
-rw-r--r--src/openvpn/openvpn.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/openvpn/openvpn.h b/src/openvpn/openvpn.h
index ef7ca1d..1c2a80b 100644
--- a/src/openvpn/openvpn.h
+++ b/src/openvpn/openvpn.h
@@ -199,7 +199,7 @@ struct context_1
#endif
/* if client mode, hash of option strings we pulled from server */
- uint8_t pulled_options_digest_save[MD5_DIGEST_LENGTH];
+ struct md5_digest pulled_options_digest_save;
/**< Hash of option strings received from the
* remote OpenVPN server. Only used in
* client-mode. */
@@ -465,7 +465,7 @@ struct context_2
/* hash of pulled options, so we can compare when options change */
bool pulled_options_md5_init_done;
md_ctx_t pulled_options_state;
- uint8_t pulled_options_digest[MD5_DIGEST_LENGTH];
+ struct md5_digest pulled_options_digest;
struct event_timeout server_poll_interval;