Skip to content

Commit b23dc4d

Browse files
committed
Avoid symbol collision with aklomp/base64
In static builds, symbol collisions are possible since the functions are named the same.
1 parent 91fa41a commit b23dc4d

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

libjwt/base64.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ static const unsigned char base64de[] = {
7070
};
7171

7272
unsigned int
73-
base64_encode(const unsigned char *in, unsigned int inlen, char *out)
73+
jwt_base64_encode(const unsigned char *in, unsigned int inlen, char *out)
7474
{
7575
int s;
7676
unsigned int i;
@@ -119,7 +119,7 @@ base64_encode(const unsigned char *in, unsigned int inlen, char *out)
119119
}
120120

121121
unsigned int
122-
base64_decode(const char *in, unsigned int inlen, unsigned char *out)
122+
jwt_base64_decode(const char *in, unsigned int inlen, unsigned char *out)
123123
{
124124
unsigned int i;
125125
unsigned int j;

libjwt/base64.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@
1212
* return values is out length, exclusive terminating `\0'
1313
*/
1414
JWT_NO_EXPORT
15-
extern unsigned int base64_encode(const unsigned char *in, unsigned int inlen,
16-
char *out);
15+
extern unsigned int jwt_base64_encode(const unsigned char *in,
16+
unsigned int inlen, char *out);
1717

1818
/*
1919
* return values is out length
2020
*/
2121
JWT_NO_EXPORT
22-
extern unsigned int base64_decode(const char *in, unsigned int inlen,
22+
extern unsigned int jwt_base64_decode(const char *in, unsigned int inlen,
2323
unsigned char *out);
2424

2525
#endif /* BASE64_H */

libjwt/jwt.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ void *jwt_base64uri_decode(const char *src, int *ret_len)
205205
// LCOV_EXCL_STOP
206206
}
207207

208-
*ret_len = base64_decode(new, len, buf);
208+
*ret_len = jwt_base64_decode(new, len, buf);
209209
jwt_freemem(new);
210210

211211
if (*ret_len <= 0)
@@ -226,7 +226,7 @@ int jwt_base64uri_encode(char **_dst, const char *plain, int plain_len)
226226
*_dst = dst;
227227

228228
/* First, a normal base64 encoding */
229-
len = base64_encode((const unsigned char *)plain, plain_len, dst);
229+
len = jwt_base64_encode((const unsigned char *)plain, plain_len, dst);
230230

231231
/* Now for the URI encoding */
232232
for (i = 0; i < len; i++) {

0 commit comments

Comments
 (0)