6937487be7
Back in 2007, commit 0c97c9d437 ("'simple' error message functions by
Loic Grenie") introduced bb_simple_perror_msg() to allow for a lower
overhead call to bb_perror_msg() when only a string was being printed
with no parameters. This saves space for some CPU architectures because
it avoids the overhead of a call to a variadic function. However there
has never been a simple version of bb_error_msg(), and since 2007 many
new calls to bb_perror_msg() have been added that only take a single
parameter and so could have been using bb_simple_perror_message().
This changeset introduces 'simple' versions of bb_info_msg(),
bb_error_msg(), bb_error_msg_and_die(), bb_herror_msg() and
bb_herror_msg_and_die(), and replaces all calls that only take a
single parameter, or use something like ("%s", arg), with calls to the
corresponding 'simple' version.
Since it is likely that single parameter calls to the variadic functions
may be accidentally reintroduced in the future a new debugging config
option WARN_SIMPLE_MSG has been introduced. This uses some macro magic
which will cause any such calls to generate a warning, but this is
turned off by default to avoid use of the unpleasant macros in normal
circumstances.
This is a large changeset due to the number of calls that have been
replaced. The only files that contain changes other than simple
substitution of function calls are libbb.h, libbb/herror_msg.c,
libbb/verror_msg.c and libbb/xfuncs_printf.c. In miscutils/devfsd.c,
networking/udhcp/common.h and util-linux/mdev.c additonal macros have
been added for logging so that single parameter and multiple parameter
logging variants exist.
The amount of space saved varies considerably by architecture, and was
found to be as follows (for 'defconfig' using GCC 7.4):
Arm: -92 bytes
MIPS: -52 bytes
PPC: -1836 bytes
x86_64: -938 bytes
Note that for the MIPS architecture only an exception had to be made
disabling the 'simple' calls for 'udhcp' (in networking/udhcp/common.h)
because it made these files larger on MIPS.
Signed-off-by: James Byrne <james.byrne@origamienergy.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
109 lines
2.9 KiB
C
109 lines
2.9 KiB
C
/*
|
|
* Copyright (C) 2017 Denys Vlasenko
|
|
*
|
|
* Licensed under GPLv2, see file LICENSE in this source tree.
|
|
*/
|
|
/* Interface glue between bbox code and minimally tweaked matrixssl
|
|
* code. All C files (matrixssl and bbox (ones which need TLS))
|
|
* include this file, and guaranteed to see a consistent API,
|
|
* defines, types, etc.
|
|
*/
|
|
#include "libbb.h"
|
|
|
|
|
|
/* Config tweaks */
|
|
#define HAVE_NATIVE_INT64
|
|
#undef USE_1024_KEY_SPEED_OPTIMIZATIONS
|
|
#undef USE_2048_KEY_SPEED_OPTIMIZATIONS
|
|
#define USE_AES
|
|
#undef USE_AES_CBC_EXTERNAL
|
|
#undef USE_AES_CCM
|
|
#undef USE_AES_GCM
|
|
#undef USE_3DES
|
|
#undef USE_ARC4
|
|
#undef USE_IDEA
|
|
#undef USE_RC2
|
|
#undef USE_SEED
|
|
/* pstm: multiprecision numbers */
|
|
#undef DISABLE_PSTM
|
|
#if defined(__GNUC__) && defined(__i386__)
|
|
/* PSTM_X86 works correctly. +25 bytes. */
|
|
# define PSTM_32BIT
|
|
# define PSTM_X86
|
|
#endif
|
|
//#if defined(__GNUC__) && defined(__x86_64__)
|
|
// /* PSTM_X86_64 works correctly, but +782 bytes. */
|
|
// /* Looks like most of the growth is because of PSTM_64BIT. */
|
|
//# define PSTM_64BIT
|
|
//# define PSTM_X86_64
|
|
//#endif
|
|
//#if SOME_COND #define PSTM_MIPS, #define PSTM_32BIT
|
|
//#if SOME_COND #define PSTM_ARM, #define PSTM_32BIT
|
|
|
|
|
|
#define PS_SUCCESS 0
|
|
#define PS_FAILURE -1
|
|
#define PS_ARG_FAIL -6 /* Failure due to bad function param */
|
|
#define PS_PLATFORM_FAIL -7 /* Failure as a result of system call error */
|
|
#define PS_MEM_FAIL -8 /* Failure to allocate requested memory */
|
|
#define PS_LIMIT_FAIL -9 /* Failure on sanity/limit tests */
|
|
|
|
#define PS_TRUE 1
|
|
#define PS_FALSE 0
|
|
|
|
#if BB_BIG_ENDIAN
|
|
# define ENDIAN_BIG 1
|
|
# undef ENDIAN_LITTLE
|
|
//#???? ENDIAN_32BITWORD
|
|
// controls only STORE32L, which we don't use
|
|
#else
|
|
# define ENDIAN_LITTLE 1
|
|
# undef ENDIAN_BIG
|
|
#endif
|
|
|
|
typedef uint64_t uint64;
|
|
typedef int64_t int64;
|
|
typedef uint32_t uint32;
|
|
typedef int32_t int32;
|
|
typedef uint16_t uint16;
|
|
typedef int16_t int16;
|
|
|
|
//typedef char psPool_t;
|
|
|
|
//#ifdef PS_PUBKEY_OPTIMIZE_FOR_SMALLER_RAM
|
|
#define PS_EXPTMOD_WINSIZE 3
|
|
//#ifdef PS_PUBKEY_OPTIMIZE_FOR_FASTER_SPEED
|
|
//#define PS_EXPTMOD_WINSIZE 5
|
|
|
|
#define PUBKEY_TYPE 0x01
|
|
#define PRIVKEY_TYPE 0x02
|
|
|
|
#define AES_BLOCK_SIZE 16
|
|
|
|
void tls_get_random(void *buf, unsigned len) FAST_FUNC;
|
|
|
|
void xorbuf(void* buf, const void* mask, unsigned count) FAST_FUNC;
|
|
|
|
#define ALIGNED_long ALIGNED(sizeof(long))
|
|
void xorbuf_aligned_AES_BLOCK_SIZE(void* buf, const void* mask) FAST_FUNC;
|
|
|
|
#define matrixCryptoGetPrngData(buf, len, userPtr) (tls_get_random(buf, len), PS_SUCCESS)
|
|
|
|
#define psFree(p, pool) free(p)
|
|
#define psTraceCrypto(msg) bb_simple_error_msg_and_die(msg)
|
|
|
|
/* Secure zerofill */
|
|
#define memset_s(A,B,C,D) memset((A),(C),(D))
|
|
/* Constant time memory comparison */
|
|
#define memcmpct(s1, s2, len) memcmp((s1), (s2), (len))
|
|
#undef min
|
|
#define min(x, y) ((x) < (y) ? (x) : (y))
|
|
|
|
|
|
#include "tls_pstm.h"
|
|
#include "tls_symmetric.h"
|
|
#include "tls_aes.h"
|
|
#include "tls_aesgcm.h"
|
|
#include "tls_rsa.h"
|
|
#include "tls_fe.h"
|