oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

rename roken base64, fixes #107

Browse Source
This commit is contained in:
Love Hörnquist Åstrand
2014-08-22 20:57:24 -07:00
parent ad9cd6a138
commit 37afa01be3
16 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/base/db.c
View File

@@ -1115,7 +1115,7 @@ heim_string_t to_base64(heim_data_t data, heim_error_t *error)
int ret;
d = heim_data_get_data(data);
ret = base64_encode(d->data, d->length, &b64);
ret = rk_base64_encode(d->data, d->length, &b64);
if (ret < 0 || b64 == NULL)
goto enomem;
s = heim_string_ref_create(b64, free);
@@ -1141,7 +1141,7 @@ heim_data_t from_base64(heim_string_t s, heim_error_t *error)
if (buf == NULL)
goto enomem;
len = base64_decode(heim_string_get_utf8(s), buf);
len = rk_base64_decode(heim_string_get_utf8(s), buf);
d = heim_data_ref_create(buf, len, free);
if (d == NULL)
goto enomem;

6
lib/base/json.c
View File

@@ -184,7 +184,7 @@ base2json(heim_object_t obj, struct twojson *j)
return EINVAL; /* JSON doesn't do binary */
data = heim_data_get_data(obj);
ret = base64_encode(data->data, data->length, &b64);
ret = rk_base64_encode(data->data, data->length, &b64);
if (ret < 0 || b64 == NULL)
return ENOMEM;
@@ -410,7 +410,7 @@ parse_string(struct parse_ctx *ctx)
ctx->error = heim_error_create_enomem();
return NULL;
}
len = base64_decode(s, buf);
len = rk_base64_decode(s, buf);
if (len == -1) {
free(buf);
return o;
@@ -541,7 +541,7 @@ parse_dict(struct parse_ctx *ctx)
ctx->error = heim_error_create_enomem();
return NULL;
}
len = base64_decode(heim_string_get_utf8(v), buf);
len = rk_base64_decode(heim_string_get_utf8(v), buf);
heim_release(v);
if (len == -1) {
free(buf);