diff options
| author | Shane Lontis <shane.lontis@oracle.com> | 2020-08-04 12:18:51 +1000 |
|---|---|---|
| committer | Shane Lontis <shane.lontis@oracle.com> | 2020-08-04 12:18:51 +1000 |
| commit | e5b2cd5899b2631363740a40c76d96fd15d32d1c (patch) | |
| tree | 4953c2a16f26c0c890725b7d576f7cb43b1c8ead /.gitignore | |
| parent | 37d898df348b87a423133afdbb828383be22fda7 (diff) | |
| download | openssl-new-e5b2cd5899b2631363740a40c76d96fd15d32d1c.tar.gz | |
Change the provider implementation of X942kdf to use wpacket to do der encoding of sharedInfo
Added der_writer functions for writing octet string primitives.
Generate OID's for key wrapping algorithms used by X942 KDF.
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/12554)
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 3a0dafda11..ecbc524829 100644 --- a/.gitignore +++ b/.gitignore @@ -34,10 +34,12 @@ providers/common/der/der_digests_gen.c providers/common/der/der_dsa_gen.c providers/common/der/der_ec_gen.c providers/common/der/der_rsa_gen.c +providers/common/der/der_wrap_gen.c providers/common/include/prov/der_dsa.h providers/common/include/prov/der_ec.h providers/common/include/prov/der_rsa.h providers/common/include/prov/der_digests.h +providers/common/include/prov/der_wrap.h # error code files /crypto/err/openssl.txt.old |