X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=src%2Fcrypt_base64.c;h=b74a29b29e8fea57a06480cd380994970ca2067b;hb=HEAD;hp=2e54c922e90674f63d633f71fcc4c93fe7762cce;hpb=20455ed400c62ab7c3f7e6e3c6422d155d98a748;p=NextIRCd.git diff --git a/src/crypt_base64.c b/src/crypt_base64.c index 2e54c92..b74a29b 100644 --- a/src/crypt_base64.c +++ b/src/crypt_base64.c @@ -37,7 +37,8 @@ char *crypt_base64_encode(const unsigned char *data, size_t input_length, size_t if (encoded_data == NULL) return NULL; - for (int i = 0, j = 0; i < input_length;) { + int i, j; + for (i = 0, j = 0; i < input_length;) { uint32_t octet_a = i < input_length ? (unsigned char)data[i++] : 0; uint32_t octet_b = i < input_length ? (unsigned char)data[i++] : 0; uint32_t octet_c = i < input_length ? (unsigned char)data[i++] : 0; @@ -50,7 +51,7 @@ char *crypt_base64_encode(const unsigned char *data, size_t input_length, size_t encoded_data[j++] = encoding_table[(triple >> 0 * 6) & 0x3F]; } - for (int i = 0; i < mod_table[input_length % 3]; i++) + for (i = 0; i < mod_table[input_length % 3]; i++) encoded_data[*output_length - 1 - i] = '='; return encoded_data; @@ -71,11 +72,12 @@ unsigned char *crypt_base64_decode(const char *data, size_t input_length, size_t if (decoded_data == NULL) return NULL; - for (int i = 0, j = 0; i < input_length;) { - uint32_t sextet_a = data[i] == '=' ? 0 & i++ : decoding_table[data[i++]]; - uint32_t sextet_b = data[i] == '=' ? 0 & i++ : decoding_table[data[i++]]; - uint32_t sextet_c = data[i] == '=' ? 0 & i++ : decoding_table[data[i++]]; - uint32_t sextet_d = data[i] == '=' ? 0 & i++ : decoding_table[data[i++]]; + int i, j; + for (i = 0, j = 0; i < input_length;) { + uint32_t sextet_a = data[i] == '=' ? 0 & i++ : decoding_table[(int)data[i++]]; + uint32_t sextet_b = data[i] == '=' ? 0 & i++ : decoding_table[(int)data[i++]]; + uint32_t sextet_c = data[i] == '=' ? 0 & i++ : decoding_table[(int)data[i++]]; + uint32_t sextet_d = data[i] == '=' ? 0 & i++ : decoding_table[(int)data[i++]]; uint32_t triple = (sextet_a << 3 * 6) + (sextet_b << 2 * 6) @@ -93,7 +95,8 @@ unsigned char *crypt_base64_decode(const char *data, size_t input_length, size_t void crypt_base64_init() { decoding_table = malloc(256); - for (int i = 0; i < 64; i++) + int i; + for (i = 0; i < 64; i++) decoding_table[(unsigned char) encoding_table[i]] = i; }