Merge branch '2.0.1' into develop

2016-10-03 15:21:04 +03:00
parent b42231e5d4 fa2a667195
commit fbf5c331f1
16 changed files with 449 additions and 301 deletions
--- a/server/modules/authenticator/cdc_plain_auth.c
+++ b/server/modules/authenticator/cdc_plain_auth.c
@ -265,6 +265,12 @@ cdc_auth_set_client_data(CDC_session *client_data,
                         uint8_t *client_auth_packet,
                         int client_auth_packet_size)
 {
+    if (client_auth_packet_size % 2 != 0)
+    {
+        /** gw_hex2bin expects an even number of bytes */
+        client_auth_packet_size--;
+    }
+
    int rval = CDC_STATE_AUTH_ERR;
    int decoded_size = client_auth_packet_size / 2;
    char decoded_buffer[decoded_size + 1]; // Extra for terminating null