sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

trunnel: Uncomment link_specifier so we can use it 

Also add a trunnel definition for link_specifier_list

Signed-off-by: John Brooks <special@torproject.org>
Signed-off-by: David Goulet <dgoulet@torproject.org>
Signed-off-by: George Kadianakis <desnacked@riseup.net>
This commit is contained in:
David Goulet 2016-03-10 17:52:36 -05:00 committed by David Goulet
parent e8c12175fe
commit 15f3563f1b
3 changed files with 1097 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

831
src/trunnel/ed25519_cert.c
View File

@ -410,6 +410,557 @@ ed25519_cert_extension_parse(ed25519_cert_extension_t **output, const uint8_t *i
}
return result;
}
link_specifier_t *
link_specifier_new(void)
{
link_specifier_t *val = trunnel_calloc(1, sizeof(link_specifier_t));
if (NULL == val)
return NULL;
return val;
}
/** Release all storage held inside 'obj', but do not free 'obj'.
*/
static void
link_specifier_clear(link_specifier_t *obj)
{
(void) obj;
TRUNNEL_DYNARRAY_WIPE(&obj->un_unrecognized);
TRUNNEL_DYNARRAY_CLEAR(&obj->un_unrecognized);
}
void
link_specifier_free(link_specifier_t *obj)
{
if (obj == NULL)
return;
link_specifier_clear(obj);
trunnel_memwipe(obj, sizeof(link_specifier_t));
trunnel_free_(obj);
}
uint8_t
link_specifier_get_ls_type(link_specifier_t *inp)
{
return inp->ls_type;
}
int
link_specifier_set_ls_type(link_specifier_t *inp, uint8_t val)
{
inp->ls_type = val;
return 0;
}
uint8_t
link_specifier_get_ls_len(link_specifier_t *inp)
{
return inp->ls_len;
}
int
link_specifier_set_ls_len(link_specifier_t *inp, uint8_t val)
{
inp->ls_len = val;
return 0;
}
uint32_t
link_specifier_get_un_ipv4_addr(link_specifier_t *inp)
{
return inp->un_ipv4_addr;
}
int
link_specifier_set_un_ipv4_addr(link_specifier_t *inp, uint32_t val)
{
inp->un_ipv4_addr = val;
return 0;
}
uint16_t
link_specifier_get_un_ipv4_port(link_specifier_t *inp)
{
return inp->un_ipv4_port;
}
int
link_specifier_set_un_ipv4_port(link_specifier_t *inp, uint16_t val)
{
inp->un_ipv4_port = val;
return 0;
}
size_t
link_specifier_getlen_un_ipv6_addr(const link_specifier_t *inp)
{
(void)inp; return 16;
}
uint8_t
link_specifier_get_un_ipv6_addr(const link_specifier_t *inp, size_t idx)
{
trunnel_assert(idx < 16);
return inp->un_ipv6_addr[idx];
}
int
link_specifier_set_un_ipv6_addr(link_specifier_t *inp, size_t idx, uint8_t elt)
{
trunnel_assert(idx < 16);
inp->un_ipv6_addr[idx] = elt;
return 0;
}
uint8_t *
link_specifier_getarray_un_ipv6_addr(link_specifier_t *inp)
{
return inp->un_ipv6_addr;
}
uint16_t
link_specifier_get_un_ipv6_port(link_specifier_t *inp)
{
return inp->un_ipv6_port;
}
int
link_specifier_set_un_ipv6_port(link_specifier_t *inp, uint16_t val)
{
inp->un_ipv6_port = val;
return 0;
}
size_t
link_specifier_getlen_un_legacy_id(const link_specifier_t *inp)
{
(void)inp; return 20;
}
uint8_t
link_specifier_get_un_legacy_id(const link_specifier_t *inp, size_t idx)
{
trunnel_assert(idx < 20);
return inp->un_legacy_id[idx];
}
int
link_specifier_set_un_legacy_id(link_specifier_t *inp, size_t idx, uint8_t elt)
{
trunnel_assert(idx < 20);
inp->un_legacy_id[idx] = elt;
return 0;
}
uint8_t *
link_specifier_getarray_un_legacy_id(link_specifier_t *inp)
{
return inp->un_legacy_id;
}
size_t
link_specifier_getlen_un_ed25519_id(const link_specifier_t *inp)
{
(void)inp; return 32;
}
uint8_t
link_specifier_get_un_ed25519_id(const link_specifier_t *inp, size_t idx)
{
trunnel_assert(idx < 32);
return inp->un_ed25519_id[idx];
}
int
link_specifier_set_un_ed25519_id(link_specifier_t *inp, size_t idx, uint8_t elt)
{
trunnel_assert(idx < 32);
inp->un_ed25519_id[idx] = elt;
return 0;
}
uint8_t *
link_specifier_getarray_un_ed25519_id(link_specifier_t *inp)
{
return inp->un_ed25519_id;
}
size_t
link_specifier_getlen_un_unrecognized(const link_specifier_t *inp)
{
return TRUNNEL_DYNARRAY_LEN(&inp->un_unrecognized);
}
uint8_t
link_specifier_get_un_unrecognized(link_specifier_t *inp, size_t idx)
{
return TRUNNEL_DYNARRAY_GET(&inp->un_unrecognized, idx);
}
int
link_specifier_set_un_unrecognized(link_specifier_t *inp, size_t idx, uint8_t elt)
{
TRUNNEL_DYNARRAY_SET(&inp->un_unrecognized, idx, elt);
return 0;
}
int
link_specifier_add_un_unrecognized(link_specifier_t *inp, uint8_t elt)
{
TRUNNEL_DYNARRAY_ADD(uint8_t, &inp->un_unrecognized, elt, {});
return 0;
trunnel_alloc_failed:
TRUNNEL_SET_ERROR_CODE(inp);
return -1;
}
uint8_t *
link_specifier_getarray_un_unrecognized(link_specifier_t *inp)
{
return inp->un_unrecognized.elts_;
}
int
link_specifier_setlen_un_unrecognized(link_specifier_t *inp, size_t newlen)
{
uint8_t *newptr;
newptr = trunnel_dynarray_setlen(&inp->un_unrecognized.allocated_,
&inp->un_unrecognized.n_, inp->un_unrecognized.elts_, newlen,
sizeof(inp->un_unrecognized.elts_[0]), (trunnel_free_fn_t) NULL,
&inp->trunnel_error_code_);
if (newptr == NULL)
goto trunnel_alloc_failed;
inp->un_unrecognized.elts_ = newptr;
return 0;
trunnel_alloc_failed:
TRUNNEL_SET_ERROR_CODE(inp);
return -1;
}
const char *
link_specifier_check(const link_specifier_t *obj)
{
if (obj == NULL)
return "Object was NULL";
if (obj->trunnel_error_code_)
return "A set function failed on this object";
switch (obj->ls_type) {
case LS_IPV4:
break;
case LS_IPV6:
break;
case LS_LEGACY_ID:
break;
case LS_ED25519_ID:
break;
default:
break;
}
return NULL;
}
ssize_t
link_specifier_encoded_len(const link_specifier_t *obj)
{
ssize_t result = 0;
if (NULL != link_specifier_check(obj))
return -1;
/* Length of u8 ls_type */
result += 1;
/* Length of u8 ls_len */
result += 1;
switch (obj->ls_type) {
case LS_IPV4:
/* Length of u32 un_ipv4_addr */
result += 4;
/* Length of u16 un_ipv4_port */
result += 2;
break;
case LS_IPV6:
/* Length of u8 un_ipv6_addr[16] */
result += 16;
/* Length of u16 un_ipv6_port */
result += 2;
break;
case LS_LEGACY_ID:
/* Length of u8 un_legacy_id[20] */
result += 20;
break;
case LS_ED25519_ID:
/* Length of u8 un_ed25519_id[32] */
result += 32;
break;
default:
/* Length of u8 un_unrecognized[] */
result += TRUNNEL_DYNARRAY_LEN(&obj->un_unrecognized);
break;
}
return result;
}
int
link_specifier_clear_errors(link_specifier_t *obj)
{
int r = obj->trunnel_error_code_;
obj->trunnel_error_code_ = 0;
return r;
}
ssize_t
link_specifier_encode(uint8_t *output, const size_t avail, const link_specifier_t *obj)
{
ssize_t result = 0;
size_t written = 0;
uint8_t *ptr = output;
const char *msg;
#ifdef TRUNNEL_CHECK_ENCODED_LEN
const ssize_t encoded_len = link_specifier_encoded_len(obj);
#endif
uint8_t *backptr_ls_len = NULL;
if (NULL != (msg = link_specifier_check(obj)))
goto check_failed;
#ifdef TRUNNEL_CHECK_ENCODED_LEN
trunnel_assert(encoded_len >= 0);
#endif
/* Encode u8 ls_type */
trunnel_assert(written <= avail);
if (avail - written < 1)
goto truncated;
trunnel_set_uint8(ptr, (obj->ls_type));
written += 1; ptr += 1;
/* Encode u8 ls_len */
backptr_ls_len = ptr;
trunnel_assert(written <= avail);
if (avail - written < 1)
goto truncated;
trunnel_set_uint8(ptr, (obj->ls_len));
written += 1; ptr += 1;
{
size_t written_before_union = written;
/* Encode union un[ls_type] */
trunnel_assert(written <= avail);
switch (obj->ls_type) {
case LS_IPV4:
/* Encode u32 un_ipv4_addr */
trunnel_assert(written <= avail);
if (avail - written < 4)
goto truncated;
trunnel_set_uint32(ptr, trunnel_htonl(obj->un_ipv4_addr));
written += 4; ptr += 4;
/* Encode u16 un_ipv4_port */
trunnel_assert(written <= avail);
if (avail - written < 2)
goto truncated;
trunnel_set_uint16(ptr, trunnel_htons(obj->un_ipv4_port));
written += 2; ptr += 2;
break;
case LS_IPV6:
/* Encode u8 un_ipv6_addr[16] */
trunnel_assert(written <= avail);
if (avail - written < 16)
goto truncated;
memcpy(ptr, obj->un_ipv6_addr, 16);
written += 16; ptr += 16;
/* Encode u16 un_ipv6_port */
trunnel_assert(written <= avail);
if (avail - written < 2)
goto truncated;
trunnel_set_uint16(ptr, trunnel_htons(obj->un_ipv6_port));
written += 2; ptr += 2;
break;
case LS_LEGACY_ID:
/* Encode u8 un_legacy_id[20] */
trunnel_assert(written <= avail);
if (avail - written < 20)
goto truncated;
memcpy(ptr, obj->un_legacy_id, 20);
written += 20; ptr += 20;
break;
case LS_ED25519_ID:
/* Encode u8 un_ed25519_id[32] */
trunnel_assert(written <= avail);
if (avail - written < 32)
goto truncated;
memcpy(ptr, obj->un_ed25519_id, 32);
written += 32; ptr += 32;
break;
default:
/* Encode u8 un_unrecognized[] */
{
size_t elt_len = TRUNNEL_DYNARRAY_LEN(&obj->un_unrecognized);
trunnel_assert(written <= avail);
if (avail - written < elt_len)
goto truncated;
if (elt_len)
memcpy(ptr, obj->un_unrecognized.elts_, elt_len);
written += elt_len; ptr += elt_len;
}
break;
}
/* Write the length field back to ls_len */
trunnel_assert(written >= written_before_union);
#if UINT8_MAX < SIZE_MAX
if (written - written_before_union > UINT8_MAX)
goto check_failed;
#endif
trunnel_set_uint8(backptr_ls_len, (written - written_before_union));
}
trunnel_assert(ptr == output + written);
#ifdef TRUNNEL_CHECK_ENCODED_LEN
{
trunnel_assert(encoded_len >= 0);
trunnel_assert((size_t)encoded_len == written);
}
#endif
return written;
truncated:
result = -2;
goto fail;
check_failed:
(void)msg;
result = -1;
goto fail;
fail:
trunnel_assert(result < 0);
return result;
}
/** As link_specifier_parse(), but do not allocate the output object.
*/
static ssize_t
link_specifier_parse_into(link_specifier_t *obj, const uint8_t *input, const size_t len_in)
{
const uint8_t *ptr = input;
size_t remaining = len_in;
ssize_t result = 0;
(void)result;
/* Parse u8 ls_type */
CHECK_REMAINING(1, truncated);
obj->ls_type = (trunnel_get_uint8(ptr));
remaining -= 1; ptr += 1;
/* Parse u8 ls_len */
CHECK_REMAINING(1, truncated);
obj->ls_len = (trunnel_get_uint8(ptr));
remaining -= 1; ptr += 1;
{
size_t remaining_after;
CHECK_REMAINING(obj->ls_len, truncated);
remaining_after = remaining - obj->ls_len;
remaining = obj->ls_len;
/* Parse union un[ls_type] */
switch (obj->ls_type) {
case LS_IPV4:
/* Parse u32 un_ipv4_addr */
CHECK_REMAINING(4, fail);
obj->un_ipv4_addr = trunnel_ntohl(trunnel_get_uint32(ptr));
remaining -= 4; ptr += 4;
/* Parse u16 un_ipv4_port */
CHECK_REMAINING(2, fail);
obj->un_ipv4_port = trunnel_ntohs(trunnel_get_uint16(ptr));
remaining -= 2; ptr += 2;
break;
case LS_IPV6:
/* Parse u8 un_ipv6_addr[16] */
CHECK_REMAINING(16, fail);
memcpy(obj->un_ipv6_addr, ptr, 16);
remaining -= 16; ptr += 16;
/* Parse u16 un_ipv6_port */
CHECK_REMAINING(2, fail);
obj->un_ipv6_port = trunnel_ntohs(trunnel_get_uint16(ptr));
remaining -= 2; ptr += 2;
break;
case LS_LEGACY_ID:
/* Parse u8 un_legacy_id[20] */
CHECK_REMAINING(20, fail);
memcpy(obj->un_legacy_id, ptr, 20);
remaining -= 20; ptr += 20;
break;
case LS_ED25519_ID:
/* Parse u8 un_ed25519_id[32] */
CHECK_REMAINING(32, fail);
memcpy(obj->un_ed25519_id, ptr, 32);
remaining -= 32; ptr += 32;
break;
default:
/* Parse u8 un_unrecognized[] */
TRUNNEL_DYNARRAY_EXPAND(uint8_t, &obj->un_unrecognized, remaining, {});
obj->un_unrecognized.n_ = remaining;
if (remaining)
memcpy(obj->un_unrecognized.elts_, ptr, remaining);
ptr += remaining; remaining -= remaining;
break;
}
if (remaining != 0)
goto fail;
remaining = remaining_after;
}
trunnel_assert(ptr + remaining == input + len_in);
return len_in - remaining;
truncated:
return -2;
trunnel_alloc_failed:
return -1;
fail:
result = -1;
return result;
}
ssize_t
link_specifier_parse(link_specifier_t **output, const uint8_t *input, const size_t len_in)
{
ssize_t result;
*output = link_specifier_new();
if (NULL == *output)
return -1;
result = link_specifier_parse_into(*output, input, len_in);
if (result < 0) {
link_specifier_free(*output);
*output = NULL;
}
return result;
}
ed25519_cert_t *
ed25519_cert_new(void)
{
@ -887,3 +1438,283 @@ ed25519_cert_parse(ed25519_cert_t **output, const uint8_t *input, const size_t l
}
return result;
}
link_specifier_list_t *
link_specifier_list_new(void)
{
link_specifier_list_t *val = trunnel_calloc(1, sizeof(link_specifier_list_t));
if (NULL == val)
return NULL;
return val;
}
/** Release all storage held inside 'obj', but do not free 'obj'.
*/
static void
link_specifier_list_clear(link_specifier_list_t *obj)
{
(void) obj;
{
unsigned idx;
for (idx = 0; idx < TRUNNEL_DYNARRAY_LEN(&obj->spec); ++idx) {
link_specifier_free(TRUNNEL_DYNARRAY_GET(&obj->spec, idx));
}
}
TRUNNEL_DYNARRAY_WIPE(&obj->spec);
TRUNNEL_DYNARRAY_CLEAR(&obj->spec);
}
void
link_specifier_list_free(link_specifier_list_t *obj)
{
if (obj == NULL)
return;
link_specifier_list_clear(obj);
trunnel_memwipe(obj, sizeof(link_specifier_list_t));
trunnel_free_(obj);
}
uint8_t
link_specifier_list_get_n_spec(link_specifier_list_t *inp)
{
return inp->n_spec;
}
int
link_specifier_list_set_n_spec(link_specifier_list_t *inp, uint8_t val)
{
inp->n_spec = val;
return 0;
}
size_t
link_specifier_list_getlen_spec(const link_specifier_list_t *inp)
{
return TRUNNEL_DYNARRAY_LEN(&inp->spec);
}
struct link_specifier_st *
link_specifier_list_get_spec(link_specifier_list_t *inp, size_t idx)
{
return TRUNNEL_DYNARRAY_GET(&inp->spec, idx);
}
int
link_specifier_list_set_spec(link_specifier_list_t *inp, size_t idx, struct link_specifier_st * elt)
{
link_specifier_t *oldval = TRUNNEL_DYNARRAY_GET(&inp->spec, idx);
if (oldval && oldval != elt)
link_specifier_free(oldval);
return link_specifier_list_set0_spec(inp, idx, elt);
}
int
link_specifier_list_set0_spec(link_specifier_list_t *inp, size_t idx, struct link_specifier_st * elt)
{
TRUNNEL_DYNARRAY_SET(&inp->spec, idx, elt);
return 0;
}
int
link_specifier_list_add_spec(link_specifier_list_t *inp, struct link_specifier_st * elt)
{
#if SIZE_MAX >= UINT8_MAX
if (inp->spec.n_ == UINT8_MAX)
goto trunnel_alloc_failed;
#endif
TRUNNEL_DYNARRAY_ADD(struct link_specifier_st *, &inp->spec, elt, {});
return 0;
trunnel_alloc_failed:
TRUNNEL_SET_ERROR_CODE(inp);
return -1;
}
struct link_specifier_st * *
link_specifier_list_getarray_spec(link_specifier_list_t *inp)
{
return inp->spec.elts_;
}
int
link_specifier_list_setlen_spec(link_specifier_list_t *inp, size_t newlen)
{
struct link_specifier_st * *newptr;
#if UINT8_MAX < SIZE_MAX
if (newlen > UINT8_MAX)
goto trunnel_alloc_failed;
#endif
newptr = trunnel_dynarray_setlen(&inp->spec.allocated_,
&inp->spec.n_, inp->spec.elts_, newlen,
sizeof(inp->spec.elts_[0]), (trunnel_free_fn_t) link_specifier_free,
&inp->trunnel_error_code_);
if (newptr == NULL)
goto trunnel_alloc_failed;
inp->spec.elts_ = newptr;
return 0;
trunnel_alloc_failed:
TRUNNEL_SET_ERROR_CODE(inp);
return -1;
}
const char *
link_specifier_list_check(const link_specifier_list_t *obj)
{
if (obj == NULL)
return "Object was NULL";
if (obj->trunnel_error_code_)
return "A set function failed on this object";
{
const char *msg;
unsigned idx;
for (idx = 0; idx < TRUNNEL_DYNARRAY_LEN(&obj->spec); ++idx) {
if (NULL != (msg = link_specifier_check(TRUNNEL_DYNARRAY_GET(&obj->spec, idx))))
return msg;
}
}
if (TRUNNEL_DYNARRAY_LEN(&obj->spec) != obj->n_spec)
return "Length mismatch for spec";
return NULL;
}
ssize_t
link_specifier_list_encoded_len(const link_specifier_list_t *obj)
{
ssize_t result = 0;
if (NULL != link_specifier_list_check(obj))
return -1;
/* Length of u8 n_spec */
result += 1;
/* Length of struct link_specifier spec[n_spec] */
{
unsigned idx;
for (idx = 0; idx < TRUNNEL_DYNARRAY_LEN(&obj->spec); ++idx) {
result += link_specifier_encoded_len(TRUNNEL_DYNARRAY_GET(&obj->spec, idx));
}
}
return result;
}
int
link_specifier_list_clear_errors(link_specifier_list_t *obj)
{
int r = obj->trunnel_error_code_;
obj->trunnel_error_code_ = 0;
return r;
}
ssize_t
link_specifier_list_encode(uint8_t *output, const size_t avail, const link_specifier_list_t *obj)
{
ssize_t result = 0;
size_t written = 0;
uint8_t *ptr = output;
const char *msg;
#ifdef TRUNNEL_CHECK_ENCODED_LEN
const ssize_t encoded_len = link_specifier_list_encoded_len(obj);
#endif
if (NULL != (msg = link_specifier_list_check(obj)))
goto check_failed;
#ifdef TRUNNEL_CHECK_ENCODED_LEN
trunnel_assert(encoded_len >= 0);
#endif
/* Encode u8 n_spec */
trunnel_assert(written <= avail);
if (avail - written < 1)
goto truncated;
trunnel_set_uint8(ptr, (obj->n_spec));
written += 1; ptr += 1;
/* Encode struct link_specifier spec[n_spec] */
{
unsigned idx;
for (idx = 0; idx < TRUNNEL_DYNARRAY_LEN(&obj->spec); ++idx) {
trunnel_assert(written <= avail);
result = link_specifier_encode(ptr, avail - written, TRUNNEL_DYNARRAY_GET(&obj->spec, idx));
if (result < 0)
goto fail; /* XXXXXXX !*/
written += result; ptr += result;
}
}
trunnel_assert(ptr == output + written);
#ifdef TRUNNEL_CHECK_ENCODED_LEN
{
trunnel_assert(encoded_len >= 0);
trunnel_assert((size_t)encoded_len == written);
}
#endif
return written;
truncated:
result = -2;
goto fail;
check_failed:
(void)msg;
result = -1;
goto fail;
fail:
trunnel_assert(result < 0);
return result;
}
/** As link_specifier_list_parse(), but do not allocate the output
* object.
*/
static ssize_t
link_specifier_list_parse_into(link_specifier_list_t *obj, const uint8_t *input, const size_t len_in)
{
const uint8_t *ptr = input;
size_t remaining = len_in;
ssize_t result = 0;
(void)result;
/* Parse u8 n_spec */
CHECK_REMAINING(1, truncated);
obj->n_spec = (trunnel_get_uint8(ptr));
remaining -= 1; ptr += 1;
/* Parse struct link_specifier spec[n_spec] */
TRUNNEL_DYNARRAY_EXPAND(link_specifier_t *, &obj->spec, obj->n_spec, {});
{
link_specifier_t * elt;
unsigned idx;
for (idx = 0; idx < obj->n_spec; ++idx) {
result = link_specifier_parse(&elt, ptr, remaining);
if (result < 0)
goto relay_fail;
trunnel_assert((size_t)result <= remaining);
remaining -= result; ptr += result;
TRUNNEL_DYNARRAY_ADD(link_specifier_t *, &obj->spec, elt, {link_specifier_free(elt);});
}
}
trunnel_assert(ptr + remaining == input + len_in);
return len_in - remaining;
truncated:
return -2;
relay_fail:
trunnel_assert(result < 0);
return result;
trunnel_alloc_failed:
return -1;
}
ssize_t
link_specifier_list_parse(link_specifier_list_t **output, const uint8_t *input, const size_t len_in)
{
ssize_t result;
*output = link_specifier_list_new();
if (NULL == *output)
return -1;
result = link_specifier_list_parse_into(*output, input, len_in);
if (result < 0) {
link_specifier_list_free(*output);
*output = NULL;
}
return result;
}

