diff options
| -rw-r--r-- | test/tpm_test/Makefile | 6 | ||||
| -rw-r--r-- | test/tpm_test/ftdi_spi_tpm.i | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/test/tpm_test/Makefile b/test/tpm_test/Makefile index e45f32ce0b..d7a2174587 100644 --- a/test/tpm_test/Makefile +++ b/test/tpm_test/Makefile @@ -19,11 +19,13 @@ endif obj = ../../build/tpm_test src = . SWIG = /usr/bin/swig +PYTHON_VERSION = $(shell python3 -c 'import sys; print("%d.%d" % \ +( sys.version_info.major, sys.version_info.minor))') vpath %c $(src) ../../chip/g/dcrypto $(src)/testlib CFLAGS = -fPIC -CFLAGS += -I /usr/include/python2.7 +CFLAGS += -I /usr/include/python$(PYTHON_VERSION) CFLAGS += -I../../../../third_party/cryptoc/include CFLAGS += -I../../board/cr50 CFLAGS += -I../../chip/g @@ -68,7 +70,7 @@ $(obj)/_$(TARGET).so: $(OBJS) $(obj)/$(TARGET).py $(obj)/%_wrap.c: $(src)/%.i $(call echo," SWIG $(notdir $@)") - $(Q)swig -python -outdir $(obj) -o $@ $< + $(Q)$(SWIG) -python -outdir $(obj) -o $@ $< clean: @rm -rf $(obj)/ diff --git a/test/tpm_test/ftdi_spi_tpm.i b/test/tpm_test/ftdi_spi_tpm.i index c9cc2fc535..2bbcded64b 100644 --- a/test/tpm_test/ftdi_spi_tpm.i +++ b/test/tpm_test/ftdi_spi_tpm.i @@ -34,7 +34,7 @@ extern swig_string_data FtdiSendCommandAndWait(char *tpm_command, %typemap(out) swig_string_data { - $result = PyString_FromStringAndSize($1.data, $1.size); + $result = PyBytes_FromStringAndSize($1.data, $1.size); free($1.data); } |