aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2017-10-03Merge branch 'hans/ssh/ssh_dbg_hostkey/OTP-14658' into maintHans Nilsson
2017-10-03ssh: ssh_dbg reports cryptolib infoHans Nilsson
2017-10-03ssh: enable host key debugging in ssh_dbgHans Nilsson
2017-10-03ssh: Make host key checking more debug friendlyHans Nilsson
2017-10-03Merge branch 'maint-20' into maintHans Nilsson
* maint-20: Updated OTP version Prepare release Fix zlib merge snafu ssh: fix broken printouts ssh: exclude aes_gcm if peer is OpenSSH 6.2 (known bug)
2017-10-02Merge branch 'sverker/bad-dist-msg-bug/ERIERL-80/OTP-14661' into maintSverker Eriksson
2017-10-02erts: Fix bug when detecting bad dist messageSverker Eriksson
We can't just leave it in queue with dist_ext=NULL. Two symptoms seen: 1. 'receive' trying to deref dist_ext as NULL. 2. GC think it's a term and put THE_NON_VALUE in root set.
2017-10-02Add distribution_SUITE:bad_dist_ext_sizeSverker Eriksson
2017-10-02Updated OTP versionOTP-20.1.1Erlang/OTP
2017-10-02Prepare releaseErlang/OTP
2017-10-02Merge branch 'john/erts/fix-zlib-merge/OTP-14648/OTP-14649' into maint-20Erlang/OTP
* john/erts/fix-zlib-merge/OTP-14648/OTP-14649: Fix zlib merge snafu
2017-10-02Merge branch 'hans/ssh/printout_crash/OTP-14645' into maint-20Erlang/OTP
* hans/ssh/printout_crash/OTP-14645: ssh: fix broken printouts
2017-10-02Merge branch 'bjorn/erts/match-context/ERL-490/OTP-14640' into maint-20Erlang/OTP
* bjorn/erts/match-context/ERL-490/OTP-14640: Fix incorrect internal consistency failure for binary matching code
2017-10-02Merge branch 'hans/ssh/adjust_for_peers_version/OTP-14638' into maint-20Erlang/OTP
* hans/ssh/adjust_for_peers_version/OTP-14638: ssh: exclude aes_gcm if peer is OpenSSH 6.2 (known bug)
2017-10-02Fix zlib merge snafuJohn Högberg
I accidentally merged a few fixes directly to maint-20 (and then to maint and master), instead of merging to maint and master and waiting for a patch to merge it into maint-20, leaving the related tickets dangling. This commit does nothing beyond getting the tickets (and their release notes) into the next patch.
2017-10-02Merge branch 'hans/ssh/ecdsa_pass_phrase/OTP-14602' into maintHans Nilsson
2017-10-02ssh: add ecdsa_pass_phrase option in analogy with rsa_pass_phraseHans Nilsson
2017-10-02Merge branch 'maint-20' into maintJohn Högberg
2017-10-02Merge branch 'hans/public_key/verify_hostname_ip_address/OTP-14653' into maintHans Nilsson
2017-10-02public_key: verify ip (both v4 and v6)Hans Nilsson
2017-10-02public_key: Added IP4 address checks to hostname_verification testsHans Nilsson
2017-10-02Merge branch 'ingela/inets-typo/ERL-492' into maintIngela Anderton Andin
* ingela/inets-typo/ERL-492: inets: Fix documentation typo
2017-10-02inets: Fix documentation typoIngela Anderton Andin
2017-10-02Merge branch 'ingela/dtls/renegotiate/OTP-14563' into maintIngela Anderton Andin
* ingela/dtls/renegotiate/OTP-14563: dtls: Compleate DTLS renegotiate implementation
2017-10-02Merge branch 'rickard/null-char-filenames/ERL-370/OTP-14543' into maintRickard Green
* rickard/null-char-filenames/ERL-370/OTP-14543: Don't allow null in filenames
2017-10-01Merge pull request #1588 from bjorng/bjorn/compiler/fix-match-context/ERL-490Björn Gustavsson
Fix incorrect internal consistency failure for binary matching code
2017-09-30dtls: Compleate DTLS renegotiate implementationIngela Anderton Andin
2017-09-29Fix gunzip/1 of concatenated gzip filesJohn Högberg
Quoting RFC 1952: "A gzip file consists of a series of "members" (compressed data sets). [...] The members simply appear one after another in the file, with no additional information before, between, or after them."
2017-09-29Fix minor incompatibilities in inflate behaviorJohn Högberg
When presented with multiple valid but concatenated streams, the old driver returned an empty result once the end of the first stream was reached, and kept doing so even if fed new data. The new driver/NIF returned a data_error instead. zlib:inflateInit/3 has been added to control this behavior, but is not yet ready for public use.
2017-09-29ssh: fix broken printoutsHans Nilsson
2017-09-29Fix incorrect internal consistency failure for binary matching codeBjörn Gustavsson
4c31fd0b9665 made the merging of match contexts stricter; in fact, a little bit too strict. Two match contexts with different number of slots would be downgraded to the 'term' type. The correct way is to keep the match context but set the number of slots to the lowest number of slots of the two match contexts. https://bugs.erlang.org/browse/ERL-490
2017-09-28ssh: exclude aes_gcm if peer is OpenSSH 6.2 (known bug)Hans Nilsson
2017-09-28Merge branch 'rickard/doc-fix' into maintRickard Green
* rickard/doc-fix: Fix xmllint warning
2017-09-28Fix xmllint warningRickard Green
2017-09-28Merge PR-1586 from Ayanda-D/ets-docs-grammarSverker Eriksson
Fix grammar in 'ets' docs
2017-09-28Fix grammar in ets:foldl/3 and ets:foldr/3 docsAyanda Dube
2017-09-27Don't allow null in filenamesRickard Green
2017-09-27Add git pre-push hookSverker Eriksson
2017-09-22Updated OTP versionOTP-20.1Erlang/OTP
2017-09-22Update release notesErlang/OTP
2017-09-22Update version numbersErlang/OTP
2017-09-22Correctly append sub-binaries in iolist_to_iovecJohn Högberg
The byte_offset of sub-binaries wasn't taken into account for ProcBins, subtly ruining the results. The test suite didn't catch it since it didn't check for sub-binaries in particular, and only checked for equality between variations -- not whether the output was equal to the input.
2017-09-22Merge branch 'dgud/stdlib/remove-gs-depr' into maintDan Gudmundsson
* dgud/stdlib/remove-gs-depr: stdlib: Remove gs removed warning
2017-09-22Merge branch 'hans/public_key/fix_broken_marker' into maintHans Nilsson
2017-09-22public_key: Add app (ssl) to marker in seelalso tagHans Nilsson
2017-09-22stdlib: Remove gs removed warningDan Gudmundsson
Caused warnings which could not be suppressed, if old 'gs' application was compiled and used together with otp-20, which is fair usage even if OTP does not support the application anymore.
2017-09-21Update copyright yearHenrik Nord
2017-09-21Merge branch 'anders/diameter/doc/OTP-14561' into maintAnders Svensson
* anders/diameter/doc/OTP-14561: Document new(ish) options in diameter_tcp/sctp
2017-09-21Merge branch 'anders/diameter/SoC/OTP-10927' into maintAnders Svensson
* anders/diameter/SoC/OTP-10927: Simplify/complete Standards Compliance doc
2017-09-21Merge branch 'lars/make/fop-font-cache/OTP-14622' into maintLars Thorsen
* lars/make/fop-font-cache/OTP-14622: Change number of parameters Fix fop font-cache handling during pdf build