aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2017-10-09[orber] Touchup of code tagsLars Thorsen
2017-10-05Merge branch 'maint-19' into maintRickard Green
* maint-19: Updated OTP version Update release notes Update version numbers Conflicts: OTP_VERSION erts/doc/src/notes.xml erts/vsn.mk lib/compiler/doc/src/notes.xml lib/compiler/vsn.mk otp_versions.table
2017-10-05Updated OTP versionOTP-19.3.6.3Erlang/OTP
2017-10-05Update release notesErlang/OTP
2017-10-05Update version numbersErlang/OTP
2017-10-05Merge branch 'sverker/bad-dist-msg-bug/ERIERL-80/OTP-14661' into maint-19Erlang/OTP
* sverker/bad-dist-msg-bug/ERIERL-80/OTP-14661: erts: Fix bug when detecting bad dist message Add distribution_SUITE:bad_dist_ext_size
2017-10-05Merge branch 'sverker/19/on_load-on_load-bug/OTP-14612' into maint-19Erlang/OTP
* sverker/19/on_load-on_load-bug/OTP-14612: erts: Fix 'on_load' tracing bug for modules with -on_load code_SUITE:on_load_trace_on_load
2017-10-05Merge branch 'sverker/19/binary_to_atom-utf8-crash/ERL-474/OTP-14590' into ↵Erlang/OTP
maint-19 * sverker/19/binary_to_atom-utf8-crash/ERL-474/OTP-14590: erts: Fix crash in binary_to_atom/term for invalid utf8
2017-10-05Merge branch 'rickard/timer-sid-bug/OTP-14548' into maint-19Erlang/OTP
* rickard/timer-sid-bug/OTP-14548: Fix scheduler id field in timers
2017-10-05Merge branch ↵Erlang/OTP
'john/compiler/fail-labels-in-blocks-otp-19/ERIERL-48/OTP-14522' into maint-19 * john/compiler/fail-labels-in-blocks-otp-19/ERIERL-48/OTP-14522: compiler: Fix live regs update on allocate in validator Take fail labels into account when determining liveness in block ops
2017-10-04Merge branch 'hans/crypto/evp_asym_crypto/OTP-14446' into maintHans Nilsson
2017-10-04crypto: ifdef of EVP for old cryptolibs (< 1.0.0)Hans Nilsson
2017-10-04crypto: disable tests of non-working assymetric ciphersHans Nilsson
ECDSA and DSA (DSS) public/private encryption/decryption does not work
2017-10-04crypto: Added pkey_crypt_nif from PR838Hans Nilsson
Testcases for ECDSA and DSA encrypt/decrypt and some other adaptions
2017-10-04Merge branch 'hans/ssh/cuddle_tests' into maintHans Nilsson
2017-10-03ssh: Use cipher=none and mac=none in benchmarks againHans Nilsson
2017-10-03ssh: Put ssh_property_test_SUITE back in test/MakefileHans Nilsson
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