From 53091e3bce487ee82e2805a0231e780551561717 Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Sun, 12 Mar 2017 19:39:01 +0000 Subject: Adapt to skalibs-2.5.0.0 --- src/sbearssl/sbearssl_pem_decode_from_buffer.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'src/sbearssl/sbearssl_pem_decode_from_buffer.c') diff --git a/src/sbearssl/sbearssl_pem_decode_from_buffer.c b/src/sbearssl/sbearssl_pem_decode_from_buffer.c index e246b87..cacabd9 100644 --- a/src/sbearssl/sbearssl_pem_decode_from_buffer.c +++ b/src/sbearssl/sbearssl_pem_decode_from_buffer.c @@ -1,10 +1,9 @@ /* ISC license. */ -#include +#include #include #include #include -#include #include #include #include @@ -26,19 +25,19 @@ int sbearssl_pem_decode_from_buffer (buffer *b, genalloc *list, stralloc *sa) br_pem_decoder_init(&ctx) ; for (;;) { - siovec_t v[2] ; + struct iovec v[2] ; ssize_t rr = buffer_fill(b) ; if (rr < 0) goto rfail ; if (!rr) break ; buffer_rpeek(b, v) ; - r = sbearssl_pem_push(&ctx, v[0].s, v[0].len, &po, list, &blah, &inobj) ; + r = sbearssl_pem_push(&ctx, v[0].iov_base, v[0].iov_len, &po, list, &blah, &inobj) ; if (r) goto fail ; - if (v[1].len) + if (v[1].iov_len) { - r = sbearssl_pem_push(&ctx, v[1].s, v[1].len, &po, list, &blah, &inobj) ; + r = sbearssl_pem_push(&ctx, v[1].iov_base, v[1].iov_len, &po, list, &blah, &inobj) ; if (r) goto fail ; } - buffer_rseek(b, v[0].len + v[1].len) ; + buffer_rseek(b, v[0].iov_len + v[1].iov_len) ; } if (!inobj) return 0 ; -- cgit v1.3.1