From 83cf9622c8d61f473679de0b20f7b85e1a46306c Mon Sep 17 00:00:00 2001
From: Vyacheslav Syrovatsky <slasyz@gmail.com>
Date: Thu, 28 Nov 2019 17:14:28 +0300
Subject: [PATCH] Fix the warning added to Python 3.8: SyntaxWarning: "is" with
 a literal. Did you mean "=="?

# Conflicts:
#	impacket/dcerpc/v5/dcom/wmi.py
#	impacket/dcerpc/v5/ndr.py
#	impacket/krb5/kerberosv5.py
---
 impacket/dcerpc/v5/dcom/wmi.py | 4 +---
 impacket/krb5/kerberosv5.py    | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/impacket/dcerpc/v5/dcom/wmi.py b/impacket/dcerpc/v5/dcom/wmi.py
index b2fcae769d..cd7662f82a 100644
--- a/impacket/dcerpc/v5/dcom/wmi.py
+++ b/impacket/dcerpc/v5/dcom/wmi.py
@@ -2461,9 +2461,7 @@ def marshalMe(self):
                     ndTable |= self.__ndEntry(i, True, True)
             else:
                 if itemValue == '':
-                    # https://github.com/SecureAuthCorp/impacket/pull/1069#issuecomment-835179409
-                    # Force inherited_default to avoid 'obscure' issue in wmipersist.py
-                    ndTable |= self.__ndEntry(i, True, True)
+                    ndTable |= 1 << (2*i)
                     valueTable += pack('<L', 0)
                 else:
                     strIn = ENCODED_STRING()
diff --git a/impacket/krb5/kerberosv5.py b/impacket/krb5/kerberosv5.py
index 57c5c42793..64e2faff75 100644
--- a/impacket/krb5/kerberosv5.py
+++ b/impacket/krb5/kerberosv5.py
@@ -179,7 +179,7 @@ def getKerberosTGT(clientName, password, domain, lmhash, nthash, aesKey='', kdcH
         r = sendReceive(message, domain, kdcHost)
     except KerberosError as e:
         if e.getErrorCode() == constants.ErrorCodes.KDC_ERR_ETYPE_NOSUPP.value:
-            if supportedCiphers[0] in (constants.EncryptionTypes.aes128_cts_hmac_sha1_96.value, constants.EncryptionTypes.aes256_cts_hmac_sha1_96.value) and aesKey == b'':
+            if supportedCiphers[0] in (constants.EncryptionTypes.aes128_cts_hmac_sha1_96.value, constants.EncryptionTypes.aes256_cts_hmac_sha1_96.value) and aesKey == '':
                 supportedCiphers = (int(constants.EncryptionTypes.rc4_hmac.value),)
                 seq_set_iter(reqBody, 'etype', supportedCiphers)
                 message = encoder.encode(asReq)