refactor np.bitwise xor to ^ operator

This commit is contained in:
2025-03-16 06:20:05 -05:00
parent daebb61e56
commit b6ab0c1890
5 changed files with 149 additions and 158 deletions

View File

@@ -97,12 +97,10 @@ if __name__ == "__main__":
padded_passcode_server_set = user_keys.pad_user_mask(np.array(passcode_server_set), customer.cipher.set_key)
set_idx = [customer.cipher.get_set_index(set_val) for set_val in padded_passcode_server_set]
mask_set_keys = [user_keys.set_key[idx] for idx in set_idx]
ciphered_mask = np.bitwise_xor(mask_set_keys, padded_passcode_server_set)
ciphered_mask = np.bitwise_xor(ciphered_mask, user_keys.mask_key)
mask_set_keys = [user_keys.combined_set_key[idx] for idx in set_idx]
ciphered_mask = mask_set_keys ^ padded_passcode_server_set ^ user_keys.mask_key
mask = user_keys.encode_base64_str(ciphered_mask)
#ciphered_customer_props = xor_lists(customer.cipher.prop_key, user_keys.prop_key)
ciphered_customer_props = np.bitwise_xor(customer.cipher.prop_key, user_keys.prop_key)
ciphered_customer_props = customer.cipher.prop_key ^ user_keys.prop_key
passcode_ciphered_props = [ciphered_customer_props[idx] for idx in user_passcode]
pad_len = customer.nkode_policy.max_nkode_len - passcode_len
passcode_ciphered_props.extend([0 for _ in range(pad_len)])
@@ -136,7 +134,7 @@ if __name__ == "__main__":
user_mask = user.enciphered_passcode.mask
decoded_mask = user_keys.decode_base64_str(user_mask)
deciphered_mask = np.bitwise_xor(decoded_mask, user_keys.mask_key)
set_key_rand_component = np.bitwise_xor(set_vals, user_keys.set_key)
set_key_rand_component = np.bitwise_xor(set_vals, user_keys.combined_set_key)
login_passcode_sets = []
for set_cipher in deciphered_mask[:passcode_len]:
set_idx = np.where(set_key_rand_component == set_cipher)[0][0]
@@ -172,7 +170,7 @@ if __name__ == "__main__":
sets_xor = np.bitwise_xor(new_sets, old_sets)
for user in customer.users.values():
user.renew = True
user.cipher.set_key = np.bitwise_xor(user.cipher.set_key, sets_xor)
user.cipher.combined_set_key = np.bitwise_xor(user.cipher.combined_set_key, sets_xor)
user.cipher.prop_key = np.bitwise_xor(user.cipher.prop_key, props_xor)
"""
@@ -200,8 +198,8 @@ if __name__ == "__main__":
'confirm_keypad': confirm_keypad,
'selected_keys_confirm': selected_keys_confirm,
'user_cipher': user_keys,
'passcode_server_prop': passcode_server_prop,
'passcode_server_set': passcode_server_set,
'ordered_customer_prop_key': passcode_server_prop,
'ordered_customer_set_key': passcode_server_set,
'enciphered_nkode': enciphered_nkode,
'login_keypad': login_keypad,
'selected_login_keys': selected_keys_login,