diff --git a/home/lucifer/.local/share/nautilus/scripts/05b-macOS/03-E01-autologon-credentials b/home/lucifer/.local/share/nautilus/scripts/05b-macOS/03-E01-autologon-credentials index d438935..fefe4d0 100755 --- a/home/lucifer/.local/share/nautilus/scripts/05b-macOS/03-E01-autologon-credentials +++ b/home/lucifer/.local/share/nautilus/scripts/05b-macOS/03-E01-autologon-credentials @@ -149,13 +149,13 @@ if ${FSSTAT_BIN} -o "${OFFSET}" "${SOURCE}" > /dev/null 2>&1 ; then if ! ${ICAT_BIN} -o "${OFFSET}" "${SOURCE}" "${user}" > "/tmp/${user}.plist" ; then echo " During the execution of icat an error occurred." >> "${CREDENTIALS}" fi - ${PLUTIL_BIN} -i "/tmp/${user}.plist" -o "${DIRNAME}/${user}.plist" + ${PLUTIL_BIN} -i "/tmp/${user}.plist" -o "${TMP}/${user}.plist" ${RM_BIN} "/tmp/${user}.plist" fi echo -e -n " " >> "${CREDENTIALS}" - ${PPEPY_BIN} "${DIRNAME}/${user}.plist" "name" >> "${CREDENTIALS}" + ${PPEPY_BIN} "${TMP}/${user}.plist" "name" >> "${CREDENTIALS}" echo -e -n " " >> "${CREDENTIALS}" - ${PPEPY_BIN} "${DIRNAME}/${user}.plist" "hint" >> "${CREDENTIALS}" + ${PPEPY_BIN} "${TMP}/${user}.plist" "hint" >> "${CREDENTIALS}" echo >> "${CREDENTIALS}" done else @@ -172,15 +172,15 @@ if ${FSSTAT_BIN} -o "${OFFSET}" "${SOURCE}" > /dev/null 2>&1 ; then echo " During the execution of icat an error occurred." \ >> "${CREDENTIALS}" fi - ${PLUTIL_BIN} -i "/tmp/${calp}.plist" -o "${DIRNAME}/${calp}.plist" + ${PLUTIL_BIN} -i "/tmp/${calp}.plist" -o "${TMP}/${calp}.plist" ${RM_BIN} "/tmp/${calp}.plist" fi echo -e -n " Some content from com.apple.loginwindow.plist:\n " \ >> "${CREDENTIALS}" - ${PPEPY_BIN} "${DIRNAME}/${calp}.plist" "lastUserName" \ + ${PPEPY_BIN} "${TMP}/${calp}.plist" "lastUserName" \ >> "${CREDENTIALS}" echo -e -n " " >> "${CREDENTIALS}" - ${PPEPY_BIN} "${DIRNAME}/${calp}.plist" "autoLoginUser" \ + ${PPEPY_BIN} "${TMP}/${calp}.plist" "autoLoginUser" \ >> "${CREDENTIALS}" echo >> "${CREDENTIALS}" else diff --git a/home/lucifer/Pictures/Screenshots/05a-Windows.png b/home/lucifer/Pictures/Screenshots/05a-Windows.png new file mode 100644 index 0000000..1de0e07 Binary files /dev/null and b/home/lucifer/Pictures/Screenshots/05a-Windows.png differ diff --git a/home/lucifer/Pictures/Screenshots/macos-credentials.png b/home/lucifer/Pictures/Screenshots/macos-credentials.png new file mode 100644 index 0000000..491fb18 Binary files /dev/null and b/home/lucifer/Pictures/Screenshots/macos-credentials.png differ diff --git a/home/lucifer/Pictures/Screenshots/macos-dump-hashes-after-lion.png b/home/lucifer/Pictures/Screenshots/macos-dump-hashes-after-lion.png new file mode 100644 index 0000000..95efa5d Binary files /dev/null and b/home/lucifer/Pictures/Screenshots/macos-dump-hashes-after-lion.png differ diff --git a/home/lucifer/Pictures/Screenshots/macos-dump-hashes-before-lion.png b/home/lucifer/Pictures/Screenshots/macos-dump-hashes-before-lion.png new file mode 100644 index 0000000..623b2e6 Binary files /dev/null and b/home/lucifer/Pictures/Screenshots/macos-dump-hashes-before-lion.png differ diff --git a/home/lucifer/Pictures/Screenshots/macos-dump-hashes-lion.png b/home/lucifer/Pictures/Screenshots/macos-dump-hashes-lion.png new file mode 100644 index 0000000..8219ae8 Binary files /dev/null and b/home/lucifer/Pictures/Screenshots/macos-dump-hashes-lion.png differ diff --git a/home/lucifer/Pictures/Screenshots/macos-hashcat-dict-lion.png b/home/lucifer/Pictures/Screenshots/macos-hashcat-dict-lion.png new file mode 100644 index 0000000..6abcf10 Binary files /dev/null and b/home/lucifer/Pictures/Screenshots/macos-hashcat-dict-lion.png differ diff --git a/home/lucifer/Pictures/Screenshots/macos-timezone.png b/home/lucifer/Pictures/Screenshots/macos-timezone.png new file mode 100644 index 0000000..add7d15 Binary files /dev/null and b/home/lucifer/Pictures/Screenshots/macos-timezone.png differ diff --git a/home/lucifer/Pictures/Screenshots/macos-tz-select-partition.png b/home/lucifer/Pictures/Screenshots/macos-tz-select-partition.png new file mode 100644 index 0000000..161e2c1 Binary files /dev/null and b/home/lucifer/Pictures/Screenshots/macos-tz-select-partition.png differ diff --git a/usr/local/bin/kcpass.py b/usr/local/bin/kcpass.py index 1a28a0e..bac8762 100755 --- a/usr/local/bin/kcpass.py +++ b/usr/local/bin/kcpass.py @@ -1,4 +1,4 @@ -#!/usr/bin/python2 +#!/usr/bin/python3 # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -21,13 +21,13 @@ magic_static='7d895223d2bcddeaa3b91f' pwd = '' if len(sys.argv) != 2: - print 'Please write as a first argv the hexadecimal kcpassword value:' - print 'Example: python {} 1ceb3147d2172f1140ff63bf'.format(sys.argv[0]) + print( 'Please write as a first argv the hexadecimal kcpassword value:' ) + print( 'Example: python {} 1ceb3147d2172f1140ff63bf'.format(sys.argv[0]) ) exit(1) kcpasswd=sys.argv[1] -print u'\n\tKcpasswd: 0x{}.'.format(kcpasswd) -print u'\tMagic Xor: 0x{}.'.format(magic_static) +print( '\n\tKcpasswd: 0x{}.'.format(kcpasswd) ) +print( '\tMagic Xor: 0x{}.'.format(magic_static) ) tam_xor = len(magic_static) tam = len(kcpasswd) - tam_xor @@ -35,7 +35,7 @@ magic = magic_static while tam > 0: tam -= tam_xor magic += magic_static -print u'\tUsed Magic Xor: 0x{}.'.format(magic) +print( '\tUsed Magic Xor: 0x{}.'.format(magic) ) i = 0 while i < len(kcpasswd): @@ -46,6 +46,8 @@ while i < len(kcpasswd): r = charkch ^ charmh pwd += chr(r) if r == 0: - print '\n\tThe password is: "{}".\n'.format(pwd.rstrip('\0')) + print( '\n\tThe password is: "{}".\n'.format(pwd.rstrip('\0')) ) break i += 2 + +exit(0)