summaryrefslogtreecommitdiffstats
path: root/src/openvpn/push.c
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/push.c
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/push.c')
-rw-r--r--src/openvpn/push.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/openvpn/push.c b/src/openvpn/push.c
index c99a097..8706166 100644
--- a/src/openvpn/push.c
+++ b/src/openvpn/push.c
@@ -483,7 +483,7 @@ process_incoming_push_msg (struct context *c,
case 0:
case 1:
md_ctx_update (&c->c2.pulled_options_state, BPTR(&buf_orig), BLEN(&buf_orig));
- md_ctx_final (&c->c2.pulled_options_state, c->c2.pulled_options_digest);
+ md_ctx_final (&c->c2.pulled_options_state, c->c2.pulled_options_digest.digest);
md_ctx_cleanup (&c->c2.pulled_options_state);
c->c2.pulled_options_md5_init_done = false;
ret = PUSH_MSG_REPLY;