Jon Spillett
592ea4ba94
Fixes #15070 . Allow custom algorithm ID ASN.1 encoding for provided ciphers
...
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15130 )
2021-05-07 11:00:54 +02:00
Matt Caswell
aff636a489
Update copyright year
...
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15181 )
2021-05-06 13:03:23 +01:00
Jon Spillett
b536880c45
Add library context and property query support into the PKCS12 API
...
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14434 )
2021-04-30 09:15:50 +10:00
Dr. David von Oheimb
20f8bc7255
test cleanup: move helper .c and .h files to test/helpers/
...
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/13568 )
2020-12-01 07:49:38 +01:00
Jon Spillett
c5ec6dcf0b
Add new APIs to get PKCS12 secretBag OID and value
...
Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/10063 )
2020-08-07 07:59:48 +10:00