260
src/trunnel/ed25519_cert.h
View File

@ -10,6 +10,10 @@
#define CERTEXT_SIGNED_WITH_KEY 4
#define CERTEXT_FLAG_AFFECTS_VALIDATION 1
#define LS_IPV4 0
#define LS_IPV6 1
#define LS_LEGACY_ID 2
#define LS_ED25519_ID 3
#if !defined(TRUNNEL_OPAQUE) && !defined(TRUNNEL_OPAQUE_ED25519_CERT_EXTENSION)
struct ed25519_cert_extension_st {
uint16_t ext_length;
@ -21,6 +25,21 @@ struct ed25519_cert_extension_st {
};
#endif
typedef struct ed25519_cert_extension_st ed25519_cert_extension_t;
#if !defined(TRUNNEL_OPAQUE) && !defined(TRUNNEL_OPAQUE_LINK_SPECIFIER)
struct link_specifier_st {
uint8_t ls_type;
uint8_t ls_len;
uint32_t un_ipv4_addr;
uint16_t un_ipv4_port;
uint8_t un_ipv6_addr[16];
uint16_t un_ipv6_port;
uint8_t un_legacy_id[20];
uint8_t un_ed25519_id[32];
TRUNNEL_DYNARRAY_HEAD(, uint8_t) un_unrecognized;
uint8_t trunnel_error_code_;
};
#endif
typedef struct link_specifier_st link_specifier_t;
#if !defined(TRUNNEL_OPAQUE) && !defined(TRUNNEL_OPAQUE_ED25519_CERT)
struct ed25519_cert_st {
uint8_t version;
@ -35,6 +54,14 @@ struct ed25519_cert_st {
};
#endif
typedef struct ed25519_cert_st ed25519_cert_t;
#if !defined(TRUNNEL_OPAQUE) && !defined(TRUNNEL_OPAQUE_LINK_SPECIFIER_LIST)
struct link_specifier_list_st {
uint8_t n_spec;
TRUNNEL_DYNARRAY_HEAD(, struct link_specifier_st *) spec;
uint8_t trunnel_error_code_;
};
#endif
typedef struct link_specifier_list_st link_specifier_list_t;
/** Return a newly allocated ed25519_cert_extension with all elements
* set to zero.
*/
@ -141,6 +168,164 @@ uint8_t * ed25519_cert_extension_getarray_un_unparsed(ed25519_cert_extension_t *
* success; return -1 and set the error code on 'inp' on failure.
*/
int ed25519_cert_extension_setlen_un_unparsed(ed25519_cert_extension_t *inp, size_t newlen);
/** Return a newly allocated link_specifier with all elements set to
* zero.
*/
link_specifier_t *link_specifier_new(void);
/** Release all storage held by the link_specifier in 'victim'. (Do
* nothing if 'victim' is NULL.)
*/
void link_specifier_free(link_specifier_t *victim);
/** Try to parse a link_specifier from the buffer in 'input', using up
* to 'len_in' bytes from the input buffer. On success, return the
* number of bytes consumed and set *output to the newly allocated
* link_specifier_t. On failure, return -2 if the input appears
* truncated, and -1 if the input is otherwise invalid.
*/
ssize_t link_specifier_parse(link_specifier_t **output, const uint8_t *input, const size_t len_in);
/** Return the number of bytes we expect to need to encode the
* link_specifier in 'obj'. On failure, return a negative value. Note
* that this value may be an overestimate, and can even be an
* underestimate for certain unencodeable objects.
*/
ssize_t link_specifier_encoded_len(const link_specifier_t *obj);
/** Try to encode the link_specifier from 'input' into the buffer at
* 'output', using up to 'avail' bytes of the output buffer. On
* success, return the number of bytes used. On failure, return -2 if
* the buffer was not long enough, and -1 if the input was invalid.
*/
ssize_t link_specifier_encode(uint8_t *output, size_t avail, const link_specifier_t *input);
/** Check whether the internal state of the link_specifier in 'obj' is
* consistent. Return NULL if it is, and a short message if it is not.
*/
const char *link_specifier_check(const link_specifier_t *obj);
/** Clear any errors that were set on the object 'obj' by its setter
* functions. Return true iff errors were cleared.
*/
int link_specifier_clear_errors(link_specifier_t *obj);
/** Return the value of the ls_type field of the link_specifier_t in
* 'inp'
*/
uint8_t link_specifier_get_ls_type(link_specifier_t *inp);
/** Set the value of the ls_type field of the link_specifier_t in
* 'inp' to 'val'. Return 0 on success; return -1 and set the error
* code on 'inp' on failure.
*/
int link_specifier_set_ls_type(link_specifier_t *inp, uint8_t val);
/** Return the value of the ls_len field of the link_specifier_t in
* 'inp'
*/
uint8_t link_specifier_get_ls_len(link_specifier_t *inp);
/** Set the value of the ls_len field of the link_specifier_t in 'inp'
* to 'val'. Return 0 on success; return -1 and set the error code on
* 'inp' on failure.
*/
int link_specifier_set_ls_len(link_specifier_t *inp, uint8_t val);
/** Return the value of the un_ipv4_addr field of the link_specifier_t
* in 'inp'
*/
uint32_t link_specifier_get_un_ipv4_addr(link_specifier_t *inp);
/** Set the value of the un_ipv4_addr field of the link_specifier_t in
* 'inp' to 'val'. Return 0 on success; return -1 and set the error
* code on 'inp' on failure.
*/
int link_specifier_set_un_ipv4_addr(link_specifier_t *inp, uint32_t val);
/** Return the value of the un_ipv4_port field of the link_specifier_t
* in 'inp'
*/
uint16_t link_specifier_get_un_ipv4_port(link_specifier_t *inp);
/** Set the value of the un_ipv4_port field of the link_specifier_t in
* 'inp' to 'val'. Return 0 on success; return -1 and set the error
* code on 'inp' on failure.
*/
int link_specifier_set_un_ipv4_port(link_specifier_t *inp, uint16_t val);
/** Return the (constant) length of the array holding the un_ipv6_addr
* field of the link_specifier_t in 'inp'.
*/
size_t link_specifier_getlen_un_ipv6_addr(const link_specifier_t *inp);
/** Return the element at position 'idx' of the fixed array field
* un_ipv6_addr of the link_specifier_t in 'inp'.
*/
uint8_t link_specifier_get_un_ipv6_addr(const link_specifier_t *inp, size_t idx);
/** Change the element at position 'idx' of the fixed array field
* un_ipv6_addr of the link_specifier_t in 'inp', so that it will hold
* the value 'elt'.
*/
int link_specifier_set_un_ipv6_addr(link_specifier_t *inp, size_t idx, uint8_t elt);
/** Return a pointer to the 16-element array field un_ipv6_addr of
* 'inp'.
*/
uint8_t * link_specifier_getarray_un_ipv6_addr(link_specifier_t *inp);
/** Return the value of the un_ipv6_port field of the link_specifier_t
* in 'inp'
*/
uint16_t link_specifier_get_un_ipv6_port(link_specifier_t *inp);
/** Set the value of the un_ipv6_port field of the link_specifier_t in
* 'inp' to 'val'. Return 0 on success; return -1 and set the error
* code on 'inp' on failure.
*/
int link_specifier_set_un_ipv6_port(link_specifier_t *inp, uint16_t val);
/** Return the (constant) length of the array holding the un_legacy_id
* field of the link_specifier_t in 'inp'.
*/
size_t link_specifier_getlen_un_legacy_id(const link_specifier_t *inp);
/** Return the element at position 'idx' of the fixed array field
* un_legacy_id of the link_specifier_t in 'inp'.
*/
uint8_t link_specifier_get_un_legacy_id(const link_specifier_t *inp, size_t idx);
/** Change the element at position 'idx' of the fixed array field
* un_legacy_id of the link_specifier_t in 'inp', so that it will hold
* the value 'elt'.
*/
int link_specifier_set_un_legacy_id(link_specifier_t *inp, size_t idx, uint8_t elt);
/** Return a pointer to the 20-element array field un_legacy_id of
* 'inp'.
*/
uint8_t * link_specifier_getarray_un_legacy_id(link_specifier_t *inp);
/** Return the (constant) length of the array holding the
* un_ed25519_id field of the link_specifier_t in 'inp'.
*/
size_t link_specifier_getlen_un_ed25519_id(const link_specifier_t *inp);
/** Return the element at position 'idx' of the fixed array field
* un_ed25519_id of the link_specifier_t in 'inp'.
*/
uint8_t link_specifier_get_un_ed25519_id(const link_specifier_t *inp, size_t idx);
/** Change the element at position 'idx' of the fixed array field
* un_ed25519_id of the link_specifier_t in 'inp', so that it will
* hold the value 'elt'.
*/
int link_specifier_set_un_ed25519_id(link_specifier_t *inp, size_t idx, uint8_t elt);
/** Return a pointer to the 32-element array field un_ed25519_id of
* 'inp'.
*/
uint8_t * link_specifier_getarray_un_ed25519_id(link_specifier_t *inp);
/** Return the length of the dynamic array holding the un_unrecognized
* field of the link_specifier_t in 'inp'.
*/
size_t link_specifier_getlen_un_unrecognized(const link_specifier_t *inp);
/** Return the element at position 'idx' of the dynamic array field
* un_unrecognized of the link_specifier_t in 'inp'.
*/
uint8_t link_specifier_get_un_unrecognized(link_specifier_t *inp, size_t idx);
/** Change the element at position 'idx' of the dynamic array field
* un_unrecognized of the link_specifier_t in 'inp', so that it will
* hold the value 'elt'.
*/
int link_specifier_set_un_unrecognized(link_specifier_t *inp, size_t idx, uint8_t elt);
/** Append a new element 'elt' to the dynamic array field
* un_unrecognized of the link_specifier_t in 'inp'.
*/
int link_specifier_add_un_unrecognized(link_specifier_t *inp, uint8_t elt);
/** Return a pointer to the variable-length array field
* un_unrecognized of 'inp'.
*/
uint8_t * link_specifier_getarray_un_unrecognized(link_specifier_t *inp);
/** Change the length of the variable-length array field
* un_unrecognized of 'inp' to 'newlen'.Fill extra elements with 0.
* Return 0 on success; return -1 and set the error code on 'inp' on
* failure.
*/
int link_specifier_setlen_un_unrecognized(link_specifier_t *inp, size_t newlen);
/** Return a newly allocated ed25519_cert with all elements set to
* zero.
*/
@ -283,6 +468,81 @@ int ed25519_cert_set_signature(ed25519_cert_t *inp, size_t idx, uint8_t elt);
/** Return a pointer to the 64-element array field signature of 'inp'.
*/
uint8_t * ed25519_cert_getarray_signature(ed25519_cert_t *inp);
/** Return a newly allocated link_specifier_list with all elements set
* to zero.
*/
link_specifier_list_t *link_specifier_list_new(void);
/** Release all storage held by the link_specifier_list in 'victim'.
* (Do nothing if 'victim' is NULL.)
*/
void link_specifier_list_free(link_specifier_list_t *victim);
/** Try to parse a link_specifier_list from the buffer in 'input',
* using up to 'len_in' bytes from the input buffer. On success,
* return the number of bytes consumed and set *output to the newly
* allocated link_specifier_list_t. On failure, return -2 if the input
* appears truncated, and -1 if the input is otherwise invalid.
*/
ssize_t link_specifier_list_parse(link_specifier_list_t **output, const uint8_t *input, const size_t len_in);
/** Return the number of bytes we expect to need to encode the
* link_specifier_list in 'obj'. On failure, return a negative value.
* Note that this value may be an overestimate, and can even be an
* underestimate for certain unencodeable objects.
*/
ssize_t link_specifier_list_encoded_len(const link_specifier_list_t *obj);
/** Try to encode the link_specifier_list from 'input' into the buffer
* at 'output', using up to 'avail' bytes of the output buffer. On
* success, return the number of bytes used. On failure, return -2 if
* the buffer was not long enough, and -1 if the input was invalid.
*/
ssize_t link_specifier_list_encode(uint8_t *output, size_t avail, const link_specifier_list_t *input);
/** Check whether the internal state of the link_specifier_list in
* 'obj' is consistent. Return NULL if it is, and a short message if
* it is not.
*/
const char *link_specifier_list_check(const link_specifier_list_t *obj);
/** Clear any errors that were set on the object 'obj' by its setter
* functions. Return true iff errors were cleared.
*/
int link_specifier_list_clear_errors(link_specifier_list_t *obj);
/** Return the value of the n_spec field of the link_specifier_list_t
* in 'inp'
*/
uint8_t link_specifier_list_get_n_spec(link_specifier_list_t *inp);
/** Set the value of the n_spec field of the link_specifier_list_t in
* 'inp' to 'val'. Return 0 on success; return -1 and set the error
* code on 'inp' on failure.
*/
int link_specifier_list_set_n_spec(link_specifier_list_t *inp, uint8_t val);
/** Return the length of the dynamic array holding the spec field of
* the link_specifier_list_t in 'inp'.
*/
size_t link_specifier_list_getlen_spec(const link_specifier_list_t *inp);
/** Return the element at position 'idx' of the dynamic array field
* spec of the link_specifier_list_t in 'inp'.
*/
struct link_specifier_st * link_specifier_list_get_spec(link_specifier_list_t *inp, size_t idx);
/** Change the element at position 'idx' of the dynamic array field
* spec of the link_specifier_list_t in 'inp', so that it will hold
* the value 'elt'. Free the previous value, if any.
*/
int link_specifier_list_set_spec(link_specifier_list_t *inp, size_t idx, struct link_specifier_st * elt);
/** As link_specifier_list_set_spec, but does not free the previous
* value.
*/
int link_specifier_list_set0_spec(link_specifier_list_t *inp, size_t idx, struct link_specifier_st * elt);
/** Append a new element 'elt' to the dynamic array field spec of the
* link_specifier_list_t in 'inp'.
*/
int link_specifier_list_add_spec(link_specifier_list_t *inp, struct link_specifier_st * elt);
/** Return a pointer to the variable-length array field spec of 'inp'.
*/
struct link_specifier_st * * link_specifier_list_getarray_spec(link_specifier_list_t *inp);
/** Change the length of the variable-length array field spec of 'inp'
* to 'newlen'.Fill extra elements with NULL; free removed elements.
* Return 0 on success; return -1 and set the error code on 'inp' on
* failure.
*/
int link_specifier_list_setlen_spec(link_specifier_list_t *inp, size_t newlen);
#endif

7
src/trunnel/ed25519_cert.trunnel
View File

@ -55,6 +55,7 @@ struct auth02_cell {
u8 rand[24];
u8 sig[64];
}
*/
const LS_IPV4 = 0x00;
const LS_IPV6 = 0x01;
@ -73,4 +74,8 @@ struct link_specifier {
default: u8 unrecognized[];
};
}
*/
struct link_specifier_list {
u8 n_spec;
struct link_specifier spec[n_spec];
}