tls: move test certificates to separate header file

[vpp.git] / src / vnet / session / application_interface.h

diff --git a/src/vnet/session/application_interface.h b/src/vnet/session/application_interface.h
index 8ecb005..d710318 100644 (file)
--- a/src/vnet/session/application_interface.h
+++ b/src/vnet/session/application_interface.h
@@ -16,10 +16,10 @@
 #define __included_uri_h__
 
 #include <svm/svm_fifo_segment.h>
-#include <vnet/session/session.h>
+#include <vnet/session/session_types.h>
 #include <vnet/session/application.h>
 #include <vnet/session/transport.h>
-#include <vnet/tls/tls.h>
+#include <vnet/tls/tls_test.h>
 
 typedef struct _vnet_app_attach_args_t
 {
@@ -56,7 +56,7 @@ typedef struct _vnet_bind_args_t
   u32 segment_name_length;
   u64 server_event_queue_address;
   u64 handle;
-} vnet_bind_args_t;
+} vnet_listen_args_t;
 
 typedef struct _vnet_unbind_args_t
 {
@@ -102,6 +102,14 @@ typedef struct _vnet_application_add_tls_key_args_t
   u8 *key;
 } vnet_app_add_tls_key_args_t;
 
+typedef enum tls_engine_type_
+{
+  TLS_ENGINE_NONE,
+  TLS_ENGINE_MBEDTLS,
+  TLS_ENGINE_OPENSSL,
+  TLS_N_ENGINES
+} tls_engine_type_t;
+
 /* Application attach options */
 typedef enum
 {
@@ -167,25 +175,20 @@ typedef enum session_fd_flag_
 #undef _
 } session_fd_flag_t;
 
-int vnet_bind_uri (vnet_bind_args_t *);
+int vnet_bind_uri (vnet_listen_args_t *);
 int vnet_unbind_uri (vnet_unbind_args_t * a);
 clib_error_t *vnet_connect_uri (vnet_connect_args_t * a);
 
 clib_error_t *vnet_application_attach (vnet_app_attach_args_t * a);
-clib_error_t *vnet_bind (vnet_bind_args_t * a);
+clib_error_t *vnet_listen (vnet_listen_args_t * a);
 clib_error_t *vnet_connect (vnet_connect_args_t * a);
-clib_error_t *vnet_unbind (vnet_unbind_args_t * a);
+clib_error_t *vnet_unlisten (vnet_unbind_args_t * a);
 int vnet_application_detach (vnet_app_detach_args_t * a);
 int vnet_disconnect_session (vnet_disconnect_args_t * a);
 
 clib_error_t *vnet_app_add_tls_cert (vnet_app_add_tls_cert_args_t * a);
 clib_error_t *vnet_app_add_tls_key (vnet_app_add_tls_key_args_t * a);
 
-extern const char test_srv_crt_rsa[];
-extern const u32 test_srv_crt_rsa_len;
-extern const char test_srv_key_rsa[];
-extern const u32 test_srv_key_rsa_len;
-
 typedef struct app_session_transport_
 {
   ip46_address_t rmt_ip;       /**< remote ip */