summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Macro typo fix not propagatedPauli2019-02-131-1/+1
| | | | | Reviewed-by: Tim Hudson <tjh@openssl.org> (Merged from https://github.com/openssl/openssl/pull/8217)
* Fix typo in commentPauli2019-02-131-1/+1
| | | | | Reviewed-by: Paul Yang <yang.yang@baishancloud.com> (Merged from https://github.com/openssl/openssl/pull/8218)
* To use BN_BITS2, we'd better include openssl/bn.hRichard Levitte2019-02-121-0/+1
| | | | | Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/8212)
* eng_devcrypto.c: close open session on initEneas U de Queiroz2019-02-121-6/+20
| | | | | | | | | | | | cipher_init may be called on an already initialized context, without a necessary cleanup. This separates cleanup from initialization, closing an eventual open session before creating a new one. Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com> Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/7859)
* CHANGES: add note about building devcrypto dynamicEneas U de Queiroz2019-02-121-0/+3
| | | | | | | | Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com> Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/7859)
* e_devcrypto: make the /dev/crypto engine dynamicEneas U de Queiroz2019-02-124-63/+121
| | | | | | | | | | | Engine has been moved from crypto/engine/eng_devcrypto.c to engines/e_devcrypto.c. Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com> Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/7859)
* AArch64 assembly pack: authenticate return addresses.Andy Polyakov2019-02-128-1/+77
| | | | | | | | | | | | ARMv8.3 adds pointer authentication extension, which in this case allows to ensure that, when offloaded to stack, return address is same at return as at entry to the subroutine. The new instructions are nops on processors that don't implement the extension, so that the vetification is backward compatible. Reviewed-by: Kurt Roeckx <kurt@roeckx.be> Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/8205)
* Add sparse array data type.Pauli2019-02-128-3/+680
| | | | | | | | | | This commit adds a space and time efficient sparse array data structure. The structure's raw API is wrapped by inline functions which provide type safety. Reviewed-by: Richard Levitte <levitte@openssl.org> Reviewed-by: Nicola Tuveri <nic.tuv@gmail.com> (Merged from https://github.com/openssl/openssl/pull/8197)
* Rework build: small correction in unix-Makefile.tmplRichard Levitte2019-02-111-1/+1
| | | | | Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/8162)
* Rework build: add special cases for AIXRichard Levitte2019-02-112-2/+28
| | | | | | | | | | | When reworking the way library file names and extensions were formed, AIX was lost in the process. This restores the previous functionality. Fixes #8156 Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/8162)
* apps/ocsp.c Use the same HAVE_FORK / NO_FORK as in speed.cRichard Levitte2019-02-111-1/+15
| | | | | | | | | | This allows the user to override our defaults if needed, and in a consistent manner. Partial fix for #7607 Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/7624)
* test/recipes/02-err_errstr: skip errors that may not be loaded on WindowsRichard Levitte2019-02-111-0/+37
| | | | | | | | | Fixes #8091 Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/8094) (cherry picked from commit 0e1b0e510dfe078b3fb2586d987d7b49ff8ef0b2)
* Build: correct BASE shlib_version_as_filenameRichard Levitte2019-02-111-2/+2
| | | | | | | | | This function is designed to use $config{shlib_version} directly instead of taking an input argument, yet the BASE variant didn't do this. Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/8146)
* ENGINE modules aren't special, so call them MODULESRichard Levitte2019-02-119-83/+90
| | | | | | | | | | | | | | | The only thing that makes an ENGINE module special is its entry points. Other than that, it's a normal dynamically loadable module, nothing special about it. This change has us stop pretending anything else. We retain using ENGINE as a term for installation, because it's related to a specific installation directory, and we therefore also mark ENGINE modules specifically as such with an attribute in the build.info files. Reviewed-by: Nicola Tuveri <nic.tuv@gmail.com> (Merged from https://github.com/openssl/openssl/pull/8147)
* Updated test command line parsing to support commmon commandsShane Lontis2019-02-1146-876/+1402
| | | | | | Reviewed-by: Paul Dale <paul.dale@oracle.com> Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/6975)
* Allow the syntax of the .include directive to optionally have '='Tomas Mraz2019-02-115-2/+26
| | | | | | | | | | | | | If the old openssl versions not supporting the .include directive load a config file with it, they will bail out with error. This change allows using the .include = <filename> syntax which is interpreted as variable assignment by the old openssl config file parser. Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/8141)
* Fix comment typoPauli2019-02-111-1/+1
| | | | | Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/8196)
* Fix null pointer dereference in ssl_module_initDaniel DeFreez2019-02-101-0/+2
| | | | | | | | CLA: Trivial Reviewed-by: Paul Yang <yang.yang@baishancloud.com> Reviewed-by: Paul Dale <paul.dale@oracle.com> (Merged from https://github.com/openssl/openssl/pull/8183)
* Update d2i_PrivateKey documentationTodd Short2019-02-081-7/+11
| | | | | | Reviewed-by: Paul Yang <yang.yang@baishancloud.com> Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/8168)
* Fix d2i_PublicKey() for EC keysTodd Short2019-02-081-1/+1
| | | | | | | | | | | | | | | | | | | | | o2i_ECPublicKey() requires an EC_KEY structure filled with an EC_GROUP. o2i_ECPublicKey() is called by d2i_PublicKey(). In order to fulfill the o2i_ECPublicKey()'s requirement, d2i_PublicKey() needs to be called with an EVP_PKEY with an EC_KEY containing an EC_GROUP. However, the call to EVP_PKEY_set_type() frees any existing key structure inside the EVP_PKEY, thus freeing the EC_KEY with the EC_GROUP that o2i_ECPublicKey() needs. This means you can't d2i_PublicKey() for an EC key... The fix is to check to see if the type is already set appropriately, and if so, not call EVP_PKEY_set_type(). Reviewed-by: Paul Yang <yang.yang@baishancloud.com> Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/8168)
* Address a bug in the DRBG tests where the reseeding wasn't properlyPauli2019-02-081-3/+3
| | | | | | | | | reinstantiating the DRBG. Bug reported by Doug Gibbons. Reviewed-by: Paul Yang <yang.yang@baishancloud.com> (Merged from https://github.com/openssl/openssl/pull/8184)
* test/drbgtest.c: call OPENSSL_thread_stop() explicitlyRichard Levitte2019-02-071-0/+10
| | | | | | | | | | | | The manual says this in its notes: ... and therefore applications using static linking should also call OPENSSL_thread_stop() on each thread. ... Fixes #8171 Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com> (Merged from https://github.com/openssl/openssl/pull/8173)
* Make OPENSSL_malloc_init() a no-opMatt Caswell2019-02-072-11/+4
| | | | | | | | | | Making this a no-op removes a potential infinite loop than can occur in some situations. Fixes #2865 Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/8167)
* Add CHANGES entry for blake2macAntoine Salon2019-02-071-0/+3
| | | | | | | | Signed-off-by: Antoine Salon <asalon@vmware.com> Reviewed-by: Richard Levitte <levitte@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/8172)
* blake2: avoid writing to output buffer when using default digest lengthAntoine Salon2019-02-062-10/+24
| | | | | | | | Signed-off-by: Antoine Salon <asalon@vmware.com> Reviewed-by: Richard Levitte <levitte@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/7726)
* blake2: add evpmac test vectorsAntoine Salon2019-02-062-4/+252
| | | | | | | | Signed-off-by: Antoine Salon <asalon@vmware.com> Reviewed-by: Richard Levitte <levitte@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/7726)
* blake2: backport changes to blake2sAntoine Salon2019-02-0610-11/+264
| | | | | | | | Signed-off-by: Antoine Salon <asalon@vmware.com> Reviewed-by: Richard Levitte <levitte@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/7726)
* blake2: add EVP_MAC man pageAntoine Salon2019-02-062-7/+124
| | | | | | | | Signed-off-by: Antoine Salon <asalon@vmware.com> Reviewed-by: Richard Levitte <levitte@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/7726)
* blake2: register MAC objectsAntoine Salon2019-02-066-3/+26
| | | | | | | | Signed-off-by: Antoine Salon <asalon@vmware.com> Reviewed-by: Richard Levitte <levitte@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/7726)
* blake2b: add EVP_MAC APIAntoine Salon2019-02-067-1/+203
| | | | | | | | Signed-off-by: Antoine Salon <asalon@vmware.com> Reviewed-by: Richard Levitte <levitte@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/7726)
* blake2b: add support for parameter setting and keyed hashAntoine Salon2019-02-063-7/+70
| | | | | | | | | | | The param block structure is used as a container for parameter values Added blake2b keyed init Signed-off-by: Antoine Salon <asalon@vmware.com> Reviewed-by: Richard Levitte <levitte@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/7726)
* blake2: add implementation support for variable digest lengthAntoine Salon2019-02-063-9/+19
| | | | | | | | Signed-off-by: Antoine Salon <asalon@vmware.com> Reviewed-by: Richard Levitte <levitte@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/7726)
* Remove unnecessary trailing whitespaceSam Roberts2019-02-0563-113/+113
| | | | | | | | | | | | Trim trailing whitespace. It doesn't match OpenSSL coding standards, AFAICT, and it can cause problems with git tooling. Trailing whitespace remains in test data and external source. Reviewed-by: Kurt Roeckx <kurt@roeckx.be> Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com> Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/8092)
* crypto/poly1305/asm/poly1305-s390x.pl: add vx code path.Patrick Steuer2019-02-051-164/+780
| | | | | | | | Signed-off-by: Patrick Steuer <patrick.steuer@de.ibm.com> Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/7991)
* Make some simple getters take const SSL/SSL_CTXSam Roberts2019-02-055-25/+25
| | | | | | Reviewed-by: Kurt Roeckx <kurt@roeckx.be> Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/8145)
* Fix Invalid Argument return code from IP_Factory in connect_to_server().Matthias Kraft2019-02-041-1/+1
| | | | | | | | Fixes #7732 Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/8158)
* Android build: fix usage of NDK home variable ($ndk_var)batist732019-02-041-1/+2
| | | | | | | | CLA: trivial Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/8153)
* Build: correct assembler generation in crypto/rc4/build.infoRichard Levitte2019-02-041-2/+2
| | | | | | | | | | | In the removal of BEGINRAW / ENDRAW, attention to the difference between capital .S and lowercase .s wasn't duly paid. This corrects the error. Fixes #8155 Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/8157)
* Add an entry to the CHANGES for the d2i_X509_PUBKEY fixBernd Edlinger2019-02-011-0/+4
| | | | | | | | The commit 5dc40a83c74be579575a512b30d9c1e0364e6a7b forgot to add a short description to the CHANGES file. Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/8144)
* VMS: Clean away stray debugging prints from descrip.mms.tmplRichard Levitte2019-02-011-5/+0
| | | | | | Reviewed-by: Tim Hudson <tjh@openssl.org> Reviewed-by: Paul Dale <paul.dale@oracle.com> (Merged from https://github.com/openssl/openssl/pull/8140)
* Fix end-point shared secret for DTLS/SCTPMichael Tuexen2019-02-0115-7/+330
| | | | | | | | | | | | | When computing the end-point shared secret, don't take the terminating NULL character into account. Please note that this fix breaks interoperability with older versions of OpenSSL, which are not fixed. Fixes #7956 Reviewed-by: Kurt Roeckx <kurt@roeckx.be> Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/7957)
* poly1305/asm/poly1305-ppc.pl: add vector base 2^26 implementation.Andy Polyakov2019-02-012-111/+1452
| | | | | | Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/8120)
* perlasm/ppc-xlate.pl: add VSX word load/store instructions.Andy Polyakov2019-02-011-0/+2
| | | | | | Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/8120)
* Fix a crash in reuse of i2d_X509_PUBKEYBernd Edlinger2019-01-312-0/+50
| | | | | | | If the second PUBKEY is malformed there is use after free. Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/8122)
* Fixed d2i_X509 in-place not re-hashing the ex_flagsBernd Edlinger2019-01-312-0/+32
| | | | | Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/8116)
* Fix a memory leak with di2_X509_CRL reuseBernd Edlinger2019-01-312-0/+27
| | | | | | | | | | Additionally avoid undefined behavior with in-place memcpy in X509_CRL_digest. Fixes #8099 Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/8112)
* Better phrasing around 1.1.0Richard Levitte2019-01-311-5/+5
| | | | | | | | Fixes #8129 Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com> (Merged from https://github.com/openssl/openssl/pull/8130)
* Configure: clean away unused variables and double assignmentsRichard Levitte2019-01-311-5/+0
| | | | | Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/8125)
* Build: clean away RENAME and SHARED_NAMERichard Levitte2019-01-311-4/+0
| | | | | Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/8125)
* Build: remove EXTRARichard Levitte2019-01-313-11/+2
| | | | | | | We never used it for anything Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/8125)