diff --git a/src/charon-tkm/src/tkm/tkm.c b/src/charon-tkm/src/tkm/tkm.c
index f2ffd2838..5fc554e13 100644
--- a/src/charon-tkm/src/tkm/tkm.c
+++ b/src/charon-tkm/src/tkm/tkm.c
@@ -75,7 +75,7 @@ bool tkm_init()
 		return FALSE;
 	}
 
-	const tkm_limits_t limits = {nc, dh, isa, ae};
+	const tkm_limits_t limits = {nc, dh, isa, ae, esa};
 
 	INIT(this,
 		.public = {
diff --git a/src/charon-tkm/src/tkm/tkm_id_manager.c b/src/charon-tkm/src/tkm/tkm_id_manager.c
index 6120c32a7..24513ebf1 100644
--- a/src/charon-tkm/src/tkm/tkm_id_manager.c
+++ b/src/charon-tkm/src/tkm/tkm_id_manager.c
@@ -22,12 +22,13 @@
 
 #define TKM_LIMIT 100
 
-ENUM_BEGIN(tkm_context_kind_names, TKM_CTX_NONCE, TKM_CTX_AE,
+ENUM_BEGIN(tkm_context_kind_names, TKM_CTX_NONCE, TKM_CTX_ESA,
 	"NONCE_CONTEXT",
 	"DH_CONTEXT",
 	"ISA_CONTEXT",
-	"AE_CONTEXT");
-ENUM_END(tkm_context_kind_names, TKM_CTX_AE);
+	"AE_CONTEXT",
+	"ESA_CONTEXT");
+ENUM_END(tkm_context_kind_names, TKM_CTX_ESA);
 
 typedef struct private_tkm_id_manager_t private_tkm_id_manager_t;
 
diff --git a/src/charon-tkm/src/tkm/tkm_id_manager.h b/src/charon-tkm/src/tkm/tkm_id_manager.h
index 17ca01720..716e91d79 100644
--- a/src/charon-tkm/src/tkm/tkm_id_manager.h
+++ b/src/charon-tkm/src/tkm/tkm_id_manager.h
@@ -34,6 +34,8 @@ enum tkm_context_kind_t {
 	TKM_CTX_ISA,
 	/** Authenticated Endpoint context */
 	TKM_CTX_AE,
+	/** ESP SA context */
+	TKM_CTX_ESA,
 
 	/** helper to determine the number of elements in this enum */
 	TKM_CTX_MAX,
diff --git a/src/charon-tkm/tests/id_manager_tests.c b/src/charon-tkm/tests/id_manager_tests.c
index c4d53661f..fd34bf91f 100644
--- a/src/charon-tkm/tests/id_manager_tests.c
+++ b/src/charon-tkm/tests/id_manager_tests.c
@@ -18,7 +18,7 @@
 
 #include "tkm_id_manager.h"
 
-static const tkm_limits_t limits = {125, 100, 30, 200};
+static const tkm_limits_t limits = {125, 100, 30, 200, 42};
 
 START_TEST(test_id_mgr_creation)
 {