diff options
author | Davide Depau | 2019-11-17 18:52:34 +0100 |
---|---|---|
committer | Davide Depau | 2019-11-17 18:52:34 +0100 |
commit | a1de63d51923ea8cea3a4c4014858d10c2c2abe0 (patch) | |
tree | db23d3d226763c0d9a76e8ee59205117575d6071 | |
parent | 8cc2778312344da218d3d7f212899065ad4584bc (diff) | |
download | aur-a1de63d51923ea8cea3a4c4014858d10c2c2abe0.tar.gz |
Switch to disabled nested attack version
-rw-r--r-- | .SRCINFO | 16 | ||||
-rw-r--r-- | 0001-Never-try-nested-attack.patch | 26 | ||||
-rw-r--r-- | PKGBUILD | 23 |
3 files changed, 51 insertions, 14 deletions
@@ -1,8 +1,6 @@ -# Generated by mksrcinfo v8 -# Sat Apr 15 10:48:48 UTC 2017 -pkgbase = mfoc-git - pkgdesc = Mifare Classic Offline Cracker - pkgver = 103.9d9f01f +pkgbase = mfoc-nonested-git + pkgdesc = Mifare Classic Offline Cracker (nested attack disabled in code) + pkgver = 115.fe8e065 pkgrel = 1 url = https://github.com/nfc-tools/mfoc arch = i686 @@ -10,9 +8,13 @@ pkgbase = mfoc-git license = GPL2 makedepends = git depends = libnfc>=1.7.0 + provides = mfoc conflicts = mfoc - source = mfoc-git::git://github.com/nfc-tools/mfoc.git + conflicts = mfoc-git + source = mfoc-nonested-git::git://github.com/nfc-tools/mfoc.git + source = 0001-Never-try-nested-attack.patch sha1sums = SKIP + sha1sums = a4de43b1641de38fe73f8a51e57268cefca3a6c5 -pkgname = mfoc-git +pkgname = mfoc-nonested-git diff --git a/0001-Never-try-nested-attack.patch b/0001-Never-try-nested-attack.patch new file mode 100644 index 000000000000..b65dee667a50 --- /dev/null +++ b/0001-Never-try-nested-attack.patch @@ -0,0 +1,26 @@ +From 4412e1f92353a9211f865438c784f28d6492122d Mon Sep 17 00:00:00 2001 +From: Davide Depau <davide@depau.eu> +Date: Sun, 17 Nov 2019 18:44:31 +0100 +Subject: [PATCH] Never try nested attack + +--- + src/mfoc.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/mfoc.c b/src/mfoc.c +index e2545be..6cf8055 100644 +--- a/src/mfoc.c ++++ b/src/mfoc.c +@@ -1059,7 +1059,8 @@ int mf_enhanced_auth(int e_sector, int a_sector, mftag t, mfreader r, denonce *d + NtLast = bytes_to_num(Rx, 4) ^ crypto1_word(pcs, bytes_to_num(Rx, 4) ^ t.authuid, 1); + + // Make sure the card is using the known PRNG +- if (! validate_prng_nonce(NtLast)) { ++ if (true || ! validate_prng_nonce(NtLast)) { ++ printf("Not doing nested attack.\n"); + printf("Card is not vulnerable to nested attack\n"); + return -99999; + } +-- +2.24.0 + @@ -1,23 +1,32 @@ -# Maintainer: goll <adrian.goll+aur[at]gmail> +# Maintainer: Davide Depau <davide@depau.eu> +# Contributor: goll <adrian.goll+aur[at]gmail> -pkgname=mfoc-git -pkgver=103.9d9f01f +pkgname=mfoc-nonested-git +pkgver=115.fdd4602 pkgrel=1 -pkgdesc="Mifare Classic Offline Cracker" +pkgdesc="Mifare Classic Offline Cracker (nested attack disabled in code)" arch=('i686' 'x86_64') url="https://github.com/nfc-tools/mfoc" license=('GPL2') depends=('libnfc>=1.7.0') makedepends=('git') -conflicts=('mfoc') -source=("$pkgname"::'git://github.com/nfc-tools/mfoc.git') -sha1sums=('SKIP') +provides=('mfoc') +conflicts=('mfoc' 'mfoc-git') +source=("$pkgname"::'git://github.com/nfc-tools/mfoc.git' + 0001-Never-try-nested-attack.patch) +sha1sums=('SKIP' + 'a4de43b1641de38fe73f8a51e57268cefca3a6c5') pkgver() { cd "${srcdir}/${pkgname}" printf "%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" } +prepare() { + cd "${srcdir}/${pkgname}" + git am < ../0001-Never-try-nested-attack.patch +} + build() { cd "${srcdir}/${pkgname}" autoreconf -vis |