From d832f187f756079552601867348d924582bf65de Mon Sep 17 00:00:00 2001
From: Jaeden Amero <jaeden.amero@arm.com>
Date: Tue, 26 Feb 2019 10:44:34 +0000
Subject: [PATCH] Remove pkcs11-helper option

In preparation for removing X.509 and PKCS11 from Mbed Crypto, remove
pkcs11-helper. It won't be relevant after X.509 and PKCS11 are removed.
---
 CMakeLists.txt               | 1 -
 library/CMakeLists.txt       | 4 ----
 programs/Makefile            | 1 -
 programs/test/CMakeLists.txt | 4 ----
 tests/CMakeLists.txt         | 4 ----
 tests/Makefile               | 1 -
 6 files changed, 15 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index feca4abaf..ec95d9afc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,7 +5,6 @@ else()
     project("mbed TLS" C)
 endif()
 
-option(USE_PKCS11_HELPER_LIBRARY "Build mbed TLS with the pkcs11-helper library." OFF)
 option(ENABLE_ZLIB_SUPPORT "Build mbed TLS with zlib library." OFF)
 
 option(ENABLE_PROGRAMS "Build mbed TLS programs." ON)
diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
index 903921677..9e4a90a76 100644
--- a/library/CMakeLists.txt
+++ b/library/CMakeLists.txt
@@ -123,10 +123,6 @@ if(HAIKU)
     set(libs ${libs} network)
 endif(HAIKU)
 
-if(USE_PKCS11_HELPER_LIBRARY)
-    set(libs ${libs} pkcs11-helper)
-endif(USE_PKCS11_HELPER_LIBRARY)
-
 if(ENABLE_ZLIB_SUPPORT)
     set(libs ${libs} ${ZLIB_LIBRARIES})
 endif(ENABLE_ZLIB_SUPPORT)
diff --git a/programs/Makefile b/programs/Makefile
index 4f913bb2b..407a9a2d7 100644
--- a/programs/Makefile
+++ b/programs/Makefile
@@ -1,6 +1,5 @@
 
 # To compile on SunOS: add "-lsocket -lnsl" to LDFLAGS
-# To compile with PKCS11: add "-lpkcs11-helper" to LDFLAGS
 
 CFLAGS	?= -O2
 WARNING_CFLAGS ?= -Wall -W -Wdeclaration-after-statement
diff --git a/programs/test/CMakeLists.txt b/programs/test/CMakeLists.txt
index 64ed379e7..0d2b9460a 100644
--- a/programs/test/CMakeLists.txt
+++ b/programs/test/CMakeLists.txt
@@ -2,10 +2,6 @@ set(libs
     mbedtls
 )
 
-if(USE_PKCS11_HELPER_LIBRARY)
-    set(libs ${libs} pkcs11-helper)
-endif(USE_PKCS11_HELPER_LIBRARY)
-
 if(ENABLE_ZLIB_SUPPORT)
     set(libs ${libs} ${ZLIB_LIBRARIES})
 endif(ENABLE_ZLIB_SUPPORT)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index fd029647e..1cfbd259f 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -2,10 +2,6 @@ set(libs
     mbedtls
 )
 
-if(USE_PKCS11_HELPER_LIBRARY)
-    set(libs ${libs} pkcs11-helper)
-endif(USE_PKCS11_HELPER_LIBRARY)
-
 if(ENABLE_ZLIB_SUPPORT)
     set(libs ${libs} ${ZLIB_LIBRARIES})
 endif(ENABLE_ZLIB_SUPPORT)
diff --git a/tests/Makefile b/tests/Makefile
index 8db7920d7..96c3d64bb 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -1,6 +1,5 @@
 
 # To compile on SunOS: add "-lsocket -lnsl" to LDFLAGS
-# To compile with PKCS11: add "-lpkcs11-helper" to LDFLAGS
 
 CFLAGS	?= -O2
 WARNING_CFLAGS ?= -Wall -W -Wdeclaration-after-statement -Wno-unused-function -Wno-unused-value