root
/
openssl
mirror of https://github.com/openssl/openssl.git
1
0
Fork 0
Code Issues Actions 7 Packages Projects Releases Wiki Activity
32,863 Commits 32 Branches 398 Tags 545 MiB
Commit Graph

11 Commits

Author SHA1 Message Date
Dr. David von Oheimb 2d0e1fc59e replace various calls to sprintf() by BiO_snprintf() to avoid compiler warnings, e.g., on MacOS 
Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com>
Reviewed-by: Saša Nedvědický <sashan@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/25534)

(cherry picked from commit 2c536c8b15)
 2024-10-12 15:57:32 +02:00
Richard Levitte aad5c78403 Copyright year updates 
Reviewed-by: Matt Caswell <matt@openssl.org>
Release: yes
 2023-09-19 14:57:48 +02:00
Olga Batyshkina cdc4f2b507 Fix PKCS#12 creation error when certificate contains auxiliary data 
Prefer friendly name passed by the caller and calculated local
key id to ones found in certificate auxiliary data when creating
PKCS#12.

Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/21675)

(cherry picked from commit 388a8e7314)
 2023-09-15 16:13:33 +02:00
Tomas Mraz 967f201440 Update copyright year 
Reviewed-by: Matt Caswell <matt@openssl.org>
Release: yes
(Merged from https://github.com/openssl/openssl/pull/19803)
 2022-12-01 12:47:05 +01:00
FdaSilvaYY fe60601927 Cleanup : directly include of `internal/nelem.h` when required. 
And so clean a few useless includes

Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/19721)

(cherry picked from commit f2a6f83862)
 2022-11-23 18:15:39 +01:00
Shane Lontis da5f770ae3 Fix PKCS12_create() so that a fetch error is not added to the error stack. 
Fixes #15392

PBE algorithms such as NID_pbe_WithSHA1And3_Key_TripleDES_CBC will
currently always fail to the EVP_CIPHER_fetch() call, so the fallback to
a legacy algorithm always happens. In this case the error stack should
ignore the fetch error.

Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15473)
 2021-05-28 13:54:19 +02:00
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