openssl/crypto
Matt Caswell 76ca35e724 Fix no-dh
The recent move of the DH code into the default provider broke no-dh. This
adds back in various missing guards.

Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9399)
2019-07-19 17:33:35 +01:00
..
aes Fix Typos 2019-07-02 14:22:29 +02:00
aria Remove tab characters from C source files. 2019-07-16 20:24:10 +10:00
asn1 Deprecated {OPENSSL,CRYPTO}_debug_mem_{push,pop} 2019-07-17 14:48:06 +02:00
async Regenerate mkerr files 2019-07-16 05:26:28 +02:00
bf Move bf_asm_src file information to build.info files 2019-06-17 16:08:52 +02:00
bio Regenerate mkerr files 2019-07-16 05:26:28 +02:00
blake2 Change EVP_MAC method from copy to dup 2019-06-06 17:41:42 +02:00
bn Regenerate mkerr files 2019-07-16 05:26:28 +02:00
buffer Regenerate mkerr files 2019-07-16 05:26:28 +02:00
camellia Move cmll_asm_src file information to build.info files 2019-06-17 16:08:53 +02:00
cast Move cast_asm_src file information to build.info files 2019-06-17 16:08:52 +02:00
chacha Move chacha_asm_src file information to build.info files 2019-06-17 16:08:53 +02:00
cmac Change EVP_MAC method from copy to dup 2019-06-06 17:41:42 +02:00
cmp Regenerate mkerr files 2019-07-16 05:26:28 +02:00
cms Regenerate mkerr files 2019-07-16 05:26:28 +02:00
comp Regenerate mkerr files 2019-07-16 05:26:28 +02:00
conf Regenerate mkerr files 2019-07-16 05:26:28 +02:00
crmf Regenerate mkerr files 2019-07-16 05:26:28 +02:00
ct Regenerate mkerr files 2019-07-16 05:26:28 +02:00
des Remove DES_check_key global 2019-07-01 19:42:12 -04:00
dh Regenerate mkerr files 2019-07-16 05:26:28 +02:00
dsa Regenerate mkerr files 2019-07-16 05:26:28 +02:00
dso Regenerate mkerr files 2019-07-16 05:26:28 +02:00
ec Remove tab characters from C source files. 2019-07-16 20:24:10 +10:00
engine Regenerate mkerr files 2019-07-16 05:26:28 +02:00
err Parameter building utilities. 2019-07-17 16:59:09 +10:00
ess Regenerate mkerr files 2019-07-16 05:26:28 +02:00
evp Fix no-dh 2019-07-19 17:33:35 +01:00
gmac Change EVP_MAC method from copy to dup 2019-06-06 17:41:42 +02:00
hmac Make the RAND code available from inside the FIPS module 2019-06-28 10:22:21 +01:00
idea Following the license change, modify the boilerplates in crypto/idea/ 2018-12-06 14:56:39 +01:00
include/internal Fix S390X compile error due to missing defines 2019-07-18 16:07:26 +10:00
kdf Regenerate mkerr files 2019-07-16 05:26:28 +02:00
kmac Change EVP_MAC method from copy to dup 2019-06-06 17:41:42 +02:00
lhash Fix Typos 2019-07-02 14:22:29 +02: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 Move md5_asm_src file information to build.info files 2019-06-17 16:08:52 +02:00
mdc2 Following the license change, modify the boilerplates in crypto/mdc2/ 2018-12-06 15:04:57 +01:00
modes Add Common shared code needed to move aes ciphers to providers 2019-07-16 09:46:14 +10:00
objects Regenerate mkerr files 2019-07-16 05:26:28 +02:00
ocsp Regenerate mkerr files 2019-07-16 05:26:28 +02:00
pem Regenerate mkerr files 2019-07-16 05:26:28 +02:00
perlasm s390x assembly pack: update perlasm module 2019-04-25 23:07:36 +02:00
pkcs7 Regenerate mkerr files 2019-07-16 05:26:28 +02:00
pkcs12 Regenerate mkerr files 2019-07-16 05:26:28 +02:00
poly1305 Fix Typos 2019-07-02 14:22:29 +02:00
property Regenerate mkerr files 2019-07-16 05:26:28 +02:00
rand Regenerate mkerr files 2019-07-16 05:26:28 +02:00
rc2 Following the license change, modify the boilerplates in crypto/rcN/ 2018-12-06 15:14:57 +01:00
rc4 Move rc4_asm_src file information to build.info files 2019-06-17 16:08:52 +02:00
rc5 Change RC5_32_set_key to return an int type 2019-07-01 10:18:37 +01:00
ripemd Move rmd160_asm_src file information to build.info files 2019-06-17 16:08:52 +02:00
rsa Regenerate mkerr files 2019-07-16 05:26:28 +02:00
seed Following the license change, modify the boilerplates in crypto/seed/ 2018-12-06 15:22:15 +01:00
sha Fix build error for aarch64 big endian. 2019-07-08 10:53:02 +02:00
siphash Change EVP_MAC method from copy to dup 2019-06-06 17:41:42 +02:00
sm2 Regenerate mkerr files 2019-07-16 05:26:28 +02:00
sm3 Move digests to providers 2019-06-04 12:09:50 +10: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 Make core code available within the FIPS module 2019-05-23 11:02:04 +01:00
store Regenerate mkerr files 2019-07-16 05:26:28 +02:00
ts Regenerate mkerr files 2019-07-16 05:26:28 +02:00
txt_db Following the license change, modify the boilerplates in crypto/ 2018-12-06 15:32:17 +01:00
ui Remove tab characters from C source files. 2019-07-16 20:24:10 +10:00
whrlpool Move wp_asm_src file information to build.info files 2019-06-17 16:08:52 +02:00
x509 Cleanup use of X509 STORE locks 2019-07-18 15:08:24 +10: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
asn1_dsa.c remove end of line whitespace 2019-07-12 06:27:19 +10:00
bsearch.c ossl_bsearch(): New generic internal binary search utility function 2019-05-08 16:17:16 +02:00
build.info Parameter building utilities. 2019-07-17 16:59:09 +10:00
c64xpluscpuid.pl Following the license change, modify the boilerplates in crypto/ 2018-12-06 15:32:17 +01:00
context.c Tell the FIPS provider about thread stop events 2019-06-17 16:19:44 +01:00
core_fetch.c EVP fetching: make operation_id part of the method identity 2019-06-10 08:01:19 +02:00
core_namemap.c OSSL_NAMEMAP: make names case insensitive 2019-06-24 10:58:13 +02:00
cpt_err.c Parameter building utilities. 2019-07-17 16:59:09 +10:00
cryptlib.c Remove tab characters from C source files. 2019-07-16 20:24:10 +10:00
ctype.c Following the license change, modify the boilerplates in crypto/ 2018-12-06 15:32:17 +01:00
cversion.c Add the possibility to display and use MODULESDIR 2019-04-23 15:50:35 +02: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 Fix NULL pointer dereference in the ex_data code 2019-06-28 10:22:21 +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
info.c Add a way for the application to get OpenSSL configuration data 2019-04-23 15:51:39 +02:00
init.c Provide an ability to deregister thread stop handlers 2019-06-19 11:54:34 +01:00
initthread.c Fix init_get_thread_local() 2019-07-18 06:20:55 +02: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_win.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_wince.c Following the license change, modify the boilerplates in crypto/ 2018-12-06 15:32:17 +01:00
mem.c Create a FIPS provider and put SHA256 in it 2019-04-04 23:09:47 +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 Deprecated {OPENSSL,CRYPTO}_debug_mem_{push,pop} 2019-07-17 14:48:06 +02:00
mem_sec.c Use vxRandLib for VxWorks7 2019-05-02 23:32:44 +02:00
mem_str.c Make allocation/free/clean available to providers 2019-07-11 15:53:59 +10:00
mips_arch.h Fix compiling error for mips32r6 and mips64r6 2019-03-19 07:36:21 +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 Make allocation/free/clean available to providers 2019-07-11 15:53:59 +10:00
o_time.c Following the license change, modify the boilerplates in crypto/ 2018-12-06 15:32:17 +01:00
packet.c Give WPACKET the ability to have a NULL buffer underneath it 2019-07-12 06:26:46 +10:00
param_build.c Parameter building utilities. 2019-07-17 16:59:09 +10:00
params.c Make the EVP Key Exchange code provider aware 2019-07-16 10:16:32 +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 crypto/ppccap.c: Fix FIPS build on PPC 2019-06-17 09:43:21 +02:00
ppccpuid.pl PPC: Try out if mftb works before using it 2019-01-21 15:42:04 +01:00
provider.c Change OSSL_PARAM return size to not be a pointer. 2019-06-24 14:43:55 +10:00
provider_conf.c Provider config module: allow providers to already be loaded 2019-07-16 16:48:42 +02:00
provider_core.c Make allocation/free/clean available to providers 2019-07-11 15:53:59 +10:00
provider_local.h Replumbing: Add a mechanism to pre-populate the provider store 2019-03-19 14:06:58 +01:00
provider_predefined.c Make core code available within the FIPS module 2019-05-23 11:02:04 +01:00
README.sparse_array Fix Typos 2019-07-02 14:22:29 +02:00
s390x_arch.h Remove tab characters from C source files. 2019-07-16 20:24:10 +10:00
s390xcap.c s390x assembly pack: fix restoring of SIGILL action 2019-07-16 14:40:28 +02:00
s390xcpuid.pl s390x assembly pack: add support for pcc and kma instructions 2019-06-29 23:13:45 +02: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 Ensure we get all the right defines for AES assembler in FIPS module 2019-06-03 12:56:53 +01:00
sparse_array.c Fix Typos 2019-07-02 14:22:29 +02:00
threads_none.c Following the license change, modify the boilerplates in crypto/ 2018-12-06 15:32:17 +01:00
threads_pthread.c Make core code available within the FIPS module 2019-05-23 11:02:04 +01:00
threads_win.c Avoid linking error for InitializeCriticalSectionAndSpinCount(). 2019-03-29 09:51:24 +00:00
trace.c crypto/trace.c: Remove unexisting categories 2019-06-22 21:11:52 +02:00
uid.c Remove NextStep support 2019-07-01 13:32:46 -04: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
brevity):

        +----+
        |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.