aboutsummaryrefslogtreecommitdiffstats
path: root/crypto/pkcs12/p12_crpt.c
Commit message (Collapse)AuthorAgeFilesLines
* Don't switch password formats using global state.Andy Polyakov2016-08-251-17/+1
| | | | | | | To avoid possible race conditions don't switch password format using global state in crypto/pkcs12 Reviewed-by: Richard Levitte <levitte@openssl.org>
* crypto/pkcs12: facilitate accessing data with non-interoperable password.Andy Polyakov2016-08-221-4/+27
| | | | | | | | | | | Originally PKCS#12 subroutines treated password strings as ASCII. It worked as long as they were pure ASCII, but if there were some none-ASCII characters result was non-interoperable. But fixing it poses problem accessing data protected with broken password. In order to make asscess to old data possible add retry with old-style password. Reviewed-by: Richard Levitte <levitte@openssl.org>
* Copyright consolidation 09/10Rich Salz2016-05-171-54/+5
| | | | Reviewed-by: Richard Levitte <levitte@openssl.org>
* Remove /* foo.c */ commentsRich Salz2016-01-261-1/+0
| | | | | | | | | | | | This was done by the following find . -name '*.[ch]' | /tmp/pl where /tmp/pl is the following three-line script: print unless $. == 1 && m@/\* .*\.[ch] \*/@; close ARGV if eof; # Close file to reset $. And then some hand-editing of other files. Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
* RT4002: check for NULL cipher in p12_crpt.cEmilia Kasper2015-09-011-0/+3
| | | | | | | | 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>
* Identify and move common internal libcrypto header filesRichard Levitte2015-05-141-1/+1
| | | | | | | | | | | | | There are header files in crypto/ that are used by a number of crypto/ submodules. Move those to crypto/include/internal and adapt the affected source code and Makefiles. The header files that got moved are: crypto/cryptolib.h crypto/md32_common.h Reviewed-by: Rich Salz <rsalz@openssl.org>
* Remove duplicate code.Dr. Stephen Henson2015-03-301-8/+2
| | | | | | | Update code to use ASN1_TYPE_pack_sequence and ASN1_TYPE_unpack_sequence instead of performing the same operation manually. Reviewed-by: Rich Salz <rsalz@openssl.org>
* Run util/openssl-format-source -v -c .Matt Caswell2015-01-221-41/+45
| | | | Reviewed-by: Tim Hudson <tjh@openssl.org>
* Update obsolete email address...Dr. Stephen Henson2008-11-051-1/+1
|
* Change builting PBE to use static table. Add entries for HMAC and MD5, GOST.Dr. Stephen Henson2006-05-151-19/+1
|
* improved error checking and some fixesNils Larsch2005-07-261-2/+7
| | | | | | PR: 1170 Submitted by: Yair Elharrar Reviewed and edited by: Nils Larsch
* Fix more error codes.Bodo Möller2005-05-111-2/+2
| | | | | (Also improve util/ck_errf.pl script, and occasionally fix source code formatting.)
* Check return code of EVP_CipherInit() in PKCS#12 code.Dr. Stephen Henson2004-11-241-3/+3
|
* Constify d2i, s2i, c2i and r2i functions and other associatedRichard Levitte2004-03-151-1/+2
| | | | | | | | functions and macros. This change has associated tags: LEVITTE_before_const and LEVITTE_after_const. Those will be removed when this change has been properly reviewed.
* Cleanse memory using the new OPENSSL_cleanse() function.Richard Levitte2002-11-281-2/+2
| | | | I've covered all the memset()s I felt safe modifying, but may have missed some.
* Modify EVP cipher behaviour in a similar wayDr. Stephen Henson2001-10-171-1/+1
| | | | to digests to retain compatibility.
* Change the EVP_somecipher() and EVP_somedigest()Dr. Stephen Henson2001-03-091-1/+1
| | | | | | | functions to return constant EVP_MD and EVP_CIPHER pointers. Update docs.
* Make all configuration macros available for application by makingRichard Levitte2001-02-191-3/+3
| | | | | | | | | | | | sure they are available in opensslconf.h, by giving them names starting with "OPENSSL_" to avoid conflicts with other packages and by making sure e_os2.h will cover all platform-specific cases together with opensslconf.h. I've checked fairly well that nothing breaks with this (apart from external software that will adapt if they have used something like NO_KRB5), but I can't guarantee it completely, so a review of this change would be a good thing.
* Missing #ifdef NO_DESUlf Möller1999-11-171-0/+2
|
* Two new functions to write out PKCS#8 private keys. Also fixes for some ofDr. Stephen Henson1999-06-101-1/+1
| | | | | the the PBE code and a new constant PKCS5_DEFAULT_ITER for the default iteration count if it is passed as zero.
* This is the main PKCS#5 v2.0 key generation function, it parses the ASN1Dr. Stephen Henson1999-06-071-2/+2
| | | | | structure and decides what key to generate (if any). Not currently added to the PBE algorithm list because it is largely untested.
* Change PBE handling a bit more: now the key and iv generator does callsDr. Stephen Henson1999-06-061-3/+6
| | | | | EVP_CipherInit() this because the IV wont be easily available when doing PKCS#5 v2.0
* Rewrite PBE handling read to support PKCS#5 v2.0 and update the functionDr. Stephen Henson1999-06-061-2/+21
| | | | list for Win32.
* New Configure option no-<cipher> (rsa, idea, rc5, ...).Ulf Möller1999-04-271-0/+4
|
* Change #include filenames from <foo.h> to <openssl.h>.Bodo Möller1999-04-231-1/+1
| | | | | | Submitted by: Reviewed by: PR:
* Work with -pedantic!Ben Laurie1999-04-231-2/+2
|
* Change functions to ANSI C.Ulf Möller1999-04-191-11/+4
|
* Include pkcs12 program as part of openssl. This completes most of the PKCS#12Dr. Stephen Henson1999-03-291-2/+1
| | | | integration.
* Yet more PKCS#12 integration: add lots of files under crypto/pkcs12 and addDr. Stephen Henson1999-03-281-0/+104
them to the build environment.