aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2020-09-24load_key_certs_crls(): Restore output of fatal errorsDr. David von Oheimb15-56/+82
Also improve credentials loading diagnostics for many apps. Fixes #12840 Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org> Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/12893)
2020-09-24ACVP: add test case for DRBGPauli2-0/+135
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org> (Merged from https://github.com/openssl/openssl/pull/12905)
2020-09-24Use OPENSSL_SYS_TANDEM instead of OPENSSL_SYSNAME_TANDEMRichard Levitte4-6/+6
This streamlines with all other config targets, and draws from the 'sys_id' config attribute. Fixes #12858 Reviewed-by: Tim Hudson <tjh@openssl.org> (Merged from https://github.com/openssl/openssl/pull/12933)
2020-09-24Configure: Show 'enable' and 'disable' config attributesRichard Levitte1-0/+2
This makes a difference for './Configure HASH' and './Configure TABLE' Reviewed-by: Tim Hudson <tjh@openssl.org> (Merged from https://github.com/openssl/openssl/pull/12933)
2020-09-24Configuration: Streamline NonStop entriesRichard Levitte1-171/+267
Because there are many combinations and much repetition, we add a large number of templates to cover all aspects, and make the actual config entries inherit from the templates combined. Fixes #12858 Reviewed-by: Tim Hudson <tjh@openssl.org> (Merged from https://github.com/openssl/openssl/pull/12933)
2020-09-24Simplify the tarball generating scriptsHu Keping1-2/+1
As per discussed in issue #12364 [1], since the format of git archive is inferred from the output file, it's safe to remove the pipe for gzip. [1] https://github.com/openssl/openssl/issues/12364 Fixes #12364 Signed-off-by: Hu Keping <hukeping@huawei.com> Reviewed-by: Tim Hudson <tjh@openssl.org> Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/12841)
2020-09-23drbg: revert renamings of the generate and reseed counterDr. Matthias St. Pierre11-19/+19
The original names were more intuitive: the generate_counter counts the number of generate requests, and the reseed_counter counts the number of reseedings (of the principal DRBG). reseed_gen_counter -> generate_counter reseed_prop_counter -> reseed_counter This is the anologue to commit 8380f453ec81 on the 1.1.1 stable branch. The only difference is that the second renaming has already been reverted on the master branch. Reviewed-by: Paul Dale <paul.dale@oracle.com> (Merged from https://github.com/openssl/openssl/pull/12941)
2020-09-23Configurations/unix-Makefile.tmpl: make cleanup kinderRichard Levitte1-3/+3
The removal of certain types of files we structured like this: -$(RM) `find . {{options}} -print` This isn't very kind for shells with limited command line lengths (even when that limit is generous, in our case), so we rewrite those like this: -find . {{options}} -exec $(RM) {} \; Fixes #12938 Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org> Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com> (Merged from https://github.com/openssl/openssl/pull/12939)
2020-09-23Fix propq in x942kdfShane Lontis1-4/+13
Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/12944)
2020-09-23Fix missing propq in sm2Shane Lontis1-2/+4
Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/12944)
2020-09-23Fix missing propq in ffc_params_generateShane Lontis1-2/+2
Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/12944)
2020-09-23Fix missing propq in ecdh_cms_set_shared_info()Shane Lontis1-1/+1
Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/12944)
2020-09-23Fix ecx so that is uses a settable propertyqueryShane Lontis11-101/+165
Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/12944)
2020-09-23Fix ssl_hmac_new() so that it uses the propqShane Lontis1-1/+1
Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/12944)
2020-09-23Fix EVP_KDF_scrypt so that is uses a propq for its fetch.Shane Lontis2-12/+52
The parameter can be set via settable parameter OSSL_KDF_PARAM_PROPERTIES Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/12944)
2020-09-23Change rsa gen so it can use the propq from OSSL_PKEY_PARAM_RSA_DIGESTShane Lontis5-8/+18
rsa_pss_params_30_fromdata() now uses the OSSL_PKEY_PARAM_RSA_DIGEST_PROPS parameter also. Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/12944)
2020-09-23Fix CID 1466709 : Negative value passed to a function that cant be negative ↵Shane Lontis1-1/+1
in cms_sd.c Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org> (Merged from https://github.com/openssl/openssl/pull/12930)
2020-09-23Fix CID 1466710 : Resource leak in ec_kmgmt due to new call to ↵Shane Lontis1-2/+6
ossl_prov_is_running() Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org> (Merged from https://github.com/openssl/openssl/pull/12930)
2020-09-23Fix CID 1466712 : Resource leak in ec_kmgmt due to new callto ↵Shane Lontis1-1/+5
ossl_prov_is_running() Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org> (Merged from https://github.com/openssl/openssl/pull/12930)
2020-09-23Fix CID 1466713 : Dead code in encode_key2text.cShane Lontis1-16/+13
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org> (Merged from https://github.com/openssl/openssl/pull/12930)
2020-09-23Fix CID 1466714 : Null pointer dereference in EVP_PKEY_CTX_ctrl() due to new ↵Shane Lontis1-6/+4
call to evp_pkey_ctx_store_cached_data() Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org> (Merged from https://github.com/openssl/openssl/pull/12930)
2020-09-23Fix CID 1467068 : Null pointer dereference in self_test.cShane Lontis1-1/+3
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org> (Merged from https://github.com/openssl/openssl/pull/12930)
2020-09-23rand: add a test case for configuration based randomPauli1-0/+103
Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/12931)
2020-09-23list: add capability to print details about the current DRBGsPauli3-2/+116
This allows a user to confirm that the DRBG their configuration specified is being used. Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/12931)
2020-09-23drbg: gettable parameters for cipher/digest/mac type.Pauli3-0/+48
Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/12931)
2020-09-23kdf/mac: add name query calls for KDFs and MACsPauli7-3/+35
Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/12931)
2020-09-23evp_rand: fix bug in gettable_ctx/settable_ctx callsPauli1-2/+2
Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/12931)
2020-09-23Add a "random" configuration section.Pauli8-5/+213
This permits the default trio of DRBGs to have their type and parameters set using configuration. Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/12931)
2020-09-23DOC: remove OPENSSL_CTX from OSSL_DECODER_CTX_newDaniel Bevenius1-1/+1
This commit changes the man page for OSSL_DECODER_CTX_new by removing the OPENSSL_CTX parameter which matches the declaration in decoder.h. Reviewed-by: Richard Levitte <levitte@openssl.org> Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org> (Merged from https://github.com/openssl/openssl/pull/12935)
2020-09-23rand: reference count the EVP_RAND contexts.Pauli3-5/+37
This is required before the RAND/DRBG framework can be made user mutable. Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org> (Merged from https://github.com/openssl/openssl/pull/12904)
2020-09-22Add auto-gen SM2 der files into .gitignorePaul Yang1-0/+2
Reviewed-by: Richard Levitte <levitte@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/12536)
2020-09-22refactor get params functionsPaul Yang1-101/+27
Reviewed-by: Richard Levitte <levitte@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/12536)
2020-09-22support PARAM_SECURITY_BITS for SM2Paul Yang1-2/+13
Reviewed-by: Richard Levitte <levitte@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/12536)
2020-09-22Address review commentsPaul Yang3-43/+9
Reviewed-by: Richard Levitte <levitte@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/12536)
2020-09-22Add SM2 signature algorithm to default providerPaul Yang21-175/+799
Reviewed-by: Richard Levitte <levitte@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/12536)
2020-09-22Add SM2 key managementPaul Yang7-7/+295
Reviewed-by: Richard Levitte <levitte@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/12536)
2020-09-22Added FIPS DEP initialization for the NonStop platform in fips/self_test.c.Randall S. Becker1-0/+16
CLA: Permission is granted by the author to the OpenSSL team to use these modifications. Fixes #12918 Signed-off-by: Randall S. Becker <rsbecker@nexbridge.com> Reviewed-by: Paul Dale <paul.dale@oracle.com> Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/12928)
2020-09-21Add const to 'ppin' function parameterolszomal2-4/+6
CLA: trivial Reviewed-by: Kurt Roeckx <kurt@roeckx.be> Reviewed-by: Matt Caswell <matt@openssl.org> GH: #12205
2020-09-21DOC: POD syntax fixes in doc/man1/openssl-cmp.pod.inRichard Levitte1-0/+5
Reviewed-by: Shane Lontis <shane.lontis@oracle.com> (Merged from https://github.com/openssl/openssl/pull/12924)
2020-09-21Support keys with RSA_METHOD_FLAG_NO_CHECK with OCSP signNorman Ashley2-26/+9
OCSP_basic_sign_ctx() in ocsp_srv.c , does not check for RSA_METHOD_FLAG_NO_CHECK. If a key has RSA_METHOD_FLAG_NO_CHECK set, OCSP sign operations can fail because the X509_check_private_key() can fail. The check for the RSA_METHOD_FLAG_NO_CHECK was moved to crypto/rsa/rsa_ameth.c as a common place to check. Checks in ssl_rsa.c were removed. Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Tim Hudson <tjh@openssl.org> Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org> (Merged from https://github.com/openssl/openssl/pull/12419) (cherry picked from commit 56e8fe0b4efbf582e40ae91319727c9d176c5e1e)
2020-09-21Increase PSK_MAX_IDENTITY_LEN from 128 to 256Eric Curtin1-1/+1
We are considering using the format "host-nqn controller-nqn" for psk-id in the NVMe-oF/TCP over TLS spec, it's in the current version, but openssl's limit was 128 upto now, we need a little longer than that. Reviewed-by: Shane Lontis <shane.lontis@oracle.com> Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/12771)
2020-09-21apps/ocsp: Return non zero exit code with invalid certIDTomas Mraz1-6/+12
Fixes #7151 Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com> (Merged from https://github.com/openssl/openssl/pull/12916)
2020-09-21Increase PSK_MAX_PSK_LEN to 512Rutger Hendriks2-2/+2
Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org> (Merged from https://github.com/openssl/openssl/pull/12777)
2020-09-21Correct certificate and key names for explicit ec param testTomas Mraz1-2/+4
Reviewed-by: David von Oheimb <david.von.oheimb@siemens.com> (Merged from https://github.com/openssl/openssl/pull/12915)
2020-09-21Fixed EVP_MAC_final argument count in exampleozppupbg1-5/+5
EVP_MAC_final had only three arguments / the buffer/tag size was missing. Fixes #12424 Note, that I didn't try to compile the example to look for other problems. Reviewed-by: Paul Yang <kaishen.yy@antfin.com> Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org> Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com> (Merged from https://github.com/openssl/openssl/pull/12429)
2020-09-21Fix merge error with libcrypto.numShane Lontis1-1/+0
Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/12929)
2020-09-20util/find-doc-nits: Add a regexp for C symbols and use itRichard Levitte1-7/+10
Our matching of C symbols here was inconsistent and could therefore give false negatives when the SYNOPSIS was parsed. Now we have $C_symbol, which is a simple regexp that matches the common C symbol. Reviewed-by: Shane Lontis <shane.lontis@oracle.com> (Merged from https://github.com/openssl/openssl/pull/12873)
2020-09-20DECODER: Some cleanups, and aligning with OSSL_ENCODERRichard Levitte10-323/+307
Mostly source nits, but also removing a couple of OSSL_DECODER_PARAM macros that are never used or even make sense. Also, some function names weren't quite consistent. They were made a bit more consistent in the OSSL_ENCODER API, now we bring that back to OSSL_DECODER. Reviewed-by: Shane Lontis <shane.lontis@oracle.com> (Merged from https://github.com/openssl/openssl/pull/12873)
2020-09-20TEST: Adapt applicable tests to the changed OSSL_ENCODER_CTX_new_by_EVP_PKEY()Richard Levitte6-100/+223
This adds the convenience function EVP_PKEY_typenames_do_all(), which does the same as EVP_KEYMGMT_names_do_all(), but without having to expose all the internal ways to find out if the internal EVP_PKEY key is legacy or provider-native. Reviewed-by: Shane Lontis <shane.lontis@oracle.com> (Merged from https://github.com/openssl/openssl/pull/12873)
2020-09-20ENCODER: Adapt calls to the changed OSSL_ENCODER_CTX_new_by_EVP_PKEY()Richard Levitte5-38/+82
Reviewed-by: Shane Lontis <shane.lontis@oracle.com> (Merged from https://github.com/openssl/openssl/pull/12873)