Be as close as possible to base64 lib, and use new function to reduce changes.

* use new base64_encode_no_lf() function having no line returns
* fix irc_server_sasl_authenticate(): add missing free(raw_str)
#765_Add_copyright_data_for_base64_files_and_update_to_the_new_version
Loïc Gomez 7 months ago committed by Pierre-Louis Bonicoli
parent 0db4305311
commit 07084a5902
Signed by: pilou
GPG Key ID: 06914C4A5EDAA6DD
  1. 2
      .gitignore
  2. 4
      AUTHORS
  3. 3
      src/irc.c
  4. 35
      src/utils/base64.c
  5. 4
      src/utils/base64.h
  6. 4
      src/utils/includes.h
  7. 3
      src/utils/os.h
  8. 3
      src/utils/utils/common.h

2
.gitignore vendored

@ -58,6 +58,8 @@ src/lex.c
# Binaries
src/*.o
src/utils/*.o
src/utils/*/*.o
src/*.a
src/bip
src/bipmkpw

@ -10,4 +10,6 @@ Thanks to our marketting and management team:
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

@ -2174,7 +2174,8 @@ static int irc_server_sasl_authenticate(struct link_server *ircs)
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);

@ -1,32 +1,28 @@
/*
* 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;
@ -38,10 +34,10 @@ static char *base64_gen_encode(const unsigned char *src, size_t len,
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;
@ -69,8 +65,8 @@ static char *base64_gen_encode(const unsigned char *src, size_t len,
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)
@ -87,8 +83,9 @@ static char *base64_gen_encode(const unsigned char *src, size_t len,
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
@ -99,7 +96,9 @@ static char *base64_gen_encode(const unsigned char *src, size_t len,
* 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);
}

@ -1,7 +1,6 @@
/*
* 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.
@ -10,6 +9,7 @@
#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 */

@ -0,0 +1,4 @@
#include <stddef.h>
#include <stdlib.h>
#include <string.h>
#include <stdint.h>

@ -0,0 +1,3 @@
#ifndef os_malloc
#define os_malloc(s) malloc((s))
#endif

@ -0,0 +1,3 @@
#ifndef BIT
#define BIT(x) (int)(1U << (x))
#endif
Loading…
Cancel
Save