diff options
Diffstat (limited to 'src/sbearssl/sbearssl_sni_policy_add_keypair_file.c')
| -rw-r--r-- | src/sbearssl/sbearssl_sni_policy_add_keypair_file.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/sbearssl/sbearssl_sni_policy_add_keypair_file.c b/src/sbearssl/sbearssl_sni_policy_add_keypair_file.c index e6cc974..f77b1d8 100644 --- a/src/sbearssl/sbearssl_sni_policy_add_keypair_file.c +++ b/src/sbearssl/sbearssl_sni_policy_add_keypair_file.c @@ -1,7 +1,6 @@ /* ISC license. */ #include <string.h> -#include <errno.h> #include <bearssl.h> @@ -17,10 +16,9 @@ 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 = sabase, .chainindex = gabase } ; + sbearssl_sni_policy_node node = { .servername = servername, .chainindex = gabase } ; - if (!stralloc_catb(&pol->storage, servername, strlen(servername) + 1)) return 0 ; - if (!sbearssl_cert_readbigpem(certfile, &pol->certga, &pol->storage)) goto err0 ; + if (!sbearssl_cert_readbigpem(certfile, &pol->certga, &pol->storage)) return 0 ; ; 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 ; @@ -31,12 +29,11 @@ int sbearssl_sni_policy_add_keypair_file (sbearssl_sni_policy_context *pol, char if (mbase) genalloc_setlen(sbearssl_sni_policy_node, &pol->mapga, mbase) ; else genalloc_free(sbearssl_sni_policy_node, &pol->mapga) ; err2: - sbearssl_skey_wipe(&pol->skey, pol->storage.s) ; + sbearssl_skey_wipe(&node.skey, pol->storage.s) ; 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) ; + else stralloc_free(&pol->storage) ; return 0 ; } |