diff --git a/bootloader/Makefile b/bootloader/Makefile
index fd8703d..620d1bc 100644
--- a/bootloader/Makefile
+++ b/bootloader/Makefile
@@ -15,7 +15,6 @@ OBJS += $(MCU_DIR)/trezor-crypto/sha2.o
 
 CFLAGS += -DUSE_PRECOMPUTED_IV=0
 CFLAGS += -DUSE_PRECOMPUTED_CP=0
-CFLAGS += -DUSE_PUBKEY_VALIDATE=0
 
 include $(MCU_DIR)/Makefile.include
 
diff --git a/firmware/Makefile b/firmware/Makefile
index 1937387..74a6428 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -50,7 +50,6 @@ include ../Makefile.include
 CFLAGS += -Wno-sequence-point
 CFLAGS += -Iprotob -DPB_FIELD_16BIT=1
 CFLAGS += -DQR_MAX_VERSION=0
-CFLAGS += -DUSE_PUBKEY_VALIDATE=0
 CFLAGS += -DDEBUG_LINK=0
 CFLAGS += -DDEBUG_LOG=0
 CFLAGS += -DSCM_REVISION='"$(shell git rev-parse HEAD | sed 's:\(..\):\\x\1:g')"'
diff --git a/trezor-crypto b/trezor-crypto
index d814f58..cb9ccc5 160000
--- a/trezor-crypto
+++ b/trezor-crypto
@@ -1 +1 @@
-Subproject commit d814f58a3b027b154ae77bdf236a0cd08a421107
+Subproject commit cb9ccc5cf4ea3992172f31e8d1506f1a5b791157