Review #765 » 0002-Be-as-close-as-possible-to-base64-lib-and-use-new-fu.patch
| .gitignore | ||
|---|---|---|
|
# Binaries
|
||
|
src/*.o
|
||
|
src/utils/*.o
|
||
|
src/utils/*/*.o
|
||
|
src/*.a
|
||
|
src/bip
|
||
|
src/bipmkpw
|
||
| AUTHORS | ||
|---|---|---|
|
ack|, ato, blackmore, lafouine, Gaston & gromit
|
||
|
Crypto shamelessly stolen from Christophe 'sexy' Devine.
|
||
|
Credits to Jouni Malinen for base64 library (http://web.mit.edu/freebsd/head/contrib/wpa/src/utils/)
|
||
|
Credits to Jouni Malinen for base64 library:
|
||
|
Source: http://w1.fi/cgit/hostap/commit/src/utils/base64.c
|
||
| src/irc.c | ||
|---|---|---|
|
memcpy(raw_str + u_len + 1, sasl_username, u_len);
|
||
|
raw_str[u_len * 2 + 1] = '\0';
|
||
|
memcpy(raw_str + u_len * 2 + 2, sasl_password, p_len);
|
||
|
enc_str = base64_encode(raw_str, raw_len, &enc_len);
|
||
|
enc_str = base64_encode_no_lf(raw_str, raw_len, &enc_len);
|
||
|
free(raw_str);
|
||
|
mylog(LOG_DEBUG, "[%s] Base64 encoded SASL auth token (len %d): %s",
|
||
|
LINK(ircs)->name, enc_len, enc_str);
|
||
| src/utils/base64.c | ||
|---|---|---|
|
/*
|
||
|
* Base64 encoding/decoding (RFC1341)
|
||
|
* Copyright (c) 2005-2019, Jouni Malinen <j@w1.fi>
|
||
|
* Copyright (c) 2022 Loïc Gomez
|
||
|
*
|
||
|
* Source: http://w1.fi/cgit/hostap/commit/src/utils/base64.c
|
||
|
* Last synchronization date: 2022-03-18
|
||
|
* (c7e6dbdad8ee043a9d7f856502196dbeb65cb4ac hostap commit was then used)
|
||
|
*
|
||
|
* This software may be distributed under the terms of the BSD license.
|
||
|
* See README for more details.
|
||
|
*/
|
||
|
#include <stddef.h>
|
||
|
#include "includes.h"
|
||
|
#include <stdint.h>
|
||
|
#include <stdlib.h>
|
||
|
#include <string.h>
|
||
|
#include "utils/common.h"
|
||
|
#include "os.h"
|
||
|
#include "base64.h"
|
||
|
static const char base64_table[65] =
|
||
|
"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
|
||
|
#define BASE64_PAD 1
|
||
|
#define BASE64_LF 2
|
||
|
#define BASE64_PAD BIT(0)
|
||
|
#define BASE64_LF BIT(1)
|
||
|
static char *base64_gen_encode(const unsigned char *src, size_t len,
|
||
|
size_t *out_len, const char *table, int add_pad)
|
||
|
static char * base64_gen_encode(const unsigned char *src, size_t len,
|
||
|
size_t *out_len, const char *table, int add_pad)
|
||
|
{
|
||
|
char *out, *pos;
|
||
|
const unsigned char *end, *in;
|
||
| ... | ... | |
|
olen = len * 4 / 3 + 4; /* 3-byte blocks to 4-byte */
|
||
|
if (add_pad & BASE64_LF)
|
||
|
olen += olen / 72; /* line feeds */
|
||
|
olen++; /* nul termination */
|
||
|
olen++; /* nul termination */
|
||
|
if (olen < len)
|
||
|
return NULL; /* integer overflow */
|
||
|
out = malloc(olen);
|
||
|
out = os_malloc(olen);
|
||
|
if (out == NULL)
|
||
|
return NULL;
|
||
| ... | ... | |
|
if (add_pad & BASE64_PAD)
|
||
|
*pos++ = '=';
|
||
|
} else {
|
||
|
*pos++ = table[(((in[0] & 0x03) << 4) | (in[1] >> 4))
|
||
|
& 0x3f];
|
||
|
*pos++ = table[(((in[0] & 0x03) << 4) |
|
||
|
(in[1] >> 4)) & 0x3f];
|
||
|
*pos++ = table[((in[1] & 0x0f) << 2) & 0x3f];
|
||
|
}
|
||
|
if (add_pad & BASE64_PAD)
|
||
| ... | ... | |
|
return out;
|
||
|
}
|
||
|
/**
|
||
|
* base64_encode - Base64 encode without line feeds
|
||
|
* base64_encode - Base64 encode
|
||
|
* @src: Data to be encoded
|
||
|
* @len: Length of the data to be encoded
|
||
|
* @out_len: Pointer to output length variable, or %NULL if not used
|
||
| ... | ... | |
|
* nul terminated to make it easier to use as a C string. The nul terminator is
|
||
|
* not included in out_len.
|
||
|
*/
|
||
|
char *base64_encode(const void *src, size_t len, size_t *out_len)
|
||
|
char * base64_encode_no_lf(const void *src, size_t len, size_t *out_len)
|
||
|
{
|
||
|
return base64_gen_encode(src, len, out_len, base64_table, BASE64_PAD);
|
||
|
}
|
||
| src/utils/base64.h | ||
|---|---|---|
|
/*
|
||
|
* Base64 encoding/decoding (RFC1341)
|
||
|
* Copyright (c) 2005, Jouni Malinen <j@w1.fi>
|
||
|
* Copyright (c) 2022 Loïc Gomez
|
||
|
*
|
||
|
* This software may be distributed under the terms of the BSD license.
|
||
|
* See README for more details.
|
||
| ... | ... | |
|
#ifndef BASE64_H
|
||
|
#define BASE64_H
|
||
|
char *base64_encode(const void *src, size_t len, size_t *out_len);
|
||
|
char * base64_encode_no_lf(const void *src, size_t len, size_t *out_len);
|
||
|
#endif /* BASE64_H */
|
||
| src/utils/includes.h | ||
|---|---|---|
|
#include <stddef.h>
|
||
|
#include <stdlib.h>
|
||
|
#include <string.h>
|
||
|
#include <stdint.h>
|
||
| src/utils/os.h | ||
|---|---|---|
|
#ifndef os_malloc
|
||
|
#define os_malloc(s) malloc((s))
|
||
|
#endif
|
||
| src/utils/utils/common.h | ||
|---|---|---|
|
#ifndef BIT
|
||
|
#define BIT(x) (int)(1U << (x))
|
||
|
#endif
|
||