summaryrefslogtreecommitdiff
path: root/src/openvpn/session_id.c
diff options
context:
space:
mode:
authorAlberto Gonzalez Iniesta <agi@inittab.org>2016-12-27 18:25:47 +0100
committerAlberto Gonzalez Iniesta <agi@inittab.org>2016-12-27 18:25:47 +0100
commit79f3537f69e125f19f59c36aa090120a63186a54 (patch)
tree2089a3b7dac990841dbc2e4d9b2f535b82dbb0af /src/openvpn/session_id.c
parentf2137fedb30cb87448eb03b2f288920df6187571 (diff)
parent3a2bbdb05ca6a6996e424c9fb225cb0d53804125 (diff)
Merge tag 'upstream/2.4.0'
Upstream version 2.4.0
Diffstat (limited to 'src/openvpn/session_id.c')
-rw-r--r--src/openvpn/session_id.c16
1 files changed, 9 insertions, 7 deletions
diff --git a/src/openvpn/session_id.c b/src/openvpn/session_id.c
index 0ebff65..b23f0f4 100644
--- a/src/openvpn/session_id.c
+++ b/src/openvpn/session_id.c
@@ -5,7 +5,7 @@
* packet encryption, packet authentication, and
* packet compression.
*
- * Copyright (C) 2002-2010 OpenVPN Technologies, Inc. <sales@openvpn.net>
+ * Copyright (C) 2002-2017 OpenVPN Technologies, Inc. <sales@openvpn.net>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2
@@ -51,17 +51,19 @@
const struct session_id x_session_id_zero;
void
-session_id_random (struct session_id *sid)
+session_id_random(struct session_id *sid)
{
- prng_bytes (sid->id, SID_SIZE);
+ prng_bytes(sid->id, SID_SIZE);
}
const char *
-session_id_print (const struct session_id *sid, struct gc_arena *gc)
+session_id_print(const struct session_id *sid, struct gc_arena *gc)
{
- return format_hex (sid->id, SID_SIZE, 0, gc);
+ return format_hex(sid->id, SID_SIZE, 0, gc);
}
-#else
-static void dummy(void) {}
+#else /* ifdef ENABLE_CRYPTO */
+static void
+dummy(void) {
+}
#endif /* ENABLE_CRYPTO */