diff options
| author | Stefan Metzmacher <metze@samba.org> | 2020-03-16 07:22:19 +0100 |
|---|---|---|
| committer | Stig Bjørlykke <stig@bjorlykke.org> | 2020-03-16 08:30:34 +0000 |
| commit | c67b8c4f298462f7b8b4426618b4e38a90413c0b (patch) | |
| tree | 4c4f59cf18143c74c5a6eadc0b36f98bc9c0931e | |
| parent | 8e76178fcd9ac415ee8552399ca550ae8e27d8f5 (diff) | |
packet-dcerpc-netlogon: remove unused '#ifdef HAVE_KERBEROS'
get_md4pass_list() is always available, it just returns 0
if HAVE_KERBEROS is not available.
Change-Id: I7fd8613b48c5b02f8693fa6ee15f5f38ed10643e
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-on: https://code.wireshark.org/review/36447
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
| -rw-r--r-- | epan/dissectors/packet-dcerpc-netlogon.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/epan/dissectors/packet-dcerpc-netlogon.c b/epan/dissectors/packet-dcerpc-netlogon.c index b27cbde1b0..faa07c363f 100644 --- a/epan/dissectors/packet-dcerpc-netlogon.c +++ b/epan/dissectors/packet-dcerpc-netlogon.c @@ -6536,26 +6536,22 @@ netlogon_dissect_netrserverauthenticate023_reply(tvbuff_t *tvb, int offset, debugprintf("Something strange happened while searching for authenticate_reply\n"); } else { -#ifdef HAVE_KERBEROS md4_pass *pass_list=NULL; const md4_pass *used_md4 = NULL; const char *used_method = NULL; guint32 list_size = 0; unsigned int i = 0; md4_pass password; -#endif guint8 session_key[16]; int found = 0; vars->flags = flags; vars->can_decrypt = FALSE; -#ifdef HAVE_KERBEROS list_size = get_md4pass_list(&pass_list); debugprintf("Found %d passwords \n",list_size); -#endif if( flags & NETLOGON_FLAG_AES ) { -#if defined(HAVE_KERBEROS) && GCRYPT_VERSION_NUMBER >= 0x010800 /* 1.8.0 */ +#if GCRYPT_VERSION_NUMBER >= 0x010800 /* 1.8.0 */ guint8 salt_buf[16] = { 0 }; guint8 sha256[HASH_SHA2_256_LENGTH]; guint64 calculated_cred; @@ -6627,7 +6623,6 @@ netlogon_dissect_netrserverauthenticate023_reply(tvbuff_t *tvb, int offset, } #endif } else if ( flags & NETLOGON_FLAG_STRONGKEY ) { -#ifdef HAVE_KERBEROS guint8 zeros[4] = { 0 }; guint8 md5[HASH_MD5_LENGTH]; gcry_md_hd_t md5_handle; @@ -6653,16 +6648,13 @@ netlogon_dissect_netrserverauthenticate023_reply(tvbuff_t *tvb, int offset, if (!ws_hmac_buffer(GCRY_MD_MD5, session_key, md5, HASH_MD5_LENGTH, (guint8*) &password, 16)) { crypt_des_ecb(buf,(unsigned char*)&vars->server_challenge,session_key); crypt_des_ecb((unsigned char*)&calculated_cred,buf,session_key+7); -#if 0 printnbyte((guint8*)&calculated_cred,8,"Calculated creds:","\n"); -#endif if(calculated_cred==server_cred) { found = 1; break; } } } -#endif } else { |