aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fixed typo in description of EVP_CIPHER_meth_set_iv_length().David Makepeace2018-02-281-1/+1
| | | | | | Reviewed-by: Rich Salz <rsalz@openssl.org> Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com> (Merged from https://github.com/openssl/openssl/pull/5477)
* Adapt 15-test_out_option.t for more than just UnixRichard Levitte2018-02-281-4/+4
| | | | | Reviewed-by: Rich Salz <rsalz@openssl.org> (Merged from https://github.com/openssl/openssl/pull/4008)
* Enable the -out option test on VMS as wellRichard Levitte2018-02-281-2/+2
| | | | | Reviewed-by: Rich Salz <rsalz@openssl.org> (Merged from https://github.com/openssl/openssl/pull/4008)
* Check on VMS as wellRichard Levitte2018-02-281-2/+2
| | | | | Reviewed-by: Rich Salz <rsalz@openssl.org> (Merged from https://github.com/openssl/openssl/pull/4008)
* Add VMS version of app_dirname()Richard Levitte2018-02-281-3/+52
| | | | | | | Related to #3709 Reviewed-by: Rich Salz <rsalz@openssl.org> (Merged from https://github.com/openssl/openssl/pull/4008)
* Fix the type of -out optionPaul Yang2018-02-282-2/+2
| | | | | | Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/3709)
* Add test cases for this -out option checkPaul Yang2018-02-281-0/+60
| | | | | | Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/3709)
* Check directory is able to create files for various -out optionPaul Yang2018-02-283-5/+104
| | | | | | | | This is to address issue #3404, only works in Unix-like platforms Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/3709)
* storeutl: make sure s2i_ASN1_INTEGER is correctly declaredRichard Levitte2018-02-281-0/+1
| | | | | Reviewed-by: Ben Kaduk <kaduk@mit.edu> (Merged from https://github.com/openssl/openssl/pull/5482)
* Always use adr with __thumb2__.David Benjamin2018-02-272-6/+6
| | | | | | | | | | | | | | | | | | | | | | | Thumb2 addresses are a bit a mess, depending on whether a label is interpreted as a function pointer value (for use with BX and BLX) or as a program counter value (for use with PC-relative addressing). Clang's integrated assembler mis-assembles this code. See https://crbug.com/124610#c54 for details. Instead, use the ADR pseudo-instruction which has clear semantics and should be supported by every assembler that handles the OpenSSL Thumb2 code. (In other files, the ADR vs SUB conditionals are based on __thumb2__ already. For some reason, this one is based on __APPLE__, I'm guessing to deal with an older version of clang assembler.) It's unclear to me which of clang or binutils is "correct" or if this is even a well-defined notion beyond "whatever binutils does". But I will note that https://github.com/openssl/openssl/pull/4669 suggests binutils has also changed behavior around this before. Reviewed-by: Andy Polyakov <appro@openssl.org> Reviewed-by: Rich Salz <rsalz@openssl.org> (Merged from https://github.com/openssl/openssl/pull/5431)
* Fix documentation link to reference man3xemdetia2018-02-271-2/+2
| | | | | | | | CLA: trivial 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/5473)
* Make some perl scripts output to stdoutRich Salz2018-02-273-42/+47
| | | | | | | And only generate one output "file" at a time for objects.pl Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/5432)
* crypto/ec/asm/x25519-x86_64.pl: close STDOUT, not $STDOUTRichard Levitte2018-02-271-1/+1
| | | | | | | Fixes #5471 Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/5472)
* configdata.pm: ensure $prefix is definedRichard Levitte2018-02-271-0/+1
| | | | | | | Fixes #5471 Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/5472)
* bio_b64.c: prevent base64 filter BIO from decoding out-of-bound dataDr. Matthias St. Pierre2018-02-271-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #5405, #1381 The base64 filter BIO reads its input in chunks of B64_BLOCK_SIZE bytes. When processing input in PEM format it can happen in rare cases that - the trailing PEM marker crosses the boundary of a chunk, and - the beginning of the following chunk contains valid base64 encoded data. This happened in issue #5405, where the PEM marker was split into "-----END CER" and "TIFICATE-----" at the end of the first chunk. The decoding of the first chunk terminated correctly at the '-' character, which is treated as an EOF marker, and b64_read() returned. However, when called the second time, b64_read() read the next chunk and interpreted the string "TIFICATE" as valid base64 encoded data, adding 6 extra bytes '4c 81 48 08 04 c4'. This patch restores the assignment of the error code to 'ctx->cont', which was deleted accidentally in commit 5562cfaca4f3 and which prevents b64_read() from reading additional data on subsequent calls. This issue was observed and reported by Annie Yousar. Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/5422)
* Prepare for 1.1.1-pre3-devMatt Caswell2018-02-272-3/+3
| | | | Reviewed-by: Richard Levitte <levitte@openssl.org>
* Prepare for 1.1.1-pre2 releaseOpenSSL_1_1_1-pre2Matt Caswell2018-02-272-2/+2
| | | | Reviewed-by: Richard Levitte <levitte@openssl.org>
* Update copyright yearMatt Caswell2018-02-2740-40/+40
| | | | Reviewed-by: Richard Levitte <levitte@openssl.org>
* Clear some sslapitest global variables after useMatt Caswell2018-02-261-0/+1
| | | | | | | Otherwise we get a use after free if the test order is randomised. Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/5467)
* mem_sec.c: relax POSIX requirement.Andy Polyakov2018-02-261-1/+3
| | | | | | | | Even though mlock(2) was standardized in POSIX.1-2001, vendors did implement it prior that point. Reviewed-by: Rich Salz <rsalz@openssl.org> (Merged from https://github.com/openssl/openssl/pull/5460)
* test/ct_test.c: remove dependency on -lm.Andy Polyakov2018-02-261-4/+4
| | | | | | | fabs(3m) is customarily inlined, but it's not, one has to link with -lm. Since fabs(3m) is the only reference, it makes more sense to avoid it. Reviewed-by: Rich Salz <rsalz@openssl.org>
* Export keying material using early exporter master secretTatsuhiro Tsujikawa2018-02-2610-4/+232
| | | | | | | | | This commit adds SSL_export_keying_material_early() which exports keying material using early exporter master secret. Reviewed-by: Rich Salz <rsalz@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/5252)
* Make it possible to give --libdir an absolute pathRichard Levitte2018-02-262-69/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | With this, we introduce the make variable 'libdir', which differs from 'LIBDIR' not only in casing, but also by being the absolute path to the library installation directory. This variable is intentionally compatible with the GNU coding standards. When --libdir is given an absolute path, it is considered as a value according to GNU coding standards, and the variables LIBDIR and libdir will be this: LIBDIR= libdir=/absolute/path When --libdir is given a relative path (just the name of the desired library directory), or not given at all, it is considered as a "traditional" OpenSSL value, and the variables LIBDIR and libdir will be this: LIBDIR=relativepath libdir=$(INSTALLTOP)/$(LIBDIR) Fixes #5398 Reviewed-by: Rich Salz <rsalz@openssl.org> (Merged from https://github.com/openssl/openssl/pull/5446)
* appveyor.yml: omit makedepend step.Andy Polyakov2018-02-241-2/+2
| | | | | | | | | makedepend makes lesser sense in a throw-away build like CI, but it spares some computational time, because with MSVC it takes separate per-file compiler invocation. Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/5452)
* ec/ecp_nistp{224,256,521}.c: harmonize usage of __uint128_t.Andy Polyakov2018-02-243-6/+6
| | | | | | | Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Rich Salz <rsalz@openssl.org> Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/5449)
* {ec/curve25519,poly1305/poly1305}.c: relax pedantic constraint.Andy Polyakov2018-02-242-71/+69
| | | | | | | | | | | | As it turns out gcc -pedantic doesn't seem to consider __uint128_t as non-standard, unlike __int128 that is. Fix even MSVC warnings in curve25519.c. Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Rich Salz <rsalz@openssl.org> Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/5449)
* ec/curve448: portability fixups.Andy Polyakov2018-02-242-2/+3
| | | | | | | | | | | | SPARC condition in __SIZEOF_INT128__==16 is rather performance thing than portability. Even though compiler advertises int128 capability, corresponding operations are inefficient, because they are not directly backed by instruction set. Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Rich Salz <rsalz@openssl.org> Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/5449)
* ec/asm/x25519-x86_64.pl: fix up ADCX/ADOX fallback.Andy Polyakov2018-02-241-2/+4
| | | | | | Reviewed-by: Rich Salz <rsalz@openssl.org> Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/5447)
* Remove OSSLzu, and fix the one place that used it.Rich Salz2018-02-232-28/+1
| | | | | Reviewed-by: Andy Polyakov <appro@openssl.org> (Merged from https://github.com/openssl/openssl/pull/5439)
* Fix some bugs with the cfb1 bitsize handlingBernd Edlinger2018-02-233-2/+6
| | | | | Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/5426)
* Remove executable bit from test/recipes/03-test_internal_sm4.tBernd Edlinger2018-02-231-0/+0
| | | | | Reviewed-by: Rich Salz <rsalz@openssl.org> (Merged from https://github.com/openssl/openssl/pull/5434)
* Add a note in CHANGESRichard Levitte2018-02-231-0/+6
| | | | | | | [extended tests] Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/2688)
* Test the storeutl searching optionsRichard Levitte2018-02-231-5/+49
| | | | | Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/2688)
* STORE: Add documentation on search criteriaRichard Levitte2018-02-236-11/+280
| | | | | Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/2688)
* Adapt storeutl to allow search for specific objectsRichard Levitte2018-02-231-9/+192
| | | | | Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/2688)
* STORE 'file' scheme loader: Add search capibilityRichard Levitte2018-02-234-1/+115
| | | | | Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/2688)
* STORE: Add the possibility to search for specific informationRichard Levitte2018-02-2310-3/+278
| | | | | Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/2688)
* Test the storeutl expectation optionsRichard Levitte2018-02-231-2/+16
| | | | | Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/2688)
* STORE: Add documentation on expecting specific infosRichard Levitte2018-02-235-7/+98
| | | | | Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/2688)
* Adapt storeutl to allow looking for a specific info typeRichard Levitte2018-02-231-5/+54
| | | | | Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/2688)
* STORE 'file' scheme loader: Add info type expectationRichard Levitte2018-02-231-1/+18
| | | | | Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/2688)
* STORE: Add the possibility to specify an expected info typeRichard Levitte2018-02-239-2/+67
| | | | | Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/2688)
* STORE: In preparation for coming work, mark when loading is startedRichard Levitte2018-02-231-1/+5
| | | | | Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/2688)
* Remove unreachable statement.Pauli2018-02-231-1/+0
| | | | | | | The return at the end isn't reachable. Reviewed-by: Rich Salz <rsalz@openssl.org> (Merged from https://github.com/openssl/openssl/pull/5442)
* Build files: when using $(CPP), use the C flags alongside the CPP flagsRichard Levitte2018-02-223-9/+13
| | | | | | | | The reason for this is that some of the C flags affect built in macros that we may depend on. Reviewed-by: Andy Polyakov <appro@openssl.org> (Merged from https://github.com/openssl/openssl/pull/5436)
* Remove unused num.pl,segregnam scriptsRich Salz2018-02-222-94/+0
| | | | | Reviewed-by: Andy Polyakov <appro@openssl.org> (Merged from https://github.com/openssl/openssl/pull/5433)
* initialise dc variable to satisfy old compilers.Steve Linsell2018-02-221-1/+1
| | | | | | | | | | | | | When compiling with -Wall on a machine with an old compiler it gives a false positive that the dc variable which is a structure of type DISPLAY_COLUMNS could be used uninitialised. In fact the dc variable's members will always get set in the case it is used, otherwise it is left uninitialised. This fix just causes the dc variable's members to always get initialised to 0 at declaration, so the false positive will not get flagged. Reviewed-by: Richard Levitte <levitte@openssl.org> Reviewed-by: Rich Salz <rsalz@openssl.org> (Merged from https://github.com/openssl/openssl/pull/5337)
* Update EC_POINT_new.podPer Sandström2018-02-221-1/+1
| | | | | | | | | | CLA: trivial fix typo: EC_point2buf => EC_POINT_point2buf Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com> Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/5367)
* Build file templates: be less verbose when reconfiguringRichard Levitte2018-02-223-6/+6
| | | | | Reviewed-by: Rich Salz <rsalz@openssl.org> (Merged from https://github.com/openssl/openssl/pull/5247)
* Replace the message about configdata.pm as a scriptRichard Levitte2018-02-221-11/+12
| | | | | | | The new message is geared toward issue reports Reviewed-by: Rich Salz <rsalz@openssl.org> (Merged from https://github.com/openssl/openssl/pull/5247)
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-20 15:29:22 +0000