summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix incorrect gettable OSSL_CIPHER_PARAM_TLS_MAC parameterShane Lontis2021-05-281-1/+1
| | | | | Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/15416)
* Fix incorrect OSSL_CIPHER_PARAM_SPEED get_ctx_paramsShane Lontis2021-05-281-1/+0
| | | | | Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/15416)
* Add missing EVP_CTRL_CCM_SET_L controlShane Lontis2021-05-281-0/+6
| | | | | Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/15416)
* Add Docs for EVP_CIPHER-*Shane Lontis2021-05-2819-79/+827
| | | | | Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/15416)
* EVP_CIPHER Documentation updatesShane Lontis2021-05-282-461/+717
| | | | | | | | | | | | | | | | EVP_EncryptInit.pod now follows the pattern used in EVP_DigestInit.pod. i.e. '=item' is used for methods PARAMETERS and CONTROLS sections have been added. The PARAMETERS list has been moved from provider-cipher.pod (this file just has a link now). Missing fields were updated. The CONTROLS shows the mappings to OSSL_PARAM keys. Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/15416)
* ERR: Rebuild generated engine error filesSven Schwermer2021-05-285-10/+10
| | | | | | | | | | | CLA: trivial Signed-off-by: Sven Schwermer <sven.schwermer@disruptive-technologies.com> Reviewed-by: Paul Dale <pauli@openssl.org> Reviewed-by: Richard Levitte <levitte@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/15495)
* mkerr: Fix string literal conversionSven Schwermer2021-05-281-2/+2
| | | | | | | | | | | | | | | | | This fixes a compiler warning on clang-1205.0.22.9 when compiling the generated code as C++11: ISO C++11 does not allow conversion from string literal to 'char *' [-Wwritable-strings] CLA: trivial Signed-off-by: Sven Schwermer <sven.schwermer@disruptive-technologies.com> Reviewed-by: Paul Dale <pauli@openssl.org> Reviewed-by: Richard Levitte <levitte@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/15495)
* Fix PKCS12_create() so that a fetch error is not added to the error stack.Shane Lontis2021-05-282-0/+90
| | | | | | | | | | | | | Fixes #15392 PBE algorithms such as NID_pbe_WithSHA1And3_Key_TripleDES_CBC will currently always fail to the EVP_CIPHER_fetch() call, so the fallback to a legacy algorithm always happens. In this case the error stack should ignore the fetch error. Reviewed-by: Paul Dale <pauli@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/15473)
* Fix typo about SSL_CONF_FLAG_CMDLINETommy Chiang2021-05-281-2/+2
| | | | | | | | | | change SSL_CONF_CMDLINE to SSL_CONF_FLAG_CMDLINE CLA: trivial Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Shane Lontis <shane.lontis@oracle.com> Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/15489)
* Fix issues found by md-nitsRich Salz2021-05-286-43/+17
| | | | | | | | Fixes #15460 Reviewed-by: Shane Lontis <shane.lontis@oracle.com> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/15461)
* Fix memory leak in OSSL_CMP_CTXPetr Gotthard2021-05-282-1/+2
| | | | | | | | The ctx->propq is strdup'ed, so it must be free'd too. Reviewed-by: Ben Kaduk <kaduk@mit.edu> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/15458)
* Rework and make DEBUG macros consistent.Rich Salz2021-05-2820-66/+75
| | | | | | | | | | | | | | | | | | | | Remove unused -DCONF_DEBUG and -DBN_CTX_DEBUG. Rename REF_PRINT to REF_DEBUG for consistency, and add a new tracing category and use it for printing reference counts. Rename -DDEBUG_UNUSED to -DUNUSED_RESULT_DEBUG Fix BN_DEBUG_RAND so it compiles and, when set, force DEBUG_RAND to be set also. Rename engine_debug_ref to be ENGINE_REF_PRINT also for consistency. Fixes #15357 Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/15353)
* Fix doc typos.David Makepeace2021-05-281-2/+2
| | | | | | | Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Shane Lontis <shane.lontis@oracle.com> Reviewed-by: Paul Dale <pauli@openssl.org> (Merged from https://github.com/openssl/openssl/pull/15483)
* Initialise OPENSSL_armcap_P to 0 before setting it based on capabilities, ↵Tom Cosgrove2021-05-281-2/+2
| | | | | | | | | | | not after Signed-off-by: Tom Cosgrove <tom.cosgrove@arm.com> Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Shane Lontis <shane.lontis@oracle.com> Reviewed-by: Paul Dale <pauli@openssl.org> (Merged from https://github.com/openssl/openssl/pull/15486)
* FIPS Checksums: checkout the head of the base repo as pristineTomas Mraz2021-05-281-1/+2
| | | | | Reviewed-by: Paul Dale <pauli@openssl.org> (Merged from https://github.com/openssl/openssl/pull/15503)
* Call SSLfatal when the generate_ticket_cb returns 0Todd Short2021-05-271-2/+3
| | | | | | | | | | | Otherwise, the state machine ends up being in a bad state: ``` SSL routines:write_state_machine:missing fatal:ssl/statem/statem.c:XXX: ``` Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Ben Kaduk <kaduk@mit.edu> (Merged from https://github.com/openssl/openssl/pull/15487)
* FIPS Checksums CI: use separate directories for the checkoutsTomas Mraz2021-05-271-9/+14
| | | | | Reviewed-by: Paul Dale <pauli@openssl.org> (Merged from https://github.com/openssl/openssl/pull/15481)
* generate_fips_sources: properly include providers/common/der/*.inTomas Mraz2021-05-271-7/+2
| | | | | Reviewed-by: Paul Dale <pauli@openssl.org> (Merged from https://github.com/openssl/openssl/pull/15481)
* Fix compilation warning with GCC11.Juergen Christ2021-05-272-3/+3
| | | | | | | | | | | | | | Parameter "header" of ssl3_cbc_digest_record was fixed to a 13 bytes header but used as a pointer. This caused a warning about out-of-bounds array access with GCC 11. Fixes #15462. Signed-off-by: Juergen Christ <jchrist@linux.ibm.com> Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Paul Dale <pauli@openssl.org> (Merged from https://github.com/openssl/openssl/pull/15463)
* coverity 1484912: Null pointer dereferences (NULL_RETURNS)Pauli2021-05-271-0/+3
| | | | | Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/15425)
* coverity 1484913: Null pointer dereferences (REVERSE_INULL)Pauli2021-05-271-3/+8
| | | | | Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/15425)
* TEST: Prefer using precomputed RSA and DH keys for more efficient testsDr. David von Oheimb2021-05-2715-47/+104
| | | | | | Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Paul Dale <pauli@openssl.org> (Merged from https://github.com/openssl/openssl/pull/13715)
* APPS req: Extend the -keyout option to be respected also with -keyDr. David von Oheimb2021-05-272-14/+19
| | | | | | Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Paul Dale <pauli@openssl.org> (Merged from https://github.com/openssl/openssl/pull/13715)
* DOC: Improve description of 'req' app: -new, -newkey, and -keyout optionsDr. David von Oheimb2021-05-272-16/+22
| | | | | | Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Paul Dale <pauli@openssl.org> (Merged from https://github.com/openssl/openssl/pull/13715)
* Fix spelling mistake in d2i_PrivateKey.podShane Lontis2021-05-271-1/+1
| | | | | Reviewed-by: Paul Dale <pauli@openssl.org> (Merged from https://github.com/openssl/openssl/pull/15423)
* Add demo for EC keygenShane Lontis2021-05-273-8/+186
| | | | | | | Fixes #14112 Reviewed-by: Paul Dale <pauli@openssl.org> (Merged from https://github.com/openssl/openssl/pull/15423)
* Fix OCSP_sendreq_nbio arg orderjwalch2021-05-271-1/+1
| | | | | | | | Fixes #15470 Reviewed-by: Richard Levitte <levitte@openssl.org> Reviewed-by: Paul Dale <pauli@openssl.org> (Merged from https://github.com/openssl/openssl/pull/15471)
* test: test MP genrsa in deprecated buildsPauli2021-05-271-10/+21
| | | | | | | | | These multi-prime tests were omitted when genrsa was deprecated but not returned when it was restored. Reviewed-by: Shane Lontis <shane.lontis@oracle.com> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/15472)
* test: add test for key generation strength > RNG strengthPauli2021-05-271-12/+17
| | | | | | Reviewed-by: Shane Lontis <shane.lontis@oracle.com> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/15472)
* test: test genrsa in deprecated buildsPauli2021-05-271-33/+20
| | | | | | | | | These tests were omitted when genrsa was deprecated but not returned when it was restored. Reviewed-by: Shane Lontis <shane.lontis@oracle.com> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/15472)
* errors: update error message (to be squashed)Pauli2021-05-274-2/+7
| | | | | | Reviewed-by: Shane Lontis <shane.lontis@oracle.com> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/15472)
* rsa: check that the RNG is capable of producing a key of the specified sizePauli2021-05-271-0/+22
| | | | | | | | | | | During key generation, any sized key can be asked for. Attempting to generate a key with a security strength larger than the RNG strength now fails. Fixes #15421 Reviewed-by: Shane Lontis <shane.lontis@oracle.com> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/15472)
* rsa: remove the limit on the maximum key strengthPauli2021-05-271-3/+1
| | | | | | Reviewed-by: Shane Lontis <shane.lontis@oracle.com> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/15472)
* Use "" for include crypto/xxxRich Salz2021-05-276-6/+6
| | | | | | Reviewed-by: Shane Lontis <shane.lontis@oracle.com> Reviewed-by: Paul Dale <pauli@openssl.org> (Merged from https://github.com/openssl/openssl/pull/15468)
* Use "" for include internal/xxxRich Salz2021-05-279-11/+10
| | | | | | Reviewed-by: Shane Lontis <shane.lontis@oracle.com> Reviewed-by: Paul Dale <pauli@openssl.org> (Merged from https://github.com/openssl/openssl/pull/15468)
* Use <> for #include openssl/xxxRich Salz2021-05-2716-23/+21
| | | | | | Reviewed-by: Shane Lontis <shane.lontis@oracle.com> Reviewed-by: Paul Dale <pauli@openssl.org> (Merged from https://github.com/openssl/openssl/pull/15468)
* rsa: rename global rsaz_ sumbols so they are in namespacePauli2021-05-274-85/+85
| | | | | | | | | | | | | | The symbols renamed are: RSAZ_amm52x20_x1_256 RSAZ_amm52x20_x2_256 rsaz_avx512ifma_eligible RSAZ_mod_exp_avx512_x2 Additionally, RSAZ_exp52x20_x2_256 was made static Reviewed-by: Shane Lontis <shane.lontis@oracle.com> (Merged from https://github.com/openssl/openssl/pull/15445)
* aes: rename new bsaes_ symbols -> ossl_bsaes_ onesPauli2021-05-277-53/+54
| | | | | | | | | | bsaes_cbc_encrypt -> ossl_bsaes_cbc_encrypt bsaes_ctr32_encrypt_blocks -> ossl_bsaes_ctr32_encrypt_blocks bsaes_xts_decrypt -> ossl_bsaes_xts_decrypt bsaes_xts_encrypt -> ossl_bsaes_xts_encrypt Reviewed-by: Shane Lontis <shane.lontis@oracle.com> (Merged from https://github.com/openssl/openssl/pull/15445)
* bn: rename extract_multiplier_2x20_win5 -> ossl_extract_multiplier_2x20_win5Pauli2021-05-272-22/+28
| | | | | Reviewed-by: Shane Lontis <shane.lontis@oracle.com> (Merged from https://github.com/openssl/openssl/pull/15445)
* bn: rename bn_check_prime_int -> ossl_bn_check_primtPauli2021-05-273-9/+9
| | | | | Reviewed-by: Shane Lontis <shane.lontis@oracle.com> (Merged from https://github.com/openssl/openssl/pull/15445)
* Deprecate old style BIO callback callsTomas Mraz2021-05-2617-87/+365
| | | | | | | | New style BIO_debug_callback_ex() function added to provide replacement for BIO_debug_callback(). Reviewed-by: Paul Dale <pauli@openssl.org> (Merged from https://github.com/openssl/openssl/pull/15440)
* apps: Fix the mismatch of SM2 keys keymgmtTianjia Zhang2021-05-261-1/+5
| | | | | | | | | | | | | | | | | | The SM2 key has a separate keymgmt, which is independent of the EC. The key generated by the subcommand ecparam is wrong. Using 'openssl ec -in sm2.key -noout -text' will also encounter some errors. When using the ecparam subcommand to generate the SM2 key, use the correct keymgmt to solve this problem. Signed-off-by: Tianjia Zhang <tianjia.zhang@linux.alibaba.com> Reviewed-by: Paul Dale <pauli@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Richard Levitte <levitte@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/15454)
* util/fix-doc-nits: Fix link detection in collectnames() to be kinderRichard Levitte2021-05-261-10/+21
| | | | | | | | | | | | The way the links were parsed out of the contents caused a regexp recursion. The easiest way to deal with it is to find all markup using $markup_re, and then parsing out the L markups and add them to the links array. Fixes #15449 Reviewed-by: Paul Dale <pauli@openssl.org> (Merged from https://github.com/openssl/openssl/pull/15450)
* TEST: Add test specific fipsmodule.cnf, and use itRichard Levitte2021-05-264-5/+46
| | | | | | | | | | | | | | | We add the concept of preparation recipes, which are performed unconditionally. They are all expected to match the pattern test/recipes/00-prep_*.t. We add one such preparation recipe, test/recipes/00-prep_fipsmodule_cnf.t, which helps us generate a test specific fipsmodule.cnf, to be used by all other tests. Fixes #15166 Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/15436)
* Build file templates: rework FIPS module installationRichard Levitte2021-05-263-28/+40
| | | | | Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/15436)
* Build file templates: rework how general dependencies are computedRichard Levitte2021-05-263-87/+71
| | | | | | | | | | | For some types of targets, we pretty much know what kinds of files all the dependencies are. For some, however, we can't assume anything, and are faced with dependencies in platform agnostic form. We need to find those in diverse places in %unified_info, and deduce from there how they should be converted to a platform specific form. Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/15436)
* Rework how providers/fipsmodule.cnf is producedRichard Levitte2021-05-265-35/+95
| | | | | | | | | | | | | | | | First of all, we have concluded that we can calculate the integrity checksum with a simple perl script. Second, having the production of providers/fipsmodule.cnf as a dependency for run_tests wasn't quite right. What we really want is to generate it as soon as a new providers/fips.so is produced. That required a small bit of fiddling with how diverse dependencies are made. Fixes #15166 Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/15436)
* Ignore the threadstest_fips executableMatt Caswell2021-05-261-0/+1
| | | | | | | Add a new executable that isn't caught by existing .gitignore rules Reviewed-by: Paul Dale <pauli@openssl.org> (Merged from https://github.com/openssl/openssl/pull/15453)
* OSSL_DECODER_from_bio: Report an unsupported error when there is noneTomas Mraz2021-05-261-2/+3
| | | | | | | | | | When nothing was decoded and there is no error on the stack report something. Fixes #15442 Reviewed-by: Paul Dale <pauli@openssl.org> (Merged from https://github.com/openssl/openssl/pull/15441)
* Add negative test cases for PEM_read_bio_PrivateKeyTomas Mraz2021-05-261-0/+36
| | | | | Reviewed-by: Paul Dale <pauli@openssl.org> (Merged from https://github.com/openssl/openssl/pull/15441)