projects / openssl.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: eabb301) | patch
Fix merge problem in d2i_PrivateKey_ex
authorShane Lontis <shane.lontis@oracle.com>
Fri, 19 Feb 2021 09:43:16 +0000 (19:43 +1000)
committerShane Lontis <shane.lontis@oracle.com>
Fri, 19 Feb 2021 09:43:16 +0000 (19:43 +1000)
commit3352dc185fde9861b58ca7621b4062bb42ec1b55
treebf70faceaba677119cb1ac14ebb4f863ab88a9f0tree | snapshot
parenteabb3014165a1319ceb8a69cc135feb99f288293commit | diff
Fix merge problem in d2i_PrivateKey_ex

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14243)
crypto/asn1/d2i_pr.c diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.