Initial commit

3 files changed, 199 insertions, 0 deletions

diff --git a/.SRCINFO b/.SRCINFO
new file mode 100644
index 000000000000..06e27b403ff4
--- /dev/null
+++ b/.SRCINFO
@@ -0,0 +1,24 @@
+pkgbase = validity-sensors-tools-git
+	pkgdesc = Linux tool to flash and pair Validity fingerprint sensors 009x
+	pkgver = 0.5.r25.gaf54569
+	pkgrel = 1
+	url = https://github.com/3v1n0/python-validity
+	arch = x86_64
+	license = proprietary
+	makedepends = python-setuptools
+	depends = python-pycrypto
+	depends = python-pyusb
+	depends = python-fastecdsa=1.7.4
+	depends = innoextract
+	depends = libusb
+	depends = usbutils
+	provides = validity-sensors-tools
+	provides = python-proto9x
+	provides = python-proto9x-git
+	source = validity-sensors-tools::git+https://github.com/Depau/python-validity.git
+	source = 0001-Monkey-patch-time-to-fix-bug-in-pycrypto.patch
+	sha256sums = SKIP
+	sha256sums = 9987b7765ff2921250de1c378b5cb8ac6f05d9f133211f0add358dffda6e33c1
+
+pkgname = validity-sensors-tools-git
+
diff --git a/0001-Monkey-patch-time-to-fix-bug-in-pycrypto.patch b/0001-Monkey-patch-time-to-fix-bug-in-pycrypto.patch
new file mode 100644
index 000000000000..d86b26b8d322
--- /dev/null
+++ b/0001-Monkey-patch-time-to-fix-bug-in-pycrypto.patch
@@ -0,0 +1,127 @@
+From c647af72f0d5699c341ec8cee995f2aee46261a9 Mon Sep 17 00:00:00 2001
+From: Davide Depau <davide@depau.eu>
+Date: Tue, 16 Jun 2020 03:27:36 +0200
+Subject: [PATCH] Monkey-patch time to fix bug in pycrypto
+
+---
+ proto9x/tls.py | 30 +++++++++++++++++-------------
+ 1 file changed, 17 insertions(+), 13 deletions(-)
+
+diff --git a/proto9x/tls.py b/proto9x/tls.py
+index e1c7759..4dfe175 100644
+--- a/proto9x/tls.py
++++ b/proto9x/tls.py
+@@ -1,3 +1,8 @@
++# Monkey-patch time module since pycrypto uses a deprecated function.
++# See https://github.com/fabiant7t/pycrypto/commit/6d41ad025331afce9e495d7be3205730ddfa8f07
++import time
++time.clock = time.process_time
++
+ import re
+ import hmac
+ import sys
+@@ -15,7 +20,6 @@ from fastecdsa.encoding.der import DEREncoder
+ from .util import assert_status
+ import pickle
+ 
+-
+ password_hardcoded=unhexlify('717cd72d0962bc4a2846138dbb2c24192512a76407065f383846139d4bec2033')
+ gwk_sign_hardcoded=unhexlify('3a4c76b76a97981d1274247e166610e77f4d9c9d07d3c728e532916bdd28b454')
+ 
+@@ -34,7 +38,7 @@ fff000000000000000000000000000000000000000000000000000000000000000000000000
+ 
+ def prf(secret, seed, length):
+     n = (length + 0x20 - 1) // 0x20
+-    
++
+     res = b''
+     a = hmac.new(secret, seed, sha256).digest()
+ 
+@@ -47,7 +51,7 @@ def prf(secret, seed, length):
+ 
+ def hs_key():
+     key=password_hardcoded[:0x10]
+-    seed=password_hardcoded[0x10:] + b'\xaa'*2 
++    seed=password_hardcoded[0x10:] + b'\xaa'*2
+     hs_key=prf(key, b'HS_KEY_PAIR_GEN' + seed, 0x20)
+     return int(hs_key[::-1].hex(), 16)
+ 
+@@ -78,7 +82,7 @@ def unpad(b):
+ 
+ # TODO assert the right state transitions
+ class Tls():
+-    
++
+     def __init__(self, usb):
+         self.usb = usb
+         self.reset()
+@@ -119,10 +123,10 @@ class Tls():
+         self.make_keys()
+ 
+         rsp=self.usb.cmd(
+-            unhexlify('44000000') +     
++            unhexlify('44000000') +
+             self.make_handshake(
+-                    self.make_certs() + 
+-                    self.make_client_kex() + 
++                    self.make_certs() +
++                    self.make_client_kex() +
+                     self.make_cert_verify()) +
+             self.make_change_cipher_spec() +
+             self.make_handshake(self.make_finish()))
+@@ -160,7 +164,7 @@ class Tls():
+ 
+     def save(self):
+         with open('tls.dict', 'wb') as f:
+-            pickle.dump({ 
++            pickle.dump({
+                 'sign_key': self.sign_key,
+                 'validation_key': self.validation_key,
+                 'encryption_key': self.encryption_key,
+@@ -205,7 +209,7 @@ class Tls():
+ 
+         self.trace('<tls< %02x: %s' % (t, hexlify(b).decode()))
+         return b
+-        
++
+     def sign(self, t, b):
+         self.trace('>tls> %02x: %s' % (t, hexlify(b).decode()))
+ 
+@@ -341,7 +345,7 @@ class Tls():
+             elif t == 0x14:
+                 if pkt != unhexlify('01'):
+                     raise Exception('Unexpected ChangeCipherSpec payload')
+-                
++
+                 self.secure_rx = True
+ 
+             elif t == 0x17:
+@@ -477,14 +481,14 @@ class Tls():
+         # The following pub key is hardcoded for each fw revision in the synaWudfBioUsb.dll.
+         # Corresponding private key should only be known to a genuine Synaptic device.
+         fwpub=Point(
+-            0xf727653b4e16ce0665a6894d7f3a30d7d0a0be310d1292a743671fdf69f6a8d3, 
++            0xf727653b4e16ce0665a6894d7f3a30d7d0a0be310d1292a743671fdf69f6a8d3,
+             0xa85538f8b6bec50d6eef8bd5f4d07a886243c58b2393948df761a84721a6ca94, P256)
+ 
+         signature=DEREncoder().decode_signature(signature)
+ 
+         if not verify(signature, key, fwpub):
+             raise Exception('Untrusted device')
+-        
++
+ 
+     def handle_priv(self, body):
+         self.priv_blob = body
+@@ -496,7 +500,7 @@ class Tls():
+         sig=hmac.new(self.psk_validation_key, c, sha256).digest()
+         if hs != sig:
+             raise Exception('Signature verification failed. This device was probably paired with another computer.')
+-        
++
+         iv, c = c[:AES.block_size], c[AES.block_size:]
+         aes=AES.new(self.psk_encryption_key, AES.MODE_CBC, iv)
+         m=aes.decrypt(c)
+-- 
+2.27.0
+
diff --git a/PKGBUILD b/PKGBUILD
new file mode 100644
index 000000000000..0f08fcf0ebdd
--- /dev/null
+++ b/PKGBUILD
@@ -0,0 +1,48 @@
+# Maintainer: Davide Depau <davide@depau.eu>
+
+_pkgname='validity-sensors-tools'
+pkgname="${_pkgname}-git"
+pkgver=0.5.r25.gaf54569
+pkgrel=1
+pkgdesc='Linux tool to flash and pair Validity fingerprint sensors 009x'
+arch=('x86_64')
+url='https://github.com/3v1n0/python-validity'
+license=('unknown')
+depends=(
+  'python-pycrypto'
+  'python-pyusb'
+  'python-fastecdsa=1.7.4'
+  'innoextract'
+  'libusb'
+  'usbutils'
+)
+makedepends=('python-setuptools')
+provides=("$_pkgname" "python-proto9x" "python-proto9x-git")
+# TODO: change to 3v1n0's repo once he merges the setuptools changes
+source=(
+  "$_pkgname::git+https://github.com/Depau/python-validity.git"
+  "0001-Monkey-patch-time-to-fix-bug-in-pycrypto.patch"
+)
+sha256sums=('SKIP'
+            '9987b7765ff2921250de1c378b5cb8ac6f05d9f133211f0add358dffda6e33c1')
+
+pkgver() {
+  cd "$_pkgname"
+  git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+}
+
+prepare() {
+  cd "$_pkgname"
+  git am < ../0001-Monkey-patch-time-to-fix-bug-in-pycrypto.patch
+}
+
+build() {
+	cd "$_pkgname"
+	python setup.py build
+}
+
+package() {
+	cd "$_pkgname"
+	python setup.py install --root="$pkgdir/" --optimize=1 --skip-build
+}
+