openssl/crypto
Dr. Matthias St. Pierre fe50e11571 trace: ensure correct grouping
It is important that output to the trace channels occurs only inside
a trace group. This precondtion is satisfied whenever the standard
TRACE macros are used. It can be violated only by a bad programming
mistake, like copying the 'trc_out' pointer and using it outside
the trace group.

This commit enforces correct pairing of the OSSL_TRACE_CTRL_BEGIN and
OSSL_TRACE_CTRL_END callbacks, and checks that OSSL_TRACE_CTRL_WRITE
callbacks only occur within such groups.

While implementing it, it turned out that the group assertion failed

  apps/openssl.c:152: OpenSSL internal error: \
                      Assertion failed: trace_data->ingroup

because the set_trace_data() function invokes some callbacks which
generate trace output, but the correct channel type was set only
after the set_trace_data() call.

To fix the failed assertions, the correct channel type is now set
inside the set_trace_data() call, instead of doing it afterwards.

Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/8463)
2019-03-15 08:48:43 +01:00
..
aes MIPS32R3 provides the EXT instruction to extract bits from 2019-02-20 23:17:16 +01:00
aria Following the license change, modify the boilerplates in crypto/ 2018-12-06 15:32:17 +01:00
asn1 Support SM2 certificate verification 2019-03-13 15:29:39 +08:00
async add an additional async notification communication method based on callback 2019-01-27 12:27:17 +00:00
bf Following the license change, modify the boilerplates in crypto/bf/ 2018-12-06 14:27:41 +01:00
bio cygwin: drop explicit O_TEXT 2019-02-18 21:09:47 +01:00
blake2 fix truncation of integers on 32bit AIX 2019-03-11 14:45:18 +01:00
bn FIPS 186-4 RSA Generation & Validation 2019-03-12 12:00:52 +00:00
buffer Following the license change, modify the boilerplates in crypto/buffer/ 2018-12-06 14:32:34 +01:00
camellia Following the license change, modify the boilerplates in crypto/camellia/ 2018-12-06 14:34:55 +01:00
cast Following the license change, modify the boilerplates in crypto/cast/ 2018-12-06 14:36:10 +01:00
chacha s390x assembly pack: import chacha from cryptogams repo 2019-03-11 21:22:28 +01:00
cmac Following the license change, modify the boilerplates in crypto/cmac/ 2018-12-06 14:39:25 +01:00
cms Change arg to cms_CompressedData_init_bio to be const 2019-03-08 16:06:26 +00:00
comp Following the license change, modify the boilerplates in crypto/comp/ 2018-12-06 14:42:18 +01:00
conf Allow the syntax of the .include directive to optionally have '=' 2019-02-11 15:24:12 +01:00
crmf 2nd chunk: CRMF code (crypto/crmf/, ) and its integration 2019-03-12 12:26:06 +00:00
ct Following the license change, modify the boilerplates in crypto/ct/ 2018-12-06 14:44:27 +01:00
des Remove unnecessary trailing whitespace 2019-02-05 16:25:11 +01:00
dh constify *_dup() and *i2d_*() and related functions as far as possible, introducing DECLARE_ASN1_DUP_FUNCTION 2019-03-06 16:10:09 +00:00
dsa constify *_dup() and *i2d_*() and related functions as far as possible, introducing DECLARE_ASN1_DUP_FUNCTION 2019-03-06 16:10:09 +00:00
dso Fix compilation with -DREF_PRINT 2019-01-13 18:30:38 +01:00
ec fix truncation of integers on 32bit AIX 2019-03-11 14:45:18 +01:00
engine Adapt ENGINE_REF_COUNT_DEBUG to the new generic trace API 2019-03-06 11:15:14 +01:00
err Support SM2 certificate verification 2019-03-13 15:29:39 +08:00
ess constify *_dup() and *i2d_*() and related functions as far as possible, introducing DECLARE_ASN1_DUP_FUNCTION 2019-03-06 16:10:09 +00:00
evp FIPS AES_GCM IV gen changes 2019-03-07 07:30:04 +10:00
gmac Following the license change, modify the boilerplates in crypto/gmac/ 2018-12-06 15:00:48 +01:00
hmac Following the license change, modify the boilerplates in crypto/hmac/ 2018-12-06 15:01:38 +01:00
idea Following the license change, modify the boilerplates in crypto/idea/ 2018-12-06 14:56:39 +01:00
include/internal Support SM2 certificate verification 2019-03-13 15:29:39 +08:00
kdf The use of the likes of UINT32_MAX requires internal/numbers.h 2019-02-28 10:31:20 +01:00
kmac Update kmac.c 2018-12-08 11:00:18 +01:00
lhash Properties for implementation selection. 2019-02-18 13:28:14 +10:00
md2 Following the license change, modify the boilerplates in crypto/mdN/ 2018-12-06 15:04:11 +01:00
md4 Following the license change, modify the boilerplates in crypto/mdN/ 2018-12-06 15:04:11 +01:00
md5 Following the license change, modify the boilerplates in crypto/mdN/ 2018-12-06 15:04:11 +01:00
mdc2 Following the license change, modify the boilerplates in crypto/mdc2/ 2018-12-06 15:04:57 +01:00
modes cfi build fixes in x86-64 ghash assembly 2019-02-21 07:39:14 +10:00
objects Support SM2 certificate verification 2019-03-13 15:29:39 +08:00
ocsp constify *_dup() and *i2d_*() and related functions as far as possible, introducing DECLARE_ASN1_DUP_FUNCTION 2019-03-06 16:10:09 +00:00
pem constify *_dup() and *i2d_*() and related functions as far as possible, introducing DECLARE_ASN1_DUP_FUNCTION 2019-03-06 16:10:09 +00:00
perlasm Check for unpaired .cfi_remember_state 2019-02-17 23:39:51 +01:00
pkcs7 constify *_dup() and *i2d_*() and related functions as far as possible, introducing DECLARE_ASN1_DUP_FUNCTION 2019-03-06 16:10:09 +00:00
pkcs12 constify *_dup() and *i2d_*() and related functions as far as possible, introducing DECLARE_ASN1_DUP_FUNCTION 2019-03-06 16:10:09 +00:00
poly1305 ARM64 assembly pack: make it Windows-friendly. 2019-02-16 17:01:15 +01:00
property Make the sparse array code use ossl_uintmax_t as its index rather than size_t. 2019-03-06 13:50:54 +10:00
rand VMS: only use the high precision on VMS v8.4 and up 2019-03-15 01:51:38 +01:00
rc2 Following the license change, modify the boilerplates in crypto/rcN/ 2018-12-06 15:14:57 +01:00
rc4 Build: correct assembler generation in crypto/rc4/build.info 2019-02-04 21:34:32 +01:00
rc5 Following the license change, modify the boilerplates in crypto/rcN/ 2018-12-06 15:14:57 +01:00
ripemd Following the license change, modify the boilerplates in crypto/ripemd/ 2018-12-06 15:15:42 +01:00
rsa added generated files 2019-03-12 12:00:52 +00:00
seed Following the license change, modify the boilerplates in crypto/seed/ 2018-12-06 15:22:15 +01:00
sha fix truncation of integers on 32bit AIX 2019-03-11 14:45:18 +01:00
siphash Following the license change, modify the boilerplates in crypto/siphash/ 2018-12-06 15:24:02 +01:00
sm2 Support SM2 certificate verification 2019-03-13 15:29:39 +08:00
sm3 Following the license change, modify the boilerplates in crypto/smN/ 2018-12-06 15:24:52 +01:00
sm4 Following the license change, modify the boilerplates in crypto/smN/ 2018-12-06 15:24:52 +01:00
srp Remove unnecessary trailing whitespace 2019-02-05 16:25:11 +01:00
stack Following the license change, modify the boilerplates in crypto/stack/ 2018-12-06 15:26:59 +01:00
store Following the license change, modify the boilerplates in crypto/store/ 2018-12-06 15:27:43 +01:00
ts constify *_dup() and *i2d_*() and related functions as far as possible, introducing DECLARE_ASN1_DUP_FUNCTION 2019-03-06 16:10:09 +00:00
txt_db Following the license change, modify the boilerplates in crypto/ 2018-12-06 15:32:17 +01:00
ui Cleanup vxworks support to be able to compile for VxWorks 7 2019-01-24 17:55:04 +01:00
whrlpool Following the license change, modify the boilerplates in crypto/whrlpool/ 2018-12-06 15:29:22 +01:00
x509 Support SM2 certificate verification 2019-03-13 15:29:39 +08:00
x509v3 constify *_dup() and *i2d_*() and related functions as far as possible, introducing DECLARE_ASN1_DUP_FUNCTION 2019-03-06 16:10:09 +00:00
alphacpuid.pl Following the license change, modify the boilerplates in crypto/ 2018-12-06 15:32:17 +01:00
arm64cpuid.pl Following the license change, modify the boilerplates in crypto/ 2018-12-06 15:32:17 +01:00
arm_arch.h Following the license change, modify the boilerplates in crypto/ 2018-12-06 15:32:17 +01:00
armcap.c crypto/armcap.c, crypto/ppccap.c: stricter use of getauxval() 2019-01-16 18:00:48 +01:00
armv4cpuid.pl ARM assembly pack: make it Windows-friendly. 2019-02-16 16:59:23 +01:00
build.info Replumbing: Add constructor of libcrypto internal method structures 2019-03-12 20:25:46 +01:00
c64xpluscpuid.pl Following the license change, modify the boilerplates in crypto/ 2018-12-06 15:32:17 +01:00
context.c Add an OpenSSL library context 2019-02-16 00:29:42 +01:00
core_fetch.c Replumbing: Add constructor of libcrypto internal method structures 2019-03-12 20:25:46 +01:00
cpt_err.c Replumbing: New public API to load or add providers 2019-03-11 20:40:13 +01:00
cryptlib.c Remove unnecessary trailing whitespace 2019-02-05 16:25:11 +01:00
ctype.c Following the license change, modify the boilerplates in crypto/ 2018-12-06 15:32:17 +01:00
cversion.c Following the license change, modify the boilerplates in crypto/ 2018-12-06 15:32:17 +01:00
dllmain.c Following the license change, modify the boilerplates in crypto/ 2018-12-06 15:32:17 +01:00
ebcdic.c Following the license change, modify the boilerplates in crypto/ 2018-12-06 15:32:17 +01:00
ex_data.c Add CRYPTO_alloc_ex_data() 2019-02-16 00:29:20 +01:00
getenv.c Following the license change, modify the boilerplates in crypto/ 2018-12-06 15:32:17 +01:00
ia64cpuid.S Following the license change, modify the boilerplates in crypto/ 2018-12-06 15:32:17 +01:00
init.c Adapt OPENSSL_INIT_DEBUG to the new generic trace API 2019-03-06 11:15:13 +01:00
LPdir_nyi.c Following the license change, modify the boilerplates in crypto/ 2018-12-06 15:32:17 +01:00
LPdir_unix.c Following the license change, modify the boilerplates in crypto/ 2018-12-06 15:32:17 +01:00
LPdir_vms.c Following the license change, modify the boilerplates in crypto/ 2018-12-06 15:32:17 +01:00
LPdir_win32.c Following the license change, modify the boilerplates in crypto/ 2018-12-06 15:32:17 +01:00
LPdir_win.c Following the license change, modify the boilerplates in crypto/ 2018-12-06 15:32:17 +01:00
LPdir_wince.c Following the license change, modify the boilerplates in crypto/ 2018-12-06 15:32:17 +01:00
mem_clr.c Following the license change, modify the boilerplates in crypto/ 2018-12-06 15:32:17 +01:00
mem_dbg.c Following the license change, modify the boilerplates in crypto/ 2018-12-06 15:32:17 +01:00
mem_sec.c Following the license change, modify the boilerplates in crypto/ 2018-12-06 15:32:17 +01:00
mem.c Following the license change, modify the boilerplates in crypto/ 2018-12-06 15:32:17 +01:00
mips_arch.h Following the license change, modify the boilerplates in crypto/ 2018-12-06 15:32:17 +01:00
o_dir.c Following the license change, modify the boilerplates in crypto/ 2018-12-06 15:32:17 +01:00
o_fips.c Following the license change, modify the boilerplates in crypto/ 2018-12-06 15:32:17 +01:00
o_fopen.c Following the license change, modify the boilerplates in crypto/ 2018-12-06 15:32:17 +01:00
o_init.c Following the license change, modify the boilerplates in crypto/ 2018-12-06 15:32:17 +01:00
o_str.c openssl_strerror_r: Fix handling of GNU strerror_r 2019-03-04 10:06:54 +00:00
o_time.c Following the license change, modify the boilerplates in crypto/ 2018-12-06 15:32:17 +01:00
params.c OSSL_PARAM helper functions. 2019-03-12 19:12:12 +01:00
pariscid.pl Following the license change, modify the boilerplates in crypto/ 2018-12-06 15:32:17 +01:00
ppc_arch.h PPC: Try out if mftb works before using it 2019-01-21 15:42:04 +01:00
ppccap.c poly1305/asm/poly1305-ppc.pl: add vector base 2^26 implementation. 2019-02-01 09:23:25 +01:00
ppccpuid.pl PPC: Try out if mftb works before using it 2019-01-21 15:42:04 +01:00
provider_core.c crypto/provider_core.c: correct definition and use of lock 2019-03-14 16:22:36 +01:00
provider.c Replumbing: New public API to load or add providers 2019-03-11 20:40:13 +01:00
README.sparse_array Add sparse array data type. 2019-02-12 21:07:29 +10:00
s390x_arch.h Following the license change, modify the boilerplates in crypto/ 2018-12-06 15:32:17 +01:00
s390xcap.c Following the license change, modify the boilerplates in crypto/ 2018-12-06 15:32:17 +01:00
s390xcpuid.pl Following the license change, modify the boilerplates in crypto/ 2018-12-06 15:32:17 +01:00
sparc_arch.h Following the license change, modify the boilerplates in crypto/ 2018-12-06 15:32:17 +01:00
sparccpuid.S Following the license change, modify the boilerplates in crypto/ 2018-12-06 15:32:17 +01:00
sparcv9cap.c Following the license change, modify the boilerplates in crypto/ 2018-12-06 15:32:17 +01:00
sparse_array.c Make the sparse array code use ossl_uintmax_t as its index rather than size_t. 2019-03-06 13:50:54 +10:00
threads_none.c Following the license change, modify the boilerplates in crypto/ 2018-12-06 15:32:17 +01:00
threads_pthread.c Following the license change, modify the boilerplates in crypto/ 2018-12-06 15:32:17 +01:00
threads_win.c Following the license change, modify the boilerplates in crypto/ 2018-12-06 15:32:17 +01:00
trace.c trace: ensure correct grouping 2019-03-15 08:48:43 +01:00
uid.c crypto/uid.c: use own macro as guard rather than AT_SECURE 2019-01-16 06:19:17 +01:00
vms_rms.h Following the license change, modify the boilerplates in crypto/ 2018-12-06 15:32:17 +01:00
x86_64cpuid.pl Following the license change, modify the boilerplates in crypto/ 2018-12-06 15:32:17 +01:00
x86cpuid.pl Following the license change, modify the boilerplates in crypto/ 2018-12-06 15:32:17 +01:00

The sparse_array.c file contains an implementation of a sparse array that
attempts to be both space and time efficient.

The sparse array is represented using a tree structure.  Each node in the
tree contains a block of pointers to either the user supplied leaf values or
to another node.

There are a number of parameters used to define the block size:

    OPENSSL_SA_BLOCK_BITS   Specifies the number of bits covered by each block
    SA_BLOCK_MAX            Specifies the number of pointers in each block
    SA_BLOCK_MASK           Specifies a bit mask to perform modulo block size
    SA_BLOCK_MAX_LEVELS     Indicates the maximum possible height of the tree

These constants are inter-related:
    SA_BLOCK_MAX        = 2 ^ OPENSSL_SA_BLOCK_BITS
    SA_BLOCK_MASK       = SA_BLOCK_MAX - 1
    SA_BLOCK_MAX_LEVELS = number of bits in size_t divided by
                          OPENSSL_SA_BLOCK_BITS rounded up to the next multiple
                          of OPENSSL_SA_BLOCK_BITS

OPENSSL_SA_BLOCK_BITS can be defined at compile time and this overrides the
built in setting.

As a space and performance optimisation, the height of the tree is usually
less than the maximum possible height.  Only sufficient height is allocated to
accommodate the largest index added to the data structure.

The largest index used to add a value to the array determines the tree height:

        +----------------------+---------------------+
        | Largest Added Index  |   Height of Tree    |
        +----------------------+---------------------+
        | SA_BLOCK_MAX     - 1 |          1          |
        | SA_BLOCK_MAX ^ 2 - 1 |          2          |
        | SA_BLOCK_MAX ^ 3 - 1 |          3          |
        | ...                  |          ...        |
        | size_t max           | SA_BLOCK_MAX_LEVELS |
        +----------------------+---------------------+

The tree height is dynamically increased as needed based on additions.

An empty tree is represented by a NULL root pointer.  Inserting a value at
index 0 results in the allocation of a top level node full of null pointers
except for the single pointer to the user's data (N = SA_BLOCK_MAX for
breviety):

        +----+
        |Root|
        |Node|
        +-+--+
          |
          |
          |
          v
        +-+-+---+---+---+---+
        | 0 | 1 | 2 |...|N-1|
        |   |nil|nil|...|nil|
        +-+-+---+---+---+---+
          |
          |
          |
          v
        +-+--+
        |User|
        |Data|
        +----+
    Index 0


Inserting at element 2N+1 creates a new root node and pushes down the old root
node.  It then creates a second second level node to hold the pointer to the
user's new data:

        +----+
        |Root|
        |Node|
        +-+--+
          |
          |
          |
          v
        +-+-+---+---+---+---+
        | 0 | 1 | 2 |...|N-1|
        |   |nil|   |...|nil|
        +-+-+---+-+-+---+---+
          |       |
          |       +------------------+
          |                          |
          v                          v
        +-+-+---+---+---+---+      +-+-+---+---+---+---+
        | 0 | 1 | 2 |...|N-1|      | 0 | 1 | 2 |...|N-1|
        |nil|   |nil|...|nil|      |nil|   |nil|...|nil|
        +-+-+---+---+---+---+      +---+-+-+---+---+---+
          |                              |
          |                              |
          |                              |
          v                              v
        +-+--+                         +-+--+
        |User|                         |User|
        |Data|                         |Data|
        +----+                         +----+
    Index 0                       Index 2N+1


The nodes themselves are allocated in a sparse manner.  Only nodes which exist
along a path from the root of the tree to an added leaf will be allocated.
The complexity is hidden and nodes are allocated on an as needed basis.
Because the data is expected to be sparse this doesn't result in a large waste
of space.

Values can be removed from the sparse array by setting their index position to
NULL.  The data structure does not attempt to reclaim nodes or reduce the
height of the tree on removal.  For example, now setting index 0 to NULL would
result in:

        +----+
        |Root|
        |Node|
        +-+--+
          |
          |
          |
          v
        +-+-+---+---+---+---+
        | 0 | 1 | 2 |...|N-1|
        |   |nil|   |...|nil|
        +-+-+---+-+-+---+---+
          |       |
          |       +------------------+
          |                          |
          v                          v
        +-+-+---+---+---+---+      +-+-+---+---+---+---+
        | 0 | 1 | 2 |...|N-1|      | 0 | 1 | 2 |...|N-1|
        |nil|nil|nil|...|nil|      |nil|   |nil|...|nil|
        +---+---+---+---+---+      +---+-+-+---+---+---+
                                         |
                                         |
                                         |
                                         v
                                       +-+--+
                                       |User|
                                       |Data|
                                       +----+
                                  Index 2N+1


Accesses to elements in the sparse array take O(log n) time where n is the
largest element.  The base of the logarithm is SA_BLOCK_MAX, so for moderately
small indices (e.g. NIDs), single level (constant time) access is achievable.
Space usage is O(minimum(m, n log(n)) where m is the number of elements in the
array.

Note: sparse arrays only include pointers to types.  Thus, SPARSE_ARRAY_OF(char)
can be used to store a string.