Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
session: Add certificate store
[vpp.git]
/
src
/
plugins
/
tlsmbedtls
/
tls_mbedtls.c
diff --git
a/src/plugins/tlsmbedtls/tls_mbedtls.c
b/src/plugins/tlsmbedtls/tls_mbedtls.c
index
7311232
..
7a2abaf
100644
(file)
--- a/
src/plugins/tlsmbedtls/tls_mbedtls.c
+++ b/
src/plugins/tlsmbedtls/tls_mbedtls.c
@@
-276,8
+276,7
@@
mbedtls_ctx_init_server (tls_ctx_t * ctx)
{
mbedtls_ctx_t *mc = (mbedtls_ctx_t *) ctx;
mbedtls_main_t *mm = &mbedtls_main;
{
mbedtls_ctx_t *mc = (mbedtls_ctx_t *) ctx;
mbedtls_main_t *mm = &mbedtls_main;
- app_worker_t *app_wrk;
- application_t *app;
+ app_cert_key_pair_t *ckpair;
void *ctx_ptr;
int rv;
void *ctx_ptr;
int rv;
@@
-289,12
+288,11
@@
mbedtls_ctx_init_server (tls_ctx_t * ctx)
/*
* 1. Cert
*/
/*
* 1. Cert
*/
-
app_wrk = app_worker_get (ctx->parent_app_wrk
_index);
- if (!
app_wrk
)
+
ckpair = app_cert_key_pair_get_if_valid (ctx->ckpair
_index);
+ if (!
ckpair
)
return -1;
return -1;
- app = application_get (app_wrk->app_index);
- if (!app->tls_cert || !app->tls_key)
+ if (!ckpair->cert || !ckpair->key)
{
TLS_DBG (1, " failed\n ! tls cert and/or key not configured %d",
ctx->parent_app_wrk_index);
{
TLS_DBG (1, " failed\n ! tls cert and/or key not configured %d",
ctx->parent_app_wrk_index);
@@
-302,8
+300,8
@@
mbedtls_ctx_init_server (tls_ctx_t * ctx)
}
rv = mbedtls_x509_crt_parse (&mc->srvcert,
}
rv = mbedtls_x509_crt_parse (&mc->srvcert,
- (const unsigned char *)
app->tls_
cert,
- vec_len (
app->tls_
cert));
+ (const unsigned char *)
ckpair->
cert,
+ vec_len (
ckpair->
cert));
if (rv != 0)
{
TLS_DBG (1, " failed\n ! mbedtls_x509_crt_parse returned %d", rv);
if (rv != 0)
{
TLS_DBG (1, " failed\n ! mbedtls_x509_crt_parse returned %d", rv);
@@
-311,8
+309,8
@@
mbedtls_ctx_init_server (tls_ctx_t * ctx)
}
rv = mbedtls_pk_parse_key (&mc->pkey,
}
rv = mbedtls_pk_parse_key (&mc->pkey,
- (const unsigned char *)
app->tls_
key,
- vec_len (
app->tls_
key), NULL, 0);
+ (const unsigned char *)
ckpair->
key,
+ vec_len (
ckpair->
key), NULL, 0);
if (rv != 0)
{
TLS_DBG (1, " failed\n ! mbedtls_pk_parse_key returned %d", rv);
if (rv != 0)
{
TLS_DBG (1, " failed\n ! mbedtls_pk_parse_key returned %d", rv);