1 files changed, 14 insertions, 11 deletions

diff --git a/epan/dissectors/packet-isakmp.c b/epan/dissectors/packet-isakmp.c
index 31a285c607..b27a2ed037 100644
--- a/epan/dissectors/packet-isakmp.c
+++ b/epan/dissectors/packet-isakmp.c
@@ -4994,24 +4994,25 @@ isakmp_prefs_apply_cb(void) {
 UAT_BUFFER_CB_DEF(ikev1_users, icookie, ikev1_uat_data_key_t, icookie, icookie_len)
 UAT_BUFFER_CB_DEF(ikev1_users, key, ikev1_uat_data_key_t, key, key_len)
 
-static void ikev1_uat_data_update_cb(void* p, char** err) {
+static gboolean ikev1_uat_data_update_cb(void* p, char** err) {
   ikev1_uat_data_key_t *ud = (ikev1_uat_data_key_t *)p;
 
   if (ud->icookie_len != COOKIE_SIZE) {
     *err = g_strdup_printf("Length of Initiator's COOKIE must be %d octets (%d hex characters).", COOKIE_SIZE, COOKIE_SIZE * 2);
-    return;
+    return FALSE;
   }
 
   if (ud->key_len == 0) {
     *err = g_strdup_printf("Must have Encryption key.");
-    return;
+    return FALSE;
   }
 
   if (ud->key_len > MAX_KEY_SIZE) {
     *err = g_strdup_printf("Length of Encryption key limited to %d octets (%d hex characters).", MAX_KEY_SIZE, MAX_KEY_SIZE * 2);
-    return;
+    return FALSE;
   }
 
+  return TRUE;
 }
 
 UAT_BUFFER_CB_DEF(ikev2_users, spii, ikev2_uat_data_t, key.spii, key.spii_len)
@@ -5023,17 +5024,17 @@ UAT_BUFFER_CB_DEF(ikev2_users, sk_ai, ikev2_uat_data_t, sk_ai, sk_ai_len)
 UAT_BUFFER_CB_DEF(ikev2_users, sk_ar, ikev2_uat_data_t, sk_ar, sk_ar_len)
 UAT_VS_DEF(ikev2_users, auth_alg, ikev2_uat_data_t, guint, IKEV2_AUTH_HMAC_SHA1_96, IKEV2_AUTH_HMAC_SHA1_96_STR)
 
-static void ikev2_uat_data_update_cb(void* p, char** err) {
+static gboolean ikev2_uat_data_update_cb(void* p, char** err) {
   ikev2_uat_data_t *ud = (ikev2_uat_data_t *)p;
 
   if (ud->key.spii_len != COOKIE_SIZE) {
     *err = g_strdup_printf("Length of Initiator's SPI must be %d octets (%d hex characters).", COOKIE_SIZE, COOKIE_SIZE * 2);
-    return;
+    return FALSE;
   }
 
   if (ud->key.spir_len != COOKIE_SIZE) {
     *err = g_strdup_printf("Length of Responder's SPI must be %d octets (%d hex characters).", COOKIE_SIZE, COOKIE_SIZE * 2);
-    return;
+    return FALSE;
   }
 
   if ((ud->encr_spec = ikev2_decrypt_find_encr_spec(ud->encr_alg)) == NULL) {
@@ -5047,26 +5048,28 @@ static void ikev2_uat_data_update_cb(void* p, char** err) {
   if (ud->sk_ei_len != ud->encr_spec->key_len) {
     *err = g_strdup_printf("Length of SK_ei (%u octets) does not match the key length (%u octets) of the selected encryption algorithm.",
              ud->sk_ei_len, ud->encr_spec->key_len);
-    return;
+    return FALSE;
   }
 
   if (ud->sk_er_len != ud->encr_spec->key_len) {
     *err = g_strdup_printf("Length of SK_er (%u octets) does not match the key length (%u octets) of the selected encryption algorithm.",
              ud->sk_er_len, ud->encr_spec->key_len);
-    return;
+    return FALSE;
   }
 
   if (ud->sk_ai_len != ud->auth_spec->key_len) {
     *err = g_strdup_printf("Length of SK_ai (%u octets) does not match the key length (%u octets) of the selected integrity algorithm.",
              ud->sk_ai_len, ud->auth_spec->key_len);
-    return;
+    return FALSE;
   }
 
   if (ud->sk_ar_len != ud->auth_spec->key_len) {
     *err = g_strdup_printf("Length of SK_ar (%u octets) does not match the key length (%u octets) of the selected integrity algorithm.",
              ud->sk_ar_len, ud->auth_spec->key_len);
-    return;
+    return FALSE;
   }
+
+  return TRUE;
 }
 #endif /* HAVE_LIBGCRYPT */