nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 21:23:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Re-run trunnel.

Browse Source
This commit is contained in:
Nick Mathewson 2017-08-08 20:34:39 -04:00
parent 34e4122025
commit 8e84968ffb
3 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/trunnel/channelpadding_negotiation.c
View File

@ -1,4 +1,4 @@
/* channelpadding_negotiation.c -- generated by Trunnel v1.4.3. /* channelpadding_negotiation.c -- generated by Trunnel v1.5.1.
* https://gitweb.torproject.org/trunnel.git * https://gitweb.torproject.org/trunnel.git
* You probably shouldn't edit this file. * You probably shouldn't edit this file.
*/ */
@ -57,7 +57,7 @@ channelpadding_negotiate_free(channelpadding_negotiate_t *obj)
} }
uint8_t uint8_t
channelpadding_negotiate_get_version(channelpadding_negotiate_t *inp) channelpadding_negotiate_get_version(const channelpadding_negotiate_t *inp)
{ {
return inp->version; return inp->version;
} }
@ -72,7 +72,7 @@ channelpadding_negotiate_set_version(channelpadding_negotiate_t *inp, uint8_t va
return 0; return 0;
} }
uint8_t uint8_t
channelpadding_negotiate_get_command(channelpadding_negotiate_t *inp) channelpadding_negotiate_get_command(const channelpadding_negotiate_t *inp)
{ {
return inp->command; return inp->command;
} }
@ -87,7 +87,7 @@ channelpadding_negotiate_set_command(channelpadding_negotiate_t *inp, uint8_t va
return 0; return 0;
} }
uint16_t uint16_t
channelpadding_negotiate_get_ito_low_ms(channelpadding_negotiate_t *inp) channelpadding_negotiate_get_ito_low_ms(const channelpadding_negotiate_t *inp)
{ {
return inp->ito_low_ms; return inp->ito_low_ms;
} }
@ -98,7 +98,7 @@ channelpadding_negotiate_set_ito_low_ms(channelpadding_negotiate_t *inp, uint16_
return 0; return 0;
} }
uint16_t uint16_t
channelpadding_negotiate_get_ito_high_ms(channelpadding_negotiate_t *inp) channelpadding_negotiate_get_ito_high_ms(const channelpadding_negotiate_t *inp)
{ {
return inp->ito_high_ms; return inp->ito_high_ms;
} }

10
src/trunnel/channelpadding_negotiation.h
View File

@ -1,4 +1,4 @@
/* channelpadding_negotiation.h -- generated by by Trunnel v1.4.3. /* channelpadding_negotiation.h -- generated by by Trunnel v1.5.1.
* https://gitweb.torproject.org/trunnel.git * https://gitweb.torproject.org/trunnel.git
* You probably shouldn't edit this file. * You probably shouldn't edit this file.
*/ */
@ -60,7 +60,7 @@ int channelpadding_negotiate_clear_errors(channelpadding_negotiate_t *obj);
/** Return the value of the version field of the /** Return the value of the version field of the
* channelpadding_negotiate_t in 'inp' * channelpadding_negotiate_t in 'inp'
*/ */
uint8_t channelpadding_negotiate_get_version(channelpadding_negotiate_t *inp); uint8_t channelpadding_negotiate_get_version(const channelpadding_negotiate_t *inp);
/** Set the value of the version field of the /** Set the value of the version field of the
* channelpadding_negotiate_t in 'inp' to 'val'. Return 0 on success; * channelpadding_negotiate_t in 'inp' to 'val'. Return 0 on success;
* return -1 and set the error code on 'inp' on failure. * return -1 and set the error code on 'inp' on failure.
@ -69,7 +69,7 @@ int channelpadding_negotiate_set_version(channelpadding_negotiate_t *inp, uint8_
/** Return the value of the command field of the /** Return the value of the command field of the
* channelpadding_negotiate_t in 'inp' * channelpadding_negotiate_t in 'inp'
*/ */
uint8_t channelpadding_negotiate_get_command(channelpadding_negotiate_t *inp); uint8_t channelpadding_negotiate_get_command(const channelpadding_negotiate_t *inp);
/** Set the value of the command field of the /** Set the value of the command field of the
* channelpadding_negotiate_t in 'inp' to 'val'. Return 0 on success; * channelpadding_negotiate_t in 'inp' to 'val'. Return 0 on success;
* return -1 and set the error code on 'inp' on failure. * return -1 and set the error code on 'inp' on failure.
@ -78,7 +78,7 @@ int channelpadding_negotiate_set_command(channelpadding_negotiate_t *inp, uint8_
/** Return the value of the ito_low_ms field of the /** Return the value of the ito_low_ms field of the
* channelpadding_negotiate_t in 'inp' * channelpadding_negotiate_t in 'inp'
*/ */
uint16_t channelpadding_negotiate_get_ito_low_ms(channelpadding_negotiate_t *inp); uint16_t channelpadding_negotiate_get_ito_low_ms(const channelpadding_negotiate_t *inp);
/** Set the value of the ito_low_ms field of the /** Set the value of the ito_low_ms field of the
* channelpadding_negotiate_t in 'inp' to 'val'. Return 0 on success; * channelpadding_negotiate_t in 'inp' to 'val'. Return 0 on success;
* return -1 and set the error code on 'inp' on failure. * return -1 and set the error code on 'inp' on failure.
@ -87,7 +87,7 @@ int channelpadding_negotiate_set_ito_low_ms(channelpadding_negotiate_t *inp, uin
/** Return the value of the ito_high_ms field of the /** Return the value of the ito_high_ms field of the
* channelpadding_negotiate_t in 'inp' * channelpadding_negotiate_t in 'inp'
*/ */
uint16_t channelpadding_negotiate_get_ito_high_ms(channelpadding_negotiate_t *inp); uint16_t channelpadding_negotiate_get_ito_high_ms(const channelpadding_negotiate_t *inp);
/** Set the value of the ito_high_ms field of the /** Set the value of the ito_high_ms field of the
* channelpadding_negotiate_t in 'inp' to 'val'. Return 0 on success; * channelpadding_negotiate_t in 'inp' to 'val'. Return 0 on success;
* return -1 and set the error code on 'inp' on failure. * return -1 and set the error code on 'inp' on failure.

4
src/trunnel/ed25519_cert.h
View File

@ -59,10 +59,6 @@ struct link_specifier_st {
}; };
#endif #endif
typedef struct link_specifier_st link_specifier_t; typedef struct link_specifier_st link_specifier_t;
/** XXX hs_link_specifier_dup() violates the opaqueness of link_specifier_t by
* taking its sizeof(). If we ever want to turn on TRUNNEL_OPAQUE we would
* need to refactor that function to do the coyp by encoding and decoding the
* object. */
#if !defined(TRUNNEL_OPAQUE) && !defined(TRUNNEL_OPAQUE_ED25519_CERT) #if !defined(TRUNNEL_OPAQUE) && !defined(TRUNNEL_OPAQUE_ED25519_CERT)
struct ed25519_cert_st { struct ed25519_cert_st {
uint8_t version; uint8_t version;