summaryrefslogtreecommitdiff
path: root/src/sbearssl/sbearssl_sni_policy_add_keypair_file.c
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2021-06-01 21:28:12 +0000
committerLaurent Bercot <ska-skaware@skarnet.org>2021-06-01 21:28:12 +0000
commit1191557c30af6326fc5fae7f02167375043bb293 (patch)
tree842a4f073870bec2fa64a7f951cb2f9e60183042 /src/sbearssl/sbearssl_sni_policy_add_keypair_file.c
parente36fd79f212a4fbcb69ef6fa6add4d06e52956b5 (diff)
downloads6-networking-dev.tar.xz
Add servername to storagedev
Diffstat (limited to 'src/sbearssl/sbearssl_sni_policy_add_keypair_file.c')
-rw-r--r--src/sbearssl/sbearssl_sni_policy_add_keypair_file.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/sbearssl/sbearssl_sni_policy_add_keypair_file.c b/src/sbearssl/sbearssl_sni_policy_add_keypair_file.c
index f77b1d8..2462645 100644
--- a/src/sbearssl/sbearssl_sni_policy_add_keypair_file.c
+++ b/src/sbearssl/sbearssl_sni_policy_add_keypair_file.c
@@ -16,9 +16,10 @@ int sbearssl_sni_policy_add_keypair_file (sbearssl_sni_policy_context *pol, char
size_t sabase = pol->storage.len ;
size_t gabase = genalloc_len(sbearssl_cert, &pol->certga) ;
size_t mbase = genalloc_len(sbearssl_sni_policy_node, &pol->mapga) ;
- sbearssl_sni_policy_node node = { .servername = servername, .chainindex = gabase } ;
+ sbearssl_sni_policy_node node = { .servername = sabase, .chainindex = gabase } ;
- if (!sbearssl_cert_readbigpem(certfile, &pol->certga, &pol->storage)) return 0 ; ;
+ if (!stralloc_catb(&pol->storage, servername, strlen(servername) + 1)) return 0 ;
+ if (!sbearssl_cert_readbigpem(certfile, &pol->certga, &pol->storage)) goto err0 ;
node.chainlen = genalloc_len(sbearssl_cert, &pol->certga) - node.chainindex ;
if (!sbearssl_skey_readfile(keyfile, &node.skey, &pol->storage)) goto err1 ;
if (!genalloc_catb(sbearssl_sni_policy_node, &pol->mapga, &node, 1)) goto err2 ;
@@ -33,6 +34,7 @@ int sbearssl_sni_policy_add_keypair_file (sbearssl_sni_policy_context *pol, char
err1:
if (gabase) genalloc_setlen(sbearssl_cert, &pol->certga, gabase) ;
else genalloc_free(sbearssl_sni_policy_node, &pol->mapga) ;
+ err0:
if (sabase) pol->storage.len = sabase ;
else stralloc_free(&pol->storage) ;
return 0 ;