summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2016-09-17Have the configuration options 'no-err' and 'no-async' work againRichard Levitte
In an earlier attempt to simplify the processing of disabled options, 'no-err' and 'no-async' stopped working properly. 'err' and 'async' are directories under 'crypto/', but they are special insofar that they can't be simply skipped, like all the algorithm directories can, so they need special treatment among the disablable things. Reviewed-by: Tim Hudson <tjh@openssl.org>
2016-09-17Simplify configudata.pm dependency generationRichard Levitte
While we're at it, correct the fault in windows-makefile.tmpl Reviewed-by: Andy Polyakov <appro@openssl.org>
2016-09-17Remove an useless definition.FdaSilvaYY
APP_INFO is currently a field of MEM struct. Reviewed-by: Andy Polyakov <appro@openssl.org> Reviewed-by: Rich Salz <rsalz@openssl.org> (Merged from https://github.com/openssl/openssl/pull/1583)
2016-09-16Use switch instead of multiple ifsAlessandro Ghedini
Makes the logic a little bit clearer. Reviewed-by: Andy Polyakov <appro@openssl.org> Reviewed-by: Rich Salz <rsalz@openssl.org> (Merged from https://github.com/openssl/openssl/pull/1571)
2016-09-16Simplify the dependencies for remaking configdata.pmRichard Levitte
Reviewed-by: Andy Polyakov <appro@openssl.org>
2016-09-16Rearrange the storage of build file template names in %configRichard Levitte
They are now relative paths as well Reviewed-by: Andy Polyakov <appro@openssl.org>
2016-09-16Use the registered conf file names as dependencies to build configdata.pmRichard Levitte
Reviewed-by: Andy Polyakov <appro@openssl.org>
2016-09-16Register the name of the config file each config target was found inRichard Levitte
Reviewed-by: Andy Polyakov <appro@openssl.org>
2016-09-15Revert "Abort on unrecognised warning alerts"Matt Caswell
This reverts commit 77a6be4dfc2ecf406c2559a99bea51317ce0f533. There were some unexpected side effects to this commit, e.g. in SSLv3 a warning alert gets sent "no_certificate" if a client does not send a Certificate during Client Auth. With the above commit this causes the connection to abort, which is incorrect. There may be some other edge cases like this so we need to have a rethink on this. Reviewed-by: Tim Hudson <tjh@openssl.org>
2016-09-15Finally, make sure vms_term_sock.c is built on VMSRichard Levitte
Reviewed-by: Andy Polyakov <appro@openssl.org> Reviewed-by: Rich Salz <rsalz@openssl.org>
2016-09-15Refactor to avoid unnecessary preprocessor logicRichard Levitte
Reviewed-by: Andy Polyakov <appro@openssl.org> Reviewed-by: Rich Salz <rsalz@openssl.org>
2016-09-15Reformat to fit OpenSSL source code standardsRichard Levitte
Reviewed-by: Andy Polyakov <appro@openssl.org> Reviewed-by: Rich Salz <rsalz@openssl.org>
2016-09-15Add copyright and license on apps/vms_term_sock.[ch]Richard Levitte
Reviewed-by: Andy Polyakov <appro@openssl.org> Reviewed-by: Rich Salz <rsalz@openssl.org>
2016-09-15VSI submission: redirect terminal input through socketRichard Levitte
This is needed, because on VMS, select() can only be used on sockets. being able to use select() on all kinds of file descriptors is unique to Unix. So, the solution for VMS is to create a layer that translates input from standard input to socket communication. Reviewed-by: Andy Polyakov <appro@openssl.org> Reviewed-by: Rich Salz <rsalz@openssl.org>
2016-09-14Make reference to other manpage more explicitRich Salz
Where -curves, etc., are defined: SSL_CONF_cmd Reviewed-by: Andy Polyakov <appro@openssl.org>
2016-09-14GH1536: Install empty CT log listRich Salz
Reviewed-by: Richard Levitte <levitte@openssl.org>
2016-09-14VMS: Really don't force symbol mixed case when building DSOsRichard Levitte
This is an amendment to the september 8 commit titled "VMS: Don't force symbol mixed case when building DSOs" Reviewed-by: Rich Salz <rsalz@openssl.org>
2016-09-14Rather than one variable for each passwd type, use one enum variableRichard Levitte
Reviewed-by: Rich Salz <rsalz@openssl.org>
2016-09-14Test the new SHA256 and SHA512 based password generation optionsRichard Levitte
Reviewed-by: Rich Salz <rsalz@openssl.org>
2016-09-14Document the new SHA256 and SHA512 password generation optionsRichard Levitte
Reviewed-by: Rich Salz <rsalz@openssl.org>
2016-09-14Add SHA256 and SHA512 based output for 'openssl passwd'Richard Levitte
RT#4674 issue 2 Reviewed-by: Rich Salz <rsalz@openssl.org>
2016-09-14Add -h and -help for c_rehash script and appRich Salz
Resolves GH1515 and GH1509. Reviewed-by: Matt Caswell <matt@openssl.org>
2016-09-14Fix OCSP_RESPID processing bug introduced by WPACKET changesMatt Caswell
An OCSP_RESPID in a status request extension has 2 bytes for the length not 1. Reviewed-by: Rich Salz <rsalz@openssl.org>
2016-09-14Add some sanity checks around usage of t_fromb64()Matt Caswell
The internal SRP function t_fromb64() converts from base64 to binary. It does not validate that the size of the destination is sufficiently large - that is up to the callers. In some places there was such a check, but not in others. Add an argument to t_fromb64() to provide the size of the destination buffer and validate that we don't write too much data. Also add some sanity checks to the callers where appropriate. With thanks to Shi Lei for reporting this issue. Reviewed-by: Richard Levitte <levitte@openssl.org>
2016-09-14Encourage use of the macros for the various "sub" functionsMatt Caswell
Don't call WPACKET_sub_memcpy(), WPACKET_sub_allocation_bytes() and WPACKET_start_sub_packet_len() directly. Reviewed-by: Rich Salz <rsalz@openssl.org>
2016-09-14Make wpackettest conform to style rulesMatt Caswell
Remove extra indentation at the start of an "if". Reviewed-by: Rich Salz <rsalz@openssl.org>
2016-09-14Add a WPACKET_sub_allocate_bytes() functionMatt Caswell
Updated the construction code to use the new function. Also added some convenience macros for WPACKET_sub_memcpy(). Reviewed-by: Rich Salz <rsalz@openssl.org>
2016-09-14Convert CKE construction to use the WPACKET APIMatt Caswell
Reviewed-by: Rich Salz <rsalz@openssl.org>
2016-09-14Add a test for 'openssl passwd'Richard Levitte
Also, enlarge test group 20 to include openssl commands that aren't tested otherwise Reviewed-by: Rich Salz <rsalz@openssl.org>
2016-09-14Fix 'openssl passwd' with arguments -1 or -apr1Richard Levitte
RT#4674 Reviewed-by: Rich Salz <rsalz@openssl.org>
2016-09-13Fix some magic values about revocation info type...FdaSilvaYY
Add comments, document -valid option. Add some const qualifiers. Reviewed-by: Andy Polyakov <appro@openssl.org> Reviewed-by: Rich Salz <rsalz@openssl.org> (Merged from https://github.com/openssl/openssl/pull/1560)
2016-09-13Add --missing-help to list commandRich Salz
Reviewed-by: Andy Polyakov <appro@openssl.org>
2016-09-13Remove -xtarget=ultra from solaris(64)-sparcv9-cc builds.Andy Grundman
This flag got moved after -xarch=v9 in 1.1.0 and had the unexpected side effect of the compiler building for 32-bit v8plusa instead of v9. GH#1521 CLA: none; trivial Signed-off-by: Andy Polyakov <appro@openssl.org> Reviewed-by: Tim Hudson <tjh@openssl.org>
2016-09-13bio.h: fix number of arguments passed to BIO_ptr_ctrl()Viktor Szakats
Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Rich Salz <rsalz@openssl.org> (Merged from https://github.com/openssl/openssl/pull/1520)
2016-09-13s_client: avoid warning on Windows/MS-DOS systemsViktor Szakats
it appears when using gcc/mingw: ``` apps/s_client.c:815:9: warning: variable 'at_eof' set but not used [-Wunused-but-set-variable] int at_eof = 0; ^~~~~~ ``` Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Rich Salz <rsalz@openssl.org> (Merged from https://github.com/openssl/openssl/pull/1512)
2016-09-13Configure: detect gcc's dependency generation capability more accurately.Andy Polyakov
Reviewed-by: Rich Salz <rsalz@openssl.org>
2016-09-13bn/bn_lcl.h: improve interoperability with clang and Android NDK.Andy Polyakov
Reviewed-by: Rich Salz <rsalz@openssl.org>
2016-09-13Configure: impose ^X on whole build procedure.Andy Polyakov
Traditionally Configure passed $ENV{PERL} to Makefile. But this resulted in ambiguilty as Configure script could be executed by interpreter different from one executing remaining scripts. Since we separate compile- and run-time interpreters with HASHBANGPERL variable, there is no reason to segment the build procedure. Reviewed-by: Rich Salz <rsalz@openssl.org>
2016-09-13Abort on unrecognised warning alertsMatt Caswell
A peer continually sending unrecognised warning alerts could mean that we make no progress on a connection. We should abort rather than continuing if we receive an unrecognised warning alert. Thanks to Shi Lei for reporting this issue. Reviewed-by: Rich Salz <rsalz@openssl.org>
2016-09-13Fix a few style nits in the wpacket codeMatt Caswell
Addressing more feedback comments. Reviewed-by: Rich Salz <rsalz@openssl.org>
2016-09-13Remove else after a return in packet codeMatt Caswell
Reviewed-by: Rich Salz <rsalz@openssl.org>
2016-09-13Pull out some common packet code into a functionMatt Caswell
Two locations had the same loop for writing out a value. Pull it out into a function. Reviewed-by: Rich Salz <rsalz@openssl.org>
2016-09-13Add some soft asserts where applicableMatt Caswell
This is an internal API. Some of the tests were for programmer erorr and "should not happen" situations, so a soft assert is reasonable. Reviewed-by: Rich Salz <rsalz@openssl.org>
2016-09-13Address WPACKET review commentsMatt Caswell
A few style tweaks here and there. The main change is that curr and packet_len are now offsets into the buffer to account for the fact that the pointers can change if the buffer grows. Also dropped support for the WPACKET_set_packet_len() function. I thought that was going to be needed but so far it hasn't been. It doesn't really work any more due to the offsets change. Reviewed-by: Rich Salz <rsalz@openssl.org>
2016-09-13Simplify the overflow checks in WPACKET_allocate_bytes()Matt Caswell
Reviewed-by: Rich Salz <rsalz@openssl.org>
2016-09-13Move the WPACKET documentation comments to packet_locl.hMatt Caswell
The PACKET documentation is already in packet_locl.h so it makes sense to have the WPACKET documentation there as well. Reviewed-by: Rich Salz <rsalz@openssl.org>
2016-09-13Add tests for the WPACKET implementationMatt Caswell
The tests will only work in no-shared builds because WPACKET is an internal only API that does not get exported by the shared library. Reviewed-by: Rich Salz <rsalz@openssl.org>
2016-09-13Ensure the WPACKET gets cleaned up in the event of an errorMatt Caswell
Otherwise a mem leak can occur. Reviewed-by: Rich Salz <rsalz@openssl.org>
2016-09-13Various bug fixes and tweaks to WPACKET implementationMatt Caswell
Also added the WPACKET_cleanup() function to cleanup a WPACKET if we hit an error. Reviewed-by: Rich Salz <rsalz@openssl.org>
2016-09-13Add WPACKET_sub_memcpy() functionMatt Caswell
Reviewed-by: Rich Salz <rsalz@openssl.org>