X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=misc.h;h=d5999cbedee2f1d723e0fe8755cc6d638791708e;hb=15386cbe927fc85ac2fed0bb47704645c4b67dad;hp=db7f9143c58b377ffa4c44f9f647a8b3a8083097;hpb=b49a8db1b42d12a035b0d17d8c101b8556920112;p=PuTTY.git diff --git a/misc.h b/misc.h index db7f9143..d5999cbe 100644 --- a/misc.h +++ b/misc.h @@ -51,11 +51,12 @@ wchar_t *dup_mb_to_wc(int codepage, int flags, const char *string); int toint(unsigned); char *fgetline(FILE *fp); +char *chomp(char *str); int strstartswith(const char *s, const char *t); int strendswith(const char *s, const char *t); -void base64_encode_atom(unsigned char *data, int n, char *out); -int base64_decode_atom(char *atom, unsigned char *out); +void base64_encode_atom(const unsigned char *data, int n, char *out); +int base64_decode_atom(const char *atom, unsigned char *out); struct bufchain_granule; typedef struct bufchain_tag { @@ -89,6 +90,23 @@ void smemclr(void *b, size_t len); * by the 'eq' in the name. */ int smemeq(const void *av, const void *bv, size_t len); +/* Extracts an SSH-marshalled string from the start of *data. If + * successful (*datalen is not too small), advances data/datalen past + * the string and returns a pointer to the string itself and its + * length in *stringlen. Otherwise does nothing and returns NULL. + * + * Like strchr, this function can discard const from its parameter. + * Treat it as if it was a family of two functions, one returning a + * non-const string given a non-const pointer, and one taking and + * returning const. */ +void *get_ssh_string(int *datalen, const void **data, int *stringlen); +/* Extracts an SSH uint32, similarly. Returns TRUE on success, and + * leaves the extracted value in *ret. */ +int get_ssh_uint32(int *datalen, const void **data, unsigned *ret); +/* Given a not-necessarily-zero-terminated string in (length,data) + * form, check if it equals an ordinary C zero-terminated string. */ +int match_ssh_id(int stringlen, const void *string, const char *id); + /* * Debugging functions. * @@ -103,8 +121,8 @@ int smemeq(const void *av, const void *bv, size_t len); */ #ifdef DEBUG -void debug_printf(char *fmt, ...); -void debug_memdump(void *buf, int len, int L); +void debug_printf(const char *fmt, ...); +void debug_memdump(const void *buf, int len, int L); #define debug(x) (debug_printf x) #define dmemdump(buf,len) debug_memdump (buf, len, 0); #define dmemdumpl(buf,len) debug_memdump (buf, len, 1);