diff options
author | Denys Vlasenko | 2011-09-11 21:04:02 +0200 |
---|---|---|
committer | Denys Vlasenko | 2011-09-11 21:04:02 +0200 |
commit | dd1061b6a79b0161597799e825bfefc27993ace5 (patch) | |
tree | f7099078291da669907c5e3f428c10af27a54417 /include | |
parent | 5126cf9a15f9e5c3986be0fc2743b63adcc6b1fb (diff) | |
download | busybox-dd1061b6a79b0161597799e825bfefc27993ace5.zip busybox-dd1061b6a79b0161597799e825bfefc27993ace5.tar.gz |
wget: URL-decode user:password before base64-encoding it into auth hdr. Closes 3625.
function old new delta
percent_decode_in_place - 152 +152
parse_url 304 317 +13
handle_incoming_and_exit 2795 2798 +3
httpd_main 763 760 -3
decodeString 152 - -152
------------------------------------------------------------------------------
(add/remove: 2/1 grow/shrink: 2/1 up/down: 168/-155) Total: 13 bytes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/libbb.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/include/libbb.h b/include/libbb.h index d0c7ace..21cbe1c 100644 --- a/include/libbb.h +++ b/include/libbb.h @@ -1578,6 +1578,15 @@ int starts_with_cpu(const char *str) FAST_FUNC; unsigned get_cpu_count(void) FAST_FUNC; +/* Use strict=1 if you process input from untrusted source: + * it will return NULL on invalid %xx (bad hex chars) + * and str + 1 if decoded char is / or NUL. + * In non-strict mode, it always succeeds (returns str), + * and also it additionally decoded '+' to space. + */ +char *percent_decode_in_place(char *str, int strict) FAST_FUNC; + + extern const char bb_uuenc_tbl_base64[]; extern const char bb_uuenc_tbl_std[]; void bb_uuencode(char *store, const void *s, int length, const char *tbl) FAST_FUNC; |