From 5cfbc4e88a5dd0e2de3399c21a6d12fe6d17aad8 Mon Sep 17 00:00:00 2001 From: David Tomaschik Date: Sat, 3 Sep 2022 18:42:17 -0700 Subject: [PATCH 1/4] add pm3iceman --- bin/install_tool | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/bin/install_tool b/bin/install_tool index c6da477..12303d0 100755 --- a/bin/install_tool +++ b/bin/install_tool @@ -229,6 +229,20 @@ case ${TOOL} in /etc/udev/rules.d/77-mm-usb-device-blacklist.rules && udevadm control --reload-rules" ;; + pm3iceman) + install_pkgs git ca-certificates build-essential pkg-config \ + libreadline-dev gcc-arm-none-eabi libnewlib-dev qtbase5-dev \ + libbz2-dev libbluetooth-dev libpython3-dev libssl-dev + src="https://github.com/RfidResearchGroup/proxmark3.git" + git clone "${src}" "${DESTDIR}" + cd "${DESTDIR}" + make clean && make -sj2 + check_sudo && sudo /bin/sh -c \ + "cp -rf ./driver/77-pm3-usb-device-blacklist.rules \ + /etc/udev/rules.d/77-pm3-usb-device-blacklist.rules && + udevadm control --reload-rules" + add_bin_symlink pm3 + ;; cyberchef) makedest src=$(python3 -c 'from urllib import request; import json; print(filter(lambda x: x["name"]=="cyberchef.htm", json.load(request.urlopen("https://api.github.com/repos/gchq/CyberChef/releases/latest"))["assets"])[0]["browser_download_url"])') @@ -285,7 +299,7 @@ case ${TOOL} in exploitdb) if test -d "${DESTDIR}" ; then echo "Already installed, updating instead..." >/dev/stderr - "${DESTDIR}/searchsplit" -u + "${DESTDIR}/searchsploit" -u else git clone --depth 1 \ https://github.com/offensive-security/exploitdb.git \ From cd9bb5d6cc64cc51ab7ec79610b8d1fb82940787 Mon Sep 17 00:00:00 2001 From: David Tomaschik Date: Thu, 15 Sep 2022 11:25:34 -0700 Subject: [PATCH 2/4] Update cyberchef install_tool --- bin/install_tool | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/bin/install_tool b/bin/install_tool index 12303d0..d6e3faf 100755 --- a/bin/install_tool +++ b/bin/install_tool @@ -245,8 +245,11 @@ case ${TOOL} in ;; cyberchef) makedest - src=$(python3 -c 'from urllib import request; import json; print(filter(lambda x: x["name"]=="cyberchef.htm", json.load(request.urlopen("https://api.github.com/repos/gchq/CyberChef/releases/latest"))["assets"])[0]["browser_download_url"])') - download "${src}" "${DESTDIR}/cyberchef.html" + cd "${DESTDIR}" + src=$(python3 -c 'from urllib import request; import json; print(json.load(request.urlopen("https://api.github.com/repos/gchq/CyberChef/releases/latest"))["assets"][0]["browser_download_url"])') + download "${src}" "${DESTDIR}/cyberchef.zip" + unzip -d "${DESTDIR}" "${DESTDIR}/cyberchef.zip" + ln -sf CyberChef*.html "${DESTDIR}/cyberchef.html" ;; apktool) makedest_or_die From 10ce6ff7f6286104ad5dd6914d1a252173007cc8 Mon Sep 17 00:00:00 2001 From: David Tomaschik Date: Thu, 15 Sep 2022 11:26:39 -0700 Subject: [PATCH 3/4] Rotate glaptop keys --- keys/ssh/id_ed25519_glaptop3.pub | 1 - keys/ssh/id_ed25519_glaptop6.pub | 1 + keys/ssh/id_rsa_glaptop3.pub | 1 - 3 files changed, 1 insertion(+), 2 deletions(-) delete mode 100644 keys/ssh/id_ed25519_glaptop3.pub create mode 100644 keys/ssh/id_ed25519_glaptop6.pub delete mode 100644 keys/ssh/id_rsa_glaptop3.pub diff --git a/keys/ssh/id_ed25519_glaptop3.pub b/keys/ssh/id_ed25519_glaptop3.pub deleted file mode 100644 index c44eac3..0000000 --- a/keys/ssh/id_ed25519_glaptop3.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHPlKI3Mt2Hm4YZ0WNOET7SEoXmAABR+eEZ3hnJnA9AJ davidtomaschik@davidtomaschik-glaptop3 diff --git a/keys/ssh/id_ed25519_glaptop6.pub b/keys/ssh/id_ed25519_glaptop6.pub new file mode 100644 index 0000000..6833d99 --- /dev/null +++ b/keys/ssh/id_ed25519_glaptop6.pub @@ -0,0 +1 @@ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJSM/GRj76roLHo0KV9SgNGNlFmnsiWpRm9r51XqSsnu davidtomaschik@davidtomaschik-glaptop6 diff --git a/keys/ssh/id_rsa_glaptop3.pub b/keys/ssh/id_rsa_glaptop3.pub deleted file mode 100644 index e8e2827..0000000 --- a/keys/ssh/id_rsa_glaptop3.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDi2AoHzzSd/xidvRKS1OE7Pe+aGgyEY1WmWJGJ3POHuaQSbGrp4g1En4QurhXwonPiLBtQ0w6Nbbi/3vrXxSnAkJJKd9LXQtjyXVN68285lRr3DWuWnyokhO3B5aGOb5/4b6Dn8YDRrTRefezjbVavgrTFarZ19PmPmJxH9h+ZPV/hNQ6rZjBjrvGerxpmB6CjgXbIxRdsUcnao3+gyPueBOkyHbfiy7QjQT+SgPjIqT/rza4Q0OqFBTk4D7Y96biE5yY31eNs8H7uvR3PfX0NN5zvP/EqJECPYr/B3vOzAr7B8BsqYbA5UFexrp6gYn+LDzr6jAILhEUp8SsC8UFn davidtomaschik@davidtomaschik-glaptop3 From aea9e50141eb0e5eba3ee7a1c8145f37cd275026 Mon Sep 17 00:00:00 2001 From: David Tomaschik Date: Mon, 3 Oct 2022 19:48:28 -0700 Subject: [PATCH 4/4] Bump skel --- dotfiles/aliases | 3 +++ dotfiles/rsync_ignore | 12 ++++++++++++ 2 files changed, 15 insertions(+) diff --git a/dotfiles/aliases b/dotfiles/aliases index de8d458..e1fbcb2 100755 --- a/dotfiles/aliases +++ b/dotfiles/aliases @@ -53,3 +53,6 @@ alias bc="command bc -q" # Get a decently readable df alias dfh="df -h -x tmpfs -x devtmpfs" + +# Clear the GPG agent +alias clear-gpg-agent="echo RELOADAGENT | gpg-connect-agent" diff --git a/dotfiles/rsync_ignore b/dotfiles/rsync_ignore index 7e9f8a7..928b831 100644 --- a/dotfiles/rsync_ignore +++ b/dotfiles/rsync_ignore @@ -2,19 +2,31 @@ .Genymobile .Ticket to Ride* .android* +.ansible .arduino* +.aws .bundle .cache +.cargo +.config/discord +.config/gcloud/logs .dropbox-dist +.gnupg.bak .gradle .histfile +.kube/cache .local/share/Steam .local/share/Trash .local/lib +.m2 +.npm +.p2 .rvm* +.rustup .sliver .sqlite_history .thumbnails +.virtualenvs .wine .zcompdump .zcompdump*