diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-04-23 09:09:33 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-04-23 09:09:33 -0400 |
| commit | 3acee6142221839137607c9a9cbf8ca4feea5993 (patch) | |
| tree | dad6e7660b7b34358221d25a93dc8c2770441fed /src/common/crypto.h | |
| parent | 8a951ed15816b028baf30a0606b9a15a39a36601 (diff) | |
| parent | 55118d90ca927d2cdb2cbd92189113da4dcb2fe7 (diff) | |
| download | tor-3acee6142221839137607c9a9cbf8ca4feea5993.tar.gz tor-3acee6142221839137607c9a9cbf8ca4feea5993.zip | |
Merge branch 'feature15652_squashed'
Diffstat (limited to 'src/common/crypto.h')
| -rw-r--r-- | src/common/crypto.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/common/crypto.h b/src/common/crypto.h index b9c26a4551..aedc51b844 100644 --- a/src/common/crypto.h +++ b/src/common/crypto.h @@ -267,7 +267,10 @@ struct smartlist_t; void *smartlist_choose(const struct smartlist_t *sl); void smartlist_shuffle(struct smartlist_t *sl); -int base64_encode(char *dest, size_t destlen, const char *src, size_t srclen); +#define BASE64_ENCODE_MULTILINE 1 +size_t base64_encode_size(size_t srclen, int flags); +int base64_encode(char *dest, size_t destlen, const char *src, size_t srclen, + int flags); int base64_decode(char *dest, size_t destlen, const char *src, size_t srclen); /** Characters that can appear (case-insensitively) in a base32 encoding. */ #define BASE32_CHARS "abcdefghijklmnopqrstuvwxyz234567" |