mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-03-31 20:10:45 +08:00
Code Issues Packages Projects Releases Wiki Activity
28,340 Commits 31 Branches 392 Tags
Commit Graph

28340 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pauli
f8a5822cff doc: update documenation with params argument on DRBG instantiate calls 
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
7198bd1a8f test: update tests to allow for params argument for the instantiate call on EVP_RAND_CTXs 
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
b98d550d80 prov: update rand implementations to have a params argument for the instantiate call 
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
8d5b197b28 fips: update DRBG KATs for the extra instantiate argument 
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
671ff5c74e evp: add params argument to EVP_RAND_instantiate() 
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
6980e36a2a doc: document additional argument to KDF derive calls 
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
f5081be376 prov: add additional argument to KDF derive call in key exchange 
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
6bcd32a43f fips: add additional argument to KDF derive call in self test 
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
36fae6e85a crypto: add additional argument to KDF derive calls 
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
bb0ab821f3 apps: add addition argument to KDF derive call 
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
3469b38816 prov: add extra params argument to KDF implementations 
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
5cceedb583 tls: adjust for extra argument to KDF derive call 
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
05cdec396b test: adjust tests to include extra argument to KDF derive call 
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
7c75f2daf8 evp: add param argument to KDF derive call 
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
a9603292fb core: add param argument to KDF derive call 
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
dc567dc746 doc: update provider-mac documentation to account for the additional 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
9258f7efa7 doc: update KMAC doc to not say that the `KEY\' parameter needs to be set before the init call 
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
7f7640c455 apps: update speed to use the additional arguments to MAC_init 
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
afa44486c5 doc: note the additional parameters to EVP_MAC_init() 
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
1dfe97530f update poly1305 to have additional 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
80ba2526fa update BLAKE2 to have additional 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
ac238428ce prov: update kmac to have additional 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
c23f96f3f6 prov: update hmac to have additional 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
0a56b3c2e5 prov: update gmac to have additional 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
005b190297 prov: update cmac to have additional 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
cf5784aa03 prov: use new MAC_init arguments in HMAC-DRBG 
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
91593b3784 prov: use new MAC_init arguments in signature legacy code 
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
19ea8a8a21 prov: update provider util to be less agressive about changing things unnecessarily 
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
fbff75caaa fips: 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:49 +10:00
Pauli
b58e1f7490 core: 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:49 +10:00
Pauli
77e4ae58ea test: 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
41df96efc1 evp_test: 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
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