aboutsummaryrefslogtreecommitdiffstats
path: root/crypto/asn1/p5_pbev2.c
Commit message (Collapse)AuthorAgeFilesLines
* Clean one unused variable, plus an useless one.FdaSilvaYY2017-01-181-6/+2
| | | | | Reviewed-by: Rich Salz <rsalz@openssl.org> Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/1906)
* Copyright consolidation 08/10Rich Salz2016-05-171-54/+5
| | | | Reviewed-by: Richard Levitte <levitte@openssl.org>
* Update pkcs8 defaults.Dr. Stephen Henson2016-05-111-1/+1
| | | | | | | | Update pkcs8 utility to use 256 bit AES using SHA256 by default. Update documentation. Reviewed-by: Viktor Dukhovni <viktor@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>
* Adapt all EVP_CIPHER_CTX users for it becoming opaqueRichard Levitte2016-01-121-7/+10
| | | | Reviewed-by: Rich Salz <rsalz@openssl.org>
* Continue standardising malloc style for libcryptoMatt Caswell2015-11-091-2/+2
| | | | | | | Continuing from previous commit ensure our style is consistent for malloc return checks. Reviewed-by: Kurt Roeckx <kurt@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>
* Use p==NULL not !p (in if statements, mainly)Rich Salz2015-05-111-9/+8
| | | | Reviewed-by: Tim Hudson <tjh@openssl.org>
* Remove duplicate code.Dr. Stephen Henson2015-03-301-11/+4
| | | | | | | 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>
* RAND_bytes updatesMatt Caswell2015-03-251-2/+2
| | | | | | | Ensure RAND_bytes return value is checked correctly, and that we no longer use RAND_pseudo_bytes. Reviewed-by: Richard Levitte <levitte@openssl.org>
* Remove old ASN.1 code.Dr. Stephen Henson2015-03-231-2/+2
| | | | | | | | | Remove old M_ASN1_ macros and replace any occurences with the corresponding function. Remove d2i_ASN1_bytes, d2i_ASN1_SET, i2d_ASN1_SET: no longer used internally. Reviewed-by: Rich Salz <rsalz@openssl.org>
* Run util/openssl-format-source -v -c .Matt Caswell2015-01-221-181/+181
| | | | Reviewed-by: Tim Hudson <tjh@openssl.org>
* Fix memory leak.Dr. Stephen Henson2011-02-071-0/+2
|
* Split PBES2 into cipher and PBKDF2 versions. This tidies the code somewhatDr. Stephen Henson2009-11-251-49/+91
| | | | and is a pre-requisite to adding password based CMS support.
* Audit libcrypto for unchecked return values: fix all cases enounteredDr. Stephen Henson2009-09-231-1/+2
|
* Update obsolete email address...Dr. Stephen Henson2008-11-051-1/+1
|
* Initial, incomplete support for typesafe macros without using functionDr. Stephen Henson2006-11-161-2/+2
| | | | casts.
* Fix various error codes to match functions.Dr. Stephen Henson2006-07-171-3/+3
|
* Extended PBES2 function supporting application supplied IV and PRF NID.Dr. Stephen Henson2006-05-171-8/+23
|
* Add PRF preference ctrl to ciphers.Dr. Stephen Henson2006-05-151-2/+17
|
* Give everything prototypes (well, everything that's actually used).Ben Laurie2005-03-311-2/+2
|
* PKCS#8 fixes from stable branch.Dr. Stephen Henson2004-07-041-3/+5
|
* Add missing EVP_CIPHER_CTX_init call.Dr. Stephen Henson2002-05-181-0/+2
|
* Modify EVP cipher behaviour in a similar wayDr. Stephen Henson2001-10-171-1/+1
| | | | to digests to retain compatibility.
* Get rid of ASN1_ITEM_FUNCTIONS dummy functionDr. Stephen Henson2001-02-231-2/+2
| | | | | | prototype hack. This unfortunately means that every ASN1_*_END construct cannot have a trailing ;
* Merge from the ASN1 branch of new ASN1 codeDr. Stephen Henson2000-12-081-94/+13
| | | | | | to main trunk. Lets see if the makes it to openssl-cvs :-)
* There have been a number of complaints from a number of sources that namesRichard Levitte2000-06-011-3/+3
| | | | | | | | | like Malloc, Realloc and especially Free conflict with already existing names on some operating systems or other packages. That is reason enough to change the names of the OpenSSL memory allocation macros to something that has a better chance of being unique, like prepending them with OPENSSL_. This change includes all the name changes needed throughout all C files.
* Fix for previous patch: If RAND_pseudo_bytes returns 0, this is not an error.Bodo Möller2000-03-031-2/+3
|
* Use RAND_pseudo_bytes, not RAND_bytes, for IVs/salts.Bodo Möller2000-03-021-1/+1
|
* Make pkcs8 work again.Dr. Stephen Henson2000-02-221-2/+2
| | | | | Make EVP_CIPHER_type() return NID_undef if the cipher has no ASN1 OID, modify code to handle this.
* Seek out and destroy another evil cast.Ulf Möller2000-01-301-2/+2
|
* Check RAND_bytes() return value or use RAND_pseudo_bytes().Ulf Möller2000-01-211-2/+2
|
* Add OIDs for idea and blowfish. Unfortunately these are inDr. Stephen Henson1999-12-291-3/+10
| | | | the middle of the OID table so the diff is rather large :-(
* Replace the macros in asn1.h with function equivalents. Also make UTF8StringsDr. Stephen Henson1999-10-201-6/+6
| | | | tolerated in certificates.
* Torture weak compilers less by not automatically including x509.h whereBodo Möller1999-07-211-0/+1
| | | | it is not needed.
* Two new functions to write out PKCS#8 private keys. Also fixes for some ofDr. Stephen Henson1999-06-101-0/+1
| | | | | the the PBE code and a new constant PKCS5_DEFAULT_ITER for the default iteration count if it is passed as zero.
* Complete support for PKCS#5 v2.0. Still needs extensive testing.Dr. Stephen Henson1999-06-081-3/+3
|
* This is the main PKCS#5 v2.0 key generation function, it parses the ASN1Dr. Stephen Henson1999-06-071-1/+0
| | | | | structure and decides what key to generate (if any). Not currently added to the PBE algorithm list because it is largely untested.
* More PKCS#5 v2.0 development. Add a function to setup a PKCS#5 v2.0Dr. Stephen Henson1999-06-061-4/+115
| | | | AlgorithmIdentifier and make various ASN1 fixes.
* Remove NOPROTO definitions and error code comments.Ulf Möller1999-04-261-7/+0
|
* Change #include filenames from <foo.h> to <openssl.h>.Bodo Möller1999-04-231-2/+2
| | | | | | Submitted by: Reviewed by: PR:
* Change functions to ANSI C.Ulf Möller1999-04-191-20/+9
|
* Add PKCS#5 v2.0 ASN1 structures.Dr. Stephen Henson1999-04-081-0/+180