summaryrefslogtreecommitdiffstats
path: root/crypto/pkcs12
AgeCommit message (Collapse)Author
2016-05-06Constify PKCS12_newpass()Dr. Stephen Henson
PR#4449 Reviewed-by: Rich Salz <rsalz@openssl.org> (cherry picked from commit 049f5bbce3eebdf4ec2030042eb2ae64bb67aedb) Conflicts: doc/crypto/PKCS12_newpass.pod
2016-05-06Tidy up PKCS12_newpass() fix memory leaks.Dr. Stephen Henson
PR#4466 Reviewed-by: Rich Salz <rsalz@openssl.org> (cherry picked from commit d800d0f45b7618c30692c01d4dbf96042468b932) Conflicts: crypto/pkcs12/p12_npas.c
2015-10-23Set salt length after the malloc has succeededAlessandro Ghedini
Reviewed-by: Rich Salz <rsalz@openssl.org> Reviewed-by: Richard Levitte <levitte@openssl.org> (cherry picked from commit c2319cf9fce87a2e82efb6e58ced11a85190dc3d)
2015-10-23Fix memory leaks and other mistakes on errorsAlessandro Ghedini
Reviewed-by: Rich Salz <rsalz@openssl.org> Reviewed-by: Richard Levitte <levitte@openssl.org> (cherry picked from commit 3f6c7691870d1cd2ad0e0c83638cef3f35a0b548)
2015-09-15RT4044: Remove .cvsignore files.Rich Salz
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-09-01RT4002: check for NULL cipher in p12_crpt.cEmilia Kasper
The NULL cipher case can't actually happen because we have no EVP_PBE_CTL combinations where cipher_nid is -1 and keygen is PKCS12_PBE_keyivgen. But make the code more obviously correct. Reviewed-by: Matt Caswell <matt@openssl.org> (cherry picked from commit 394f7b6fcc38132b8ccff0a3253b9dd15640cfc0)
2015-06-25Don't output bogus errors in PKCS12_parseDr. Stephen Henson
PR#3923 Reviewed-by: Tim Hudson <tjh@openssl.org> (cherry picked from commit ffbf304d4832bd51bb0618f8ca5b7c26647ee664)
2015-06-08Use CRYPTO_memcmp when comparing authenticatorsEmilia Kasper
Pointed out by Victor Vasiliev (vasilvv@mit.edu) via Adam Langley (Google). Reviewed-by: Rich Salz <rsalz@openssl.org> (cherry picked from commit 1e4a355dcabe2f75df5bb8b41b394d37037169d2)
2015-05-23Fix the update target and remove duplicate file updatesRichard Levitte
We had updates of certain header files in both Makefile.org and the Makefile in the directory the header file lived in. This is error prone and also sometimes generates slightly different results (usually just a comment that differs) depending on which way the update was done. This removes the file update targets from the top level Makefile, adds an update: target in all Makefiles and has it depend on the depend: or local_depend: targets, whichever is appropriate, so we don't get a double run through the whole file tree. Reviewed-by: Rich Salz <rsalz@openssl.org> (cherry picked from commit 0f539dc1a2f45580435c39dada44dd276e79cb88) Conflicts: Makefile.org apps/Makefile test/Makefile
2015-01-22Run util/openssl-format-source -v -c .Matt Caswell
Reviewed-by: Tim Hudson <tjh@openssl.org>
2014-05-29Fix memory leak.František Bořánek
PR#3278 (cherry picked from commit de56fe797081fc09ebd1add06d6e2df42a324fd5)
2014-05-21Fix for PKCS12_create if no-rc2 specified.Dr. Stephen Henson
Use triple DES for certificate encryption if no-rc2 is specified. PR#3357
2014-03-01PKCS#8 support for alternative PRFs.Dr. Stephen Henson
Add option to set an alternative to the default hmacWithSHA1 PRF for PKCS#8 private key encryptions. This is used automatically by PKCS8_encrypt if the nid specified is a PRF. Add option to pkcs8 utility. Update docs.
2014-03-01Fix memory leak.Dr. Stephen Henson
2013-09-18Fix warning.Dr. Stephen Henson
2013-06-05Don't use RC2 with PKCS#12 files in FIPS mode.Dr. Stephen Henson
(cherry picked from commit cdb6c48445ded3daafab32e5f266943d07bb512b)
2012-06-03Reduce version skew: trivia (I hope).Ben Laurie
2012-02-27PR: 2737Dr. Stephen Henson
Submitted by: Remi Gacogne <rgacogne-bugs@coredump.fr> Fix double free in PKCS12_parse if we run out of memory.
2011-06-03Backport libcrypto audit: check return values of EVP functions insteadDr. Stephen Henson
of assuming they will always suceed.
2010-10-11PR: 2295Dr. Stephen Henson
Submitted by: Alexei Khlebnikov <alexei.khlebnikov@opera.com> Reviewed by: steve OOM checking. Leak in OOM fix. Fall-through comment. Duplicate code elimination.
2010-03-28PR: 1696Dr. Stephen Henson
Check return value if d2i_PBEPARAM().
2009-06-17Update from HEAD.Dr. Stephen Henson
2009-04-04Fix warning.Ben Laurie
2009-04-02Make PKCS12_parse() handle some PKCS#12 files which have their own ideasDr. Stephen Henson
about settings for local key id...
2009-03-09Update from stable branch.Dr. Stephen Henson
2008-12-29If we're going to return errors (no matter how stupid), then we shouldBen Laurie
test for them!
2008-11-12Revert the size_t modifications from HEAD that had led to moreGeoff Thorpe
knock-on work than expected - they've been extracted into a patch series that can be completed elsewhere, or in a different branch, before merging back to HEAD.
2008-11-05Update obsolete email address...Dr. Stephen Henson
2008-11-02Fix warnings.Ben Laurie
2008-06-26Update from stable branch.Dr. Stephen Henson
2006-11-21Update from 0.9.8 stable. Eliminate duplicate error codes.Dr. Stephen Henson
2006-11-16Remove redundant PREDECLARE statement.Dr. Stephen Henson
2006-05-17PKCS#12 mac key length should equal digest length.Dr. Stephen Henson
2006-05-15Change builting PBE to use static table. Add entries for HMAC and MD5, GOST.Dr. Stephen Henson
2006-05-15Add feature to PKCS12_create() if the encryption NID corresponds to aDr. Stephen Henson
supported encryption algorithm instead of a PBE NID then use that algorithm with PBES2.
2006-02-04Update filenames in makefiles.Dr. Stephen Henson
2005-07-26improved error checking and some fixesNils Larsch
PR: 1170 Submitted by: Yair Elharrar Reviewed and edited by: Nils Larsch
2005-06-30Check PKCS7 structures in PKCS#12 files are of type data.Dr. Stephen Henson
2005-05-16Further BUILDENV refinement, further fool-proofing of Makefiles andAndy Polyakov
[most importantly] put back dependencies accidentaly eliminated in check-in #13342.
2005-05-15Fool-proofing MakefilesAndy Polyakov
2005-05-15Make -CSP option work again in pkcs12 utility by checking forDr. Stephen Henson
attribute in EVP_PKEY structure.
2005-05-11Fix more error codes.Bodo Möller
(Also improve util/ck_errf.pl script, and occasionally fix source code formatting.)
2005-04-12Rebuild error codes.Dr. Stephen Henson
2005-04-11Add emacs cache files to .cvsignore.Richard Levitte
2005-03-30Blow away Makefile.ssl.Ben Laurie
2004-12-05Add lots of checks for memory allocation failure, error codes to indicateDr. Stephen Henson
failure and freeing up memory if a failure occurs. PR:620
2004-11-24Check return code of EVP_CipherInit() in PKCS#12 code.Dr. Stephen Henson
2004-11-02Don't use $(EXHEADER) directly in for loops, as most shells will breakRichard Levitte
if $(EXHEADER) is empty. Notified by many, solution suggested by Carson Gaspar <carson@taltos.org>
2004-05-17After the latest round of header-hacking, regenerate the dependencies inGeoff Thorpe
the Makefiles. NB: this commit is probably going to generate a huge posting and it is highly uninteresting to read.
2004-05-17Deprecate the recursive includes of bn.h from various API headers (asn1.h,Geoff Thorpe
dh.h, dsa.h, ec.h, ecdh.h, ecdsa.h, rsa.h), as the opaque bignum types are already declared in ossl_typ.h. Add explicit includes for bn.h in those C files that need access to structure internals or API functions+macros.