mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2024-12-27 06:21:43 +08:00
Code Issues Packages Projects Releases Wiki Activity
28,458 Commits 34 Branches 385 Tags 621 MiB
4b58d9b41b
Commit Graph

28458 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pauli
0edb819441 tls: updates for the new additional MAC_init arguments 
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/14310)
 2021-02-28 17:25:49 +10:00
Pauli
cc2314a9f6 evp: updates for the new additional MAC_init arguments 
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/14310)
 2021-02-28 17:25:49 +10:00
Pauli
1dc28e742d crmf: updates for the new additional MAC_init arguments 
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/14310)
 2021-02-28 17:25:48 +10:00
Pauli
4a5d8c0cb7 apps: updates for the new additional MAC_init arguments 
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/14310)
 2021-02-28 17:25:48 +10:00
Pauli
2211bf6bb7 apps: update mac to work with additional MAC_init arguments. This doesn't include the creation of new 'key' arguments. 
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/14310)
 2021-02-28 17:25:48 +10:00
Pauli
ebf8274c55 apps: update fipsinstall to work with additional MAC_init arguments 
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/14310)
 2021-02-28 17:25:48 +10:00
Pauli
2524ec1ac2 prov kdf: update to use the extra MAC init arguments 
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/14310)
 2021-02-28 17:25:48 +10:00
Pauli
8f5d64b102 prov: update SipHash to new init function 
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/14310)
 2021-02-28 17:25:48 +10:00
Pauli
ae7d90a159 siphash: Add the C and D round parameters for SipHash. 
This represents a gap in functionality from the low level APIs.

Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/14310)
 2021-02-28 17:25:48 +10:00
Richard Levitte
1d73e2adae crypto/asn1/i2d_evp.c: Fix i2d_provided() to return a proper length 
Fixes #14258

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Ben Kaduk <kaduk@mit.edu>
(Merged from https://github.com/openssl/openssl/pull/14291)
 2021-02-27 16:14:09 +01:00
Richard Levitte
c8182743a7 PROV: Implement an EC key -> blob encoder, to get the public key 
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Ben Kaduk <kaduk@mit.edu>
(Merged from https://github.com/openssl/openssl/pull/14291)
 2021-02-27 16:14:09 +01:00
Richard Levitte
8ab9c4ddc4 Modify i2d_PublicKey() so it can get an EC public key as a blob 
This introduces the encoder output type "blob", to be used for
anything that outputs an unstructured blob of data.

Fixes #14258

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Ben Kaduk <kaduk@mit.edu>
(Merged from https://github.com/openssl/openssl/pull/14291)
 2021-02-27 16:14:09 +01:00
Benjamin Kaduk
3d36472660 test_ecpub: test that we can decode the DER we encoded 
We should be able to round-trip through the encoded DER form of the
EC public key and get back something that compares as equal to the
original key.

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14291)
 2021-02-27 16:14:09 +01:00
Benjamin Kaduk
ad7cb0bf5c test_ecpub: verify returned length after encoding 
Save the length we got from querying how much space was needed, and
check that the actual encoding call returned the same length.

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14291)
 2021-02-27 16:14:09 +01:00
Benjamin Kaduk
c0ff1932e4 Add test for EC pubkey export/import 
There seems to be an issue with i2d_provided() in i2d_evp.c that causes
us to fail to construct a valid chain of encoders for the "type-specific"
output when it's an EC pubkey.  This test is designed to exercise that
codepath for a variety of curves.

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14291)
 2021-02-27 16:14:09 +01:00
Dr. David von Oheimb
4ef70dbcf4 Code cleanup mostly in crypto/x509/v3_purp.c 
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14328)
 2021-02-27 13:01:05 +01:00
Benjamin Kaduk
90b4247cc5 Check ASN1_item_ndef_i2d() return value. 
Return an error instead of trying to malloc a negative number.
The other usage in this file already had a similar check, and the caller
should have put an entry on the error stack already.

Note that we only check the initial calls to obtain the encoded length,
and assume that the follow-up call to actually encode to the allocated
storage will succeed if the first one did.

Fixes: #14177

Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/14308)
 2021-02-26 15:42:59 -08:00
Tomas Mraz
d2ccfb9caa evp_pkey_provided_test: Improve diagnostic output 
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14316)
 2021-02-26 18:43:34 +01:00
Tomas Mraz
4519ea90eb tests: Always print errors before test verdict 
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14316)
 2021-02-26 18:43:34 +01:00
Pauli
db7fbd54cf fuzzer: add ctx gettable/settable to the fuzzer RNG 
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14240)
 2021-02-26 18:09:04 +10:00
Pauli
2e36321aec test: add ctx gettable/settable to the generic fake random number generator 
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14240)
 2021-02-26 18:08:41 +10:00
Pauli
e79fb279df core: support modified gettable/settable ctx calls for ciphers 
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14240)
 2021-02-26 18:08:41 +10:00
Pauli
fe20a66ed4 changes to match the updated context gettable/settable calls for ciphers 
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14240)
 2021-02-26 18:08:41 +10:00
Pauli
292b4184d6 evp: upport modified gettable/settable ctx calls for ciphers 
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14240)
 2021-02-26 18:08:41 +10:00
Pauli
644c5dd366 prov: upport modified gettable/settable ctx calls for ciphers 
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14240)
 2021-02-26 18:08:41 +10:00
Pauli
35c76a528b evp: support modified gettable/settable ctx calls for MACs 
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14240)
 2021-02-26 18:08:41 +10:00
Pauli
8dd233bb07 doc: changes to match the updated context gettable/settable calls for MACs 
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14240)
 2021-02-26 18:08:41 +10:00
Pauli
5a7134ee10 core: core: support modified gettable/settable ctx calls for MACs 
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14240)
 2021-02-26 18:08:41 +10:00
Pauli
eee323c339 prov: support modified gettable/settable ctx calls for MACs 
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14240)
 2021-02-26 18:08:41 +10:00
Pauli
1e8e5c6092 prov: support modified gettable/settable ctx calls for KDFs 
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14240)
 2021-02-26 18:08:41 +10:00
Pauli
de43d82b6d core: support modified gettable/settable ctx calls for KDFs 
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14240)
 2021-02-26 18:08:41 +10:00
Pauli
a5120afda3 evp: support modified gettable/settable ctx calls for KDFs 
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14240)
 2021-02-26 18:08:41 +10:00
Pauli
530cacb56f doc: changes to match the updated context gettable/settable calls 
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14240)
 2021-02-26 18:08:41 +10:00
Pauli
caa60428cd evp: support modified gettable/settable ctx calls for RNGs 
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14240)
 2021-02-26 18:08:41 +10:00
Pauli
1c9eaf4251 core: update RNG gettable/settable ctx param calls 
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14240)
 2021-02-26 18:08:41 +10:00
Pauli
a3f091fddd prov: update RNGs to support modified gettable/settable CTX params 
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14240)
 2021-02-26 18:08:41 +10:00
Pauli
90fec26dc6 doc: note changes to rand gettable/settable provider call 
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14240)
 2021-02-26 18:08:41 +10:00
Pauli
d618ac6fd7 doc: note changes to digest gettable/settable provider calls 
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14240)
 2021-02-26 18:08:41 +10:00
Pauli
6de3a06dd4 modify EVP to support digest gettable/settable calls 
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14240)
 2021-02-26 18:08:41 +10:00
Pauli
aa95e08b29 core: update digest gettable/settable ctx params calls 
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14240)
 2021-02-26 18:08:41 +10:00
Pauli
e772f25ca8 prov: update digests to support modified ctx params 
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14240)
 2021-02-26 18:08:41 +10:00
Richard Levitte
5a6a6d59a6 Makefile: Only update doc/build.info when there's an actual change 
Fixes #14307

Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14309)
 2021-02-26 08:54:09 +01:00
Shane Lontis
32ab57cbb4 Fix external symbols related to ec & sm2 keys 
Partial fix for #12964

This adds ossl_ names for the following symbols:

ec_*, ecx_*, ecdh_*, ecdsa_*, sm2_*

Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14231)
 2021-02-26 10:53:01 +10:00
Shane Lontis
5af02212a5 Fix external symbols related to dsa keys 
Partial fix for #12964

This adds ossl_ names for the following symbols:

dsa_check_pairwise, dsa_check_params, dsa_check_priv_key, dsa_check_pub_key, dsa_check_pub_key_partial,
dsa_do_sign_int, dsa_ffc_params_fromdata,
dsa_generate_ffc_parameters, dsa_generate_public_key,
dsa_get0_params, dsa_key_fromdata, dsa_new_with_ctx, dsa_pkey_method, dsa_sign_int

Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14231)
 2021-02-26 10:50:30 +10:00
Shane Lontis
19dbb742cd Fix external symbols related to dh keys 
Partial fix for #12964

This adds ossl_ names for the following symbols:

dh_new_by_nid_ex, dh_new_ex, dh_generate_ffc_parameters, dh_generate_public_key,
dh_get_named_group_uid_from_size, dh_gen_type_id2name, dh_gen_type_name2id,
dh_cache_named_group, dh_get0_params, dh_get0_nid,
dh_params_fromdata, dh_key_fromdata, dh_params_todata, dh_key_todata,
dh_check_pub_key_partial, dh_check_priv_key, dh_check_pairwise,
dh_get_method, dh_buf2key, dh_key2buf, dh_KDF_X9_42_asn1,
dh_pkey_method, dhx_pkey_method

Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14231)
 2021-02-26 10:50:30 +10:00
Shane Lontis
94553e85b6 Fix external symbols for bn 
Partial fix for #12964

This adds ossl_ names for symbols related to bn_*

Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14296)
 2021-02-26 10:32:22 +10:00
Mark
2d96895122 Fix filename escaping in c_rehash 
CLA: trivial

Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14301)
 2021-02-26 10:03:48 +10:00
Tomas Mraz
1cba86234a evp_extra_test: Do not manipulate providers in default context 
Otherwise the with OPENSSL_TEST_RAND_ORDER following tests will
be broken. There is also no real need to do that.

Fixes #14070

Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14305)
 2021-02-25 17:55:58 +01:00
Tomas Mraz
8cdc3425af fake_random: Do not overwrite the callback on instatiation 
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14299)
 2021-02-25 14:01:54 +01:00
Tomas Mraz
0c84139c98 Ensure that the fake rand is initialized 
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14299)
 2021-02-25 14:01:54 +01:00