imxtools/sbtools: rework cryptography

It was a mess, a mix of crypto_* and cbc_mac calls. I made everything call crypto
functions, and also separate key setup from cryptographic operations, this will
be useful to speed up the code in the upcoming commits. Drop support for "usbotp"
key, since the crypto code for that was never mainlined and we can always get the
keys from a device as long as we have code execution (using the DCP debug registers).

Change-Id: I7aa24d12207ffb744225d1b9cc7cb1dc7281dd22

1 files changed, 8 insertions, 3 deletions

diff --git a/utils/imxtools/sbtools/Makefile b/utils/imxtools/sbtools/Makefile
index 13b0a1280f..2dad20fe0c 100644
--- a/utils/imxtools/sbtools/Makefile
+++ b/utils/imxtools/sbtools/Makefile
@@ -1,7 +1,9 @@
-DEFINES=-DCRYPTO_LIBUSB
+DEFINES=
 CC=gcc
-LD=gcc
-CFLAGS=-O3 -g -std=c99 -W -Wall `pkg-config --cflags libusb-1.0` $(DEFINES)
+CXX=g++
+LD=g++
+CFLAGS=-O3 -g -std=c99 -Wall `pkg-config --cflags libusb-1.0` $(DEFINES)
+CXXFLAGS=-O3 -g -Wall $(DEFINES)
 LDFLAGS=`pkg-config --libs libusb-1.0`
 BINS=elftosb sbtoelf sbloader rsrctool elftosb1
 
@@ -10,6 +12,9 @@ all: $(BINS)
 %.o: %.c
         $(CC) $(CFLAGS) -c -o $@ $<
 
+%.o: %.cpp
+        $(CXX) $(CXXFLAGS) -c -o $@ $<
+
 sbtoelf: sbtoelf.o crc.o crypto.o aes128.o sha1.o xorcrypt.o dbparser.o elf.o misc.o sb.o sb1.o
         $(LD) -o $@ $^ $(LDFLAGS)